v1.15 Backports 2024-10-09 #35320
Merged
v1.15 Backports 2024-10-09 #35320
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
[ upstream commit 6b4a032 ] [ backporter's notes: hit minor conflicts due to different surrounding context; accepted combination. ] Instead of using a fixed directory, use a variable to define the hubble-relay directory, just like the other cilium binaries. Signed-off-by: Chance Zibolski <chance.zibolski@gmail.com> Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
[ upstream commit 51e57df ] [ backporter's notes: hit minor conflicts with 04e8828 (".github/workflows: change GH runners"); simply accepted combination. Additionally hit conflict in conformance-k8s-kind.yaml as 91b7c88 ("gha: use GH_RUNNER_EXTRA_POWER for conformance-k8s-kind workflow") had not been backporter to v1.15. Accepted the incoming change to ensure consistency. ] Refactor vars.GH_RUNNER_EXTRA_POWER to vars.GH_RUNNER_EXTRA_POWER_UBUNTU_LATEST to make it clear that this variable should be pointing to ubuntu-latest. Signed-off-by: André Martins <andre@cilium.io> Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
[ upstream commit 96f1bc9 ] If GH_RUNNER_EXTRA_POWER_UBUNTU_LATEST is not set then the GH workflow should default to ubuntu-latest to avoid workflows from failing on forks in case the variable is not set on such fork. Signed-off-by: André Martins <andre@cilium.io> Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
[ upstream commit 5749579 ] We need to checkout the base branch, instead of the default branch, to checkout the right scripts to generate the source code respectively of the stable branch the GH workflow is running from otherwise we will always run the scripts from the main branch from stable branches. Fixes: ada2560 (".github: run scripts from trusted source code") Signed-off-by: André Martins <andre@cilium.io> Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
[ upstream commit 8639738 ] Fix upgrade documentation at Helm template generation, where the parameter for enabling the agent is no longer correct and produces the following error: "agent: Invalid type. Expected: boolean, given: object" [ Quentin: Reformat commit object, description ] Fixes: e9cb43c ("Helm: full refactor of helm charts, default values implemented, tests updated, kind cni integration") Signed-off-by: Oleg Neumyvakin <oneumyvakin@gmail.com> Signed-off-by: Quentin Monnet <qmo@qmon.net> Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
|
/test-backport-1.15 |
chancez
approved these changes
Oct 9, 2024
aanm
approved these changes
Oct 10, 2024
nebril
approved these changes
Oct 10, 2024
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.
Once this PR is merged, a GitHub action will update the labels of these PRs: