-
Notifications
You must be signed in to change notification settings - Fork 3.4k
v1.15 Backports 2024-11-05 #35778
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
Merged
Merged
v1.15 Backports 2024-11-05 #35778
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
sayboras
approved these changes
Nov 5, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good for my commit 👍
gandro
approved these changes
Nov 5, 2024
4a94f39
to
c9e9052
Compare
/test-backport-1.15 |
nebril
approved these changes
Nov 6, 2024
chancez
approved these changes
Nov 6, 2024
aanm
approved these changes
Nov 6, 2024
Repeatedly hitting #35594 |
[ upstream commit 279a8b7 ] As per below [^1], the correct parameter is ssh-connect-wait-retries instead of ssh-startup-wait-retries. [^1]: https://github.com/cilium/little-vm-helper/blob/3c748d6fc9d6c44a433de85a66f70e8f7043be04/action.yaml#L30 Signed-off-by: Tam Mach <tam.mach@cilium.io> Signed-off-by: Jussi Maki <jussi@isovalent.com>
[ upstream commit 40f2d3f ] Currently, the flag `loadbalancer-l7` isn't properly registered. Even though it's working fine when reading the config property from the Cilium Configmap, it's not working when trying to use the flag as Go flag. ``` 2024-10-29T16:24:26Z debug layer=debugger Adding target 23 "/usr/bin/cilium-operator-generic-bin --config-dir=/tmp/cilium/config-map --debug=true --loadbalancer-l7=envoy" Error: unknown flag: --loadbalancer-l7 ``` Therefore, this commit is moving the config property into the respective Hive Cell where it gets properly registered. Reported-by: André Martins <andre@cilium.io> Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com> Signed-off-by: Jussi Maki <jussi@isovalent.com>
…Error for peer manager client [ upstream commit 0b8beea ] When connecting to the hubble peer manager ensure we return the underlying connection error so it's easier to diagnose connection related problems. Currently the only error returned is the context timeout: ``` time="2024-09-18T21:13:13Z" level=warning msg="Failed to create peer client for peers synchronization; will try again after the timeout has expired" error="context deadline exceeded" subsys=hubble-relay target="hubble-peer.kube-system.svc.cluster.local.:443" ``` This will ensure the underlying connection level error is returned when the context is cancelled. In the future we should switch to not using grpc.WithBlock at all which avoids many of these problems, but that requires more testing. In the short-term, lets set these dial options to improve things now, in-case the switch to non-blocking dials is delayed. Signed-off-by: Chance Zibolski <chance.zibolski@gmail.com> Signed-off-by: Jussi Maki <jussi@isovalent.com>
[ upstream commit 9ee0ee4 ] This commit removes a warning that was intended to warn the user that running in native routing mode without a correct native routing CIDR will lead to problems. However, the conditions for the warning are not fully correct. There are native routing setups where the user does not need to specify a native routing CIDR, namely: 1. The user is running in ENI or AlibabaCloud IPAM, where the native routing CIDR is auto-detected if not explicitly configured. 2. The user is running with BPF ip-masq-agent where the native routing CIDR is optional (as there are other means of specifying exclusion CIDRs). 3. The user is not running with Cilium-based masquerading. The existing warning did not trigger for case 1, as the if condition checked for `auto-direct-node-routes` rather than the `routing-mode` flag, and `auto-direct-node-routes` is not used on ENI/AlibabaCloud IPAM modes. However, the warning would trigger for cases 2 and 3, which is incorrect. Cases 2 and 3 should not emit a warning either. And indeed already have a check on the native routing CIDR that handles all three cases correctly, namely `checkIPv{4,6}NativeRoutingCIDR` here: https://github.com/cilium/cilium/blob/bc26c6d3a74e3bfbeb1149e5116de51c496dd254/pkg/option/config.go#L3451-L3476 Therefore, we can safely remove the warning in this commit, as the conditions are already covered by `checkIPv{4,6}NativeRoutingCIDR`. I have also manually tested that the check does take effect if one sets `routingMode=native` and `autoDirectNodeRoutes=true` without specifying a native routing CIDR. Fixes: 6743d28 ("daemon: warn if auto direct node routes is set without a native routing CIDR") Signed-off-by: Sebastian Wicki <sebastian@isovalent.com> Signed-off-by: Jussi Maki <jussi@isovalent.com>
c9e9052
to
66a00b3
Compare
/test-backport-1.15 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
backport/1.15
This PR represents a backport for Cilium 1.15.x of a PR that was merged to main.
kind/backports
This PR provides functionality previously merged into master.
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, a GitHub action will update the labels of these PRs: