v1.14 backports 2023-11-20 #29270
v1.14 backports 2023-11-20 #29270
Conversation
[ upstream commit 0eba8bc ] In Cilium v1.13, K8s rest client metrics, such as cilium_k8s_client_api_latency_time_seconds and cilium_k8s_client_api_calls_total, are missing because of a conflict with controller-runtime on the metrics registration. controller-runtime(sigs.k8s.io/controller-runtime/pkg/metrics) also registers the client-go rest client metrics on its registry using metrics.Register method in its init function. The metrics.Register can be called only once, and subsequent calls will be ignored. cilium-agent doesn't use controller-runtime, but there's an indirect dependency from github.com/cilium/cilium/daemon to github.com/cilium/cilium/operator/metrics package. (operator uses controller-runtime in its Gateway API implementation) For example, github.com/cilium/cilium/daemon/cmd -> github.com/cilium/cilium/pkg/ipam -> github.com/cilium/cilium/pkg/ipam/metrics -> github.com/cilium/cilium/operator/metrics The init function of sigs.k8s.io/controller-runtime/pkg/metrics will be called because of this indirect dependency. The issue(missing client-go metrics) doesn't happen with v1.14 and later, but it can happen if the order of imports changes again. This commit is to prevent the issue from happning. This commit is a forward port of e4ff641 Signed-off-by: Yusuke Suzuki <yusuke-suzuki@cybozu.co.jp> Signed-off-by: Tam Mach <tam.mach@cilium.io>
maintainer-s-little-helper
bot
added
backport/1.14
[ upstream commit 1fe2281 ] The same connectivity tests should be run by ci-ipsec-e2e. Suggested-by: Paul Chaignon <paul.chaignon@gmail.com> Signed-off-by: Martynas Pumputis <m@lambda.lt> Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit 38a705b ] See cilium/cilium-cli#2110. Signed-off-by: Martynas Pumputis <m@lambda.lt> Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
force-pushed
the
pr/v1.14-backport-2023-11-20
branch
from
2a724dd
to
c7086d8
Compare
|
/test-backport-1.14 |
|
/ci-ipsec-upgrade |
maintainer-s-little-helper
bot
added
the
ready-to-merge
|
@lmb Just a heads up when merging backport PR to remember to run the scripts to set the labels as described in the PR description. Our release scripts rely on this process and may cause at worst missed PRs into releases and at best, missing release notes for PRs that did land. |
|
Ok! |
@christarazi we already have automation that does this https://github.com/cilium/cilium/actions/workflows/call-backport-label-updater.yaml /cc @lmb |
|
@aanm Oh I didn't realize that. That's great and I wonder why it didn't properly work for this PR. I had to manually fix up some backport labels on PRs, so not sure what went wrong. |
|
Thanks all. It seems like the backport script didn't throw the errors, or I overlooked them, hence the pending-backport/1.14 label was not set for mentioned PRs. Will be more cautious next time 🙇 |
Once this PR is merged, you can update the PR labels via: