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

Fixed incorrectly rendered chart when specified both configMap and customConf #25200

Merged
merged 1 commit into from May 4, 2023

Conversation

marseel
Copy link
Contributor

@marseel marseel commented Apr 28, 2023

Trying to render helm chart with following values:

cni:
    configMap: cni-configuration
    customConf: true

using command

helm lint cilium -f values.yaml

resulted in following error:

==> Linting cilium
[ERROR] templates/cilium-configmap.yaml: unable to parse YAML: error converting YAML to JSON: yaml: line 129: mapping values are not allowed in this context

due to the fact that {{- -}} removes whitespaces, which was generating following line in yaml:

read-cni-conf: /tmp/cni-configuration/cni-configwrite-cni-conf-when-ready: /host/etc/cni/net.d/05-cilium.conflist

Issue introduced by #24389

@marseel marseel requested review from a team as code owners April 28, 2023 16:55
@maintainer-s-little-helper
Copy link

Commit 64e67ec5c6c93906f66ce78f44eca816a7300945 does not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Apr 28, 2023
@maintainer-s-little-helper
Copy link

Commit 64e67ec5c6c93906f66ce78f44eca816a7300945 does not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@marseel marseel added the kind/bug This is a bug in the Cilium logic. label Apr 28, 2023
…stomConf

Signed-off-by: Marcel Zieba <marcel.zieba@isovalent.com>
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Apr 28, 2023
@marseel marseel added the release-note/minor This PR changes functionality that users may find relevant to operating Cilium. label Apr 28, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Apr 28, 2023
@marseel marseel changed the title Fixed incorrect chart when specified both configMap and customConf Fixed incorrectly rendered chart when specified both configMap and customConf Apr 28, 2023
@marseel
Copy link
Contributor Author

marseel commented Apr 28, 2023

/test

@marseel
Copy link
Contributor Author

marseel commented May 4, 2023

/test

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 4, 2023
@joestringer joestringer merged commit 718f180 into cilium:main May 4, 2023
56 of 57 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is a bug in the Cilium logic. 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
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants