v1.14 Backports 2023-12-07 #29689
Merged
v1.14 Backports 2023-12-07 #29689
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
sayboras
added
kind/backports
|
/test-backport-1.14 |
sayboras
added
the
release-blocker/1.14
|
Why is my commit #24836 part of this backport? I can see that it's already part of the latest v1.14.4 see https://github.com/cilium/cilium/blob/main/install/kubernetes/cilium/values.yaml#L74 Is it because the commits by @ayuspin where done on top of my commit? |
|
The changes in #24836 are only available in main, but not in 1.14 branch and older branches. |
[ upstream commit 4a5cbba ] Signed-off-by: Andrii Iuspin <yuspin@gmail.com> Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit 6f54448 ] This commit is to add automountServiceAccountToken, extraVolumes and extraVolumeMounts field to preflight workload. Signed-off-by: Andrii Iuspin <yuspin@gmail.com> Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit 22a4d1d ] Signed-off-by: Andrii Iuspin <yuspin@gmail.com> Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit 76126b7 ] Signed-off-by: Andrii Iuspin <yuspin@gmail.com> Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit de788fa ] Signed-off-by: Andrii Iuspin <yuspin@gmail.com> Signed-off-by: Tam Mach <tam.mach@cilium.io> Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
force-pushed
the
pr/v1.14-backport-2023-12-07
branch
from
fb47da6
to
7705546
Compare
|
/test-backport-1.14 |
|
You are right, the mentioned changes are already part of 1.14, I have dropped the commit accordingly. Thanks for highlighting 👍 |
ti-mo
approved these changes
Dec 7, 2023
maintainer-s-little-helper
bot
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.
helm: Add SA to nodeinit ds #24836 (@darox)already part of 1.14 as highlighted below.Once this PR is merged, a GitHub action will update the labels of these PRs: