v1.11 backports 2023-03-28 #24604
Merged
v1.11 backports 2023-03-28 #24604
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 30a783f ] Renovate v35 had a breaking change in how it computes the digest of GitHub releses. Previously, it would use the digest of the release attachements, but now it's just using a git sha as the "digest". This commit changes the data source for the Hubble artifacts to use the data source which preserves the old behavior. Ref: renovatebot/renovate#20178 Signed-off-by: Sebastian Wicki <sebastian@isovalent.com> Signed-off-by: Tobias Klauser <tobias@cilium.io>
[ upstream commit b2bc42a ] Signed-off-by: Liz Rice <liz@lizrice.com> Signed-off-by: Tobias Klauser <tobias@cilium.io>
[ upstream commit e29c8ea ] Support the case when ingress is configured to serve hubble-ui from non default `/` root url (ex. `/service-map`). Related hubble-ui pull request: cilium/hubble-ui#432 Signed-off-by: Dmitry Kharitonov<dmitry@isovalent.com> Signed-off-by: Tobias Klauser <tobias@cilium.io>
[ upstream commit e980ca0 ] Signed-off-by: Dmitry Kharitonov <dmitry@isovalent.com> Signed-off-by: Tobias Klauser <tobias@cilium.io>
[ upstream commit 788bf37 ] By right there should be a rule to let ipsec skb bypass conntrack: -A CILIUM_PRE_raw -m mark --mark 0xd00/0xf00 -m comment --comment "cilium-xfrm-notrack:" -j CT --notrack However ipv6 missed it and this commit adds the rule back. Fixes: cilium#23481 Signed-off-by: Zhichuan Liang <gray.liang@isovalent.com> Signed-off-by: Tobias Klauser <tobias@cilium.io>
tklauser
added
kind/backports
tklauser
requested review from
gandro,
lizrice,
geakstr,
jschwinger233 and
NikAleksandrov
gandro
approved these changes
Mar 28, 2023
|
/test-backport-1.11 Job 'Cilium-PR-K8s-1.19-kernel-4.9' hit: #22555 (92.92% similarity) Job 'Cilium-PR-K8s-1.17-kernel-4.9' failed: Click to show.Test NameFailure OutputIf it is a flake and a GitHub issue doesn't already exist to track it, comment Job 'Cilium-PR-K8s-1.17-kernel-4.9' has 1 failure but they might be new flake since it also hit 1 known flake: #22555 (92.92) Job 'Cilium-PR-K8s-1.19-kernel-4.9' hit: #23365 (94.07% similarity) Job 'Cilium-PR-K8s-1.17-kernel-4.9' hit: #22555 (92.92% similarity) |
|
/test-1.21-4.9 |
|
/test-1.19-4.9 |
|
/test-1.17-4.9 |
julianwiedmann
approved these changes
Mar 28, 2023
geakstr
approved these changes
Mar 29, 2023
|
/test-1.19-4.9 |
jschwinger233
approved these changes
Mar 29, 2023
NikAleksandrov
approved these changes
Mar 29, 2023
|
/test-1.17-4.9 |
|
Cilium-PR-K8s-1.17-kernel-4.9' hit known flake #22555, all other tests passed and most reviews are in. Marking as ready to merge. |
tklauser
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.
.github/renovate.json5as the renovate configuration lives onmasterbranch only.
/urls #23631 -- hubble-ui: allow ingress from non root/urls (@geakstr)make -C Documentation update-helm-values && make -C install/kubernetes.Once this PR is merged, you can update the PR labels via: