v1.8 backports 2020-09-07 #13100
Merged
v1.8 backports 2020-09-07 #13100
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 9f322f0 ] The indentation here was off, causing the subsequent section to also be considered part of the quote block. Fix it up. While we're at it, clarify that the `agent.keepDeprecatedProbes` option should be specified in addition to any other Helm options from the user. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit 011546b ] Setting `global.azure.enabled` will change operator image to `operator-azure`, which only accepts azure IPAM, and throw fatal error for `cluster-pool`. This PR is to enable node init to wait for azure vnet for both cases (e.g. CNI and Azure IPAM) Closes #13023 Signed-off-by: Tam Mach <sayboras@yahoo.com> Signed-off-by: Paul Chaignon <paul@cilium.io>
[ upstream commit bb615ea ] The name of the policy call map on the bpffs was changed between 1.7 and 1.8 by commit 5d6b669. Commit 6bada02 then added code to delete the old map name on initialization of the agent. We cannot simply delete the old policy call map because it might still be used by endpoints (until they are regenerated) and the base programs (until they are reloaded). However, if we rename the map in the bpffs, it shouldn't affect BPF programs that are using it and they will then pick up the new name on reload. The reverse renaming operation is needed in 1.7 to allow for downgrades from 1.8. Fixes: 5d6b669 ("maps/policymap: Rename policy call map to clarify intent") Fixes: 6bada02 ("daemon: Remove old policy call map") Signed-off-by: Paul Chaignon <paul@cilium.io>
pchaigno
added
backport/1.8
kind/backports
joestringer
approved these changes
Sep 8, 2020
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.
Not included due to non-trivial conflicts:
Once this PR is merged, you can update the PR labels via: