Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

helm: Add extraConfig in configmap template #14077

Merged
merged 1 commit into from
Dec 4, 2020
Merged

Conversation

michi-covalent
Copy link
Contributor

This allows users to provide additional fields in the configmap without
having them explicitly listed in the template. For example, you can do:

% cat my-config.yaml
extraConfig:
  my-config-a: "1234"
  my-config-b: |-
    test 1
    test 2
    test 3
% helm install ./cilium -n kube-system -f ./my-config.yaml

to add my-config-a and my-config-b to cilium-config. This could be
useful in case the template is missing some fields.

Ref: #13317

Signed-off-by: Michi Mutsuzaki michi@isovalent.com

@michi-covalent michi-covalent added release-note/minor This PR changes functionality that users may find relevant to operating Cilium. needs-backport/1.9 labels Nov 18, 2020
@michi-covalent michi-covalent requested review from a team as code owners November 18, 2020 22:57
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.9.1 Nov 18, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Nov 18, 2020
Copy link
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 to have similar feature as per 1.8

@sayboras sayboras added the area/helm Impacts helm charts and user deployment experience label Nov 19, 2020
@michi-covalent
Copy link
Contributor Author

thanks @sayboras i forgot to add context here. this is "forward porting" #13317 i made the change in v1.8 branch without making the change in the master branch first as there was an ongoing helm chart refactoring around that time.

@nathanjsweet
Copy link
Member

test-me-please

@sayboras sayboras added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Nov 21, 2020
This allows users to provide additional fields in the configmap without
having them explicitly listed in the template. For example, you can do:

    % cat my-config.yaml
    extraConfig:
      my-config-a: "1234"
      my-config-b: |-
        test 1
        test 2
        test 3
    % helm install ./cilium -n kube-system -f ./my-config.yaml

to add my-config-a and my-config-b to cilium-config. This could be
useful in case the template is missing some fields.

Ref: #13317

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
@gandro gandro added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Dec 3, 2020
@gandro
Copy link
Member

gandro commented Dec 3, 2020

Added the ready-to-merge label as I don't think this needs to run through full CI, as it does not affect the output of the Helm rendering with the new value is not used.

@joestringer joestringer merged commit e3f96e3 into master Dec 4, 2020
@joestringer joestringer deleted the pr/michi/extraconfig branch December 4, 2020 07:06
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.9 in 1.9.1 Dec 4, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.9 in 1.9.1 Dec 4, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.9 to Backport done to v1.9 in 1.9.1 Dec 4, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.9 to Backport done to v1.9 in 1.9.1 Dec 4, 2020
@aanm aanm mentioned this pull request Dec 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/helm Impacts helm charts and user deployment experience dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/minor This PR changes functionality that users may find relevant to operating Cilium.
Projects
No open projects
1.9.1
Backport done to v1.9
Development

Successfully merging this pull request may close these issues.

None yet

10 participants