k3s_1_26: 1.26.5+k3s1 -> 1.26.6+k3s1 #242272
Merged
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
|
Result of 1 package built:
|
Frostman
approved these changes
Jul 9, 2023
yajo
approved these changes
Jul 14, 2023
LeSuisse
added
12.approvals: 2
12.approved-by: package-maintainer
and removed
12.approvals: 1
labels
LeSuisse
approved these changes
Jul 19, 2023
There was a problem hiding this comment.
Build looks OK and tests are passing.
Should this upgrade be backported to 23.05? Or do we need to apply the security fix to the version we currently have on 23.05?
Result of nixpkgs-review pr 242272 run on x86_64-linux 1
1 package built:
- k3s_1_26
|
Backport failed for Please cherry-pick the changes locally. git fetch origin release-23.05
git worktree add -d .worktree/backport-242272-to-release-23.05 origin/release-23.05
cd .worktree/backport-242272-to-release-23.05
git checkout -b backport-242272-to-release-23.05
ancref=$(git merge-base 141f167f1430b4c712b73321c4f182261e88329c f4079a45d31bac551b5853ad6f229e27f99a3ad6)
git cherry-pick -x $ancref..f4079a45d31bac551b5853ad6f229e27f99a3ad6 |
|
Yup, for security reasons this should be backported. A shame the automatic backport bot failed, I'll do it by hand |
|
Ahh, the backport failed because #242293 isn't merged yet. I'll cherry-pick this commit onto that branch too. |
12 tasks
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.
Description of changes
This update was made via
nix-shell maintainers/scripts/update.nix --argstr package k3s_1_26, and no additional changes were needed beyond what the script did.Upstream release notes: https://github.com/k3s-io/k3s/releases/tag/v1.26.6%2Bk3s1
This also fixes CVE-2023-2728.
The upstream k3s notes don't mention it, but the k8s ones do
Things done
sandbox = trueset innix.conf? (See Nix manual)NixOS tests:
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)