Merge Chef attributes more conservatively
What does this MR do?
During our Chef run, we generate application secrets for Grafana and place them into node variables ['monitoring']['grafana']['gitlab_secret']
and ['monitoring']['grafana']['gitlab_application_id']
. To populate these variables, we merge the state of the Gitlab
class with the node using node.consume_attributes
.
Unfortunately this has the effect of deduplicating array values. As described in #5085 (closed), sidekiq_cluster['queue_groups']
is an array that can have duplicate values.
This MR reduces the scope of the node.consume_attributes
call in the Grafana chef recipe to the ['monitoring']['grafana']
namespace.
Related issues
Closes #5085 (closed).
Checklist
See Definition of done.
-
Changelog entry created. Not applicable for Documentation changes and minor changes. -
Documentation created/updated -
Tests added -
Integration tests added to GitLab QA, if applicable -
MR targeting master
branch -
MR has a green pipeline on GitLab.com -
Equivalent MR/issue for CNG opened if applicable -
trigger-package
has a green pipeline running against latest commit
Reviewer Checklist
In addition to above, reviewer must:
-
Pipeline is green on dev.gitlab.org if the change is not touching documentation or internal cookbooks
Edited by Dustin Collins