v1.9 backports 2021-04-07 #15597
Merged
v1.9 backports 2021-04-07 #15597
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
[ upstream commit 261fae4 ] Since commit 4d50ae7 ("cni, routing: Plumb interface number") added the interface number to the IPAM allocation result to fix a bug in ENI mode (cilium#14336), Azure has been broken. However, we were able to avoid issues like pod connectivity because there was a separate bug with Azure that hid it, which commit ba06970 ("azure: Add the correct JSON tag to GatewayIP field in CiliumNode CRD") fixed. Once that was fixed, then we began to see pod failing to be set up by the CNI (see linked issue below). The reason this didn't manifest in v1.9.5 even though the ENI fixes were backported there is because the ba06970 ("azure: Add the correct JSON tag to GatewayIP field in CiliumNode CRD") is not part of any release yet. In any case, this commit will need to be backported as the latter commit (ba06970) is now part of the v1.9 tree. Fixes: cilium#15496 Signed-off-by: Chris Tarazi <chris@isovalent.com>
christarazi
added
backport/1.9
kind/backports
|
test-backport-1.9 |
michi-covalent
approved these changes
Apr 7, 2021
|
One failure: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.17-kernel-4.9/122/testReport/junit/Suite-k8s-1/17/K8sHealthTest_checks_cilium_health_status_between_nodes/. Let's see if it's a flake: test-1.17-4.9 |
|
Seems it is ^. |
pchaigno
added
the
ready-to-merge
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.
Once this PR is merged, you can update the PR labels via: