Corrected logic for adding tolerations key in helm template for cilium-operator deployment
#40938
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… for cilium-operator deployment The current Helm Template adds `tolerations` to the cilium-operator deployment by combining: - The contents of `.Values.operator.tolerations` - A `operator: Exists` toleration with `.Values.agentNotReadyTaintKey` as the key However, the `tolerations` key is only added when `.Values.operator.tolerations` exists, so attempting to set `.Values.operator.tolerations` to an empty value results in an error: ``` Error: YAML parse error on cilium/templates/cilium-operator/deployment.yaml: error converting YAML to JSON: yaml: line 110: did not find expected key ``` This patch modifies the condition for adding the `tolerations` key to include an additional OR condition checking for the existence of `.Values.agentNotReadyTaintKey`, thereby resolving this error. Fixes: cilium#40937 Signed-off-by: walnuts1018 <r.juglans.1018@gmail.com>
|
/test |
|
/lgtm |
tolerations key in helm template for cilium-operator deploymenttolerations key in helm template for cilium-operator deployment
tolerations key in helm template for cilium-operator deploymenttolerations key in helm template for cilium-operator deployment
|
@walnuts1018 can you checked failed tests ? |
|
I'll check it |
|
Commit af2e1db does not match "(?m)^Signed-off-by:". Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin |
Signed-off-by: walnuts1018 <r.juglans.1018@gmail.com>
af2e1db to
04a3141
Compare
|
/test |
|
@walnuts1018 the conformance gateway api test is failing . |
it's a flake. |
|
/test |
|
This should be backported for 1.18 too. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Modified the condition for adding the
tolerationskey to ensure it correctly adds the key even when.Values.operator.tolerationsdoes not exist, by including an additional OR condition that checks for the presence of.Values.agentNotReadyTaintKey.Fixes: #40937