daemon: ignore CILIUM_CUSTOM_CNI_CONF when writing cni configuration #23743
Conversation
This file contains 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
This file was overly-cautious when mimicking cni-install.sh's behavior. It turns out we want to be able to disable cni-install.sh but still have the daemon write the configuration file. This preserves existing behavior in 1.12. Thus, we need to remove the bit that bails out if the environment variable is set. Fixes: 12b7b11 Signed-off-by: Casey Callendrello <cdc@isovalent.com>
|
/test Job 'Cilium-PR-K8s-1.25-kernel-4.19' failed: Click to show.Test NameFailure OutputIf it is a flake and a GitHub issue doesn't already exist to track it, comment |
|
Test failure seems like a flake; Cilium was installed correctly but Kafka failed to go ready. One test failed, Cilium was successfully installed many times over the course of this CI run. |
|
/test-1.25-4.19 |
|
All green except ci-verifier. (is that supposed to run with /test? |
|
/ci-verifier |
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.
This file was overly-cautious when mimicking cni-install.sh's behavior. It turns out we want to be able to disable cni-install.sh but still have the daemon write the configuration file. This preserves existing behavior in 1.12.
Thus, we need to remove the bit that bails out if the environment variable is set.
Fixes: 12b7b11
Signed-off-by: Casey Callendrello cdc@isovalent.com