Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-24.05] Backport 339264 to release 24.05 #340037

Merged

Conversation

rorosen
Copy link
Contributor

@rorosen rorosen commented Sep 6, 2024

Description of changes

Backport #339264 to release 24.05.

k3s_1_27: remove
k3s_1_28: 1.28.12+k3s1 -> 1.28.13+k3s1
k3s_1_29: 1.29.7+k3s2 -> 1.29.8+k3s1
k3s_1_30: 1.30.3+k3s1 -> 1.30.4+k3s1
k3s_1_31: init 1.31.0+k3s1

I removed 1.27 as it's EOL and I guess 24.05 shouldn't provide EOL packages (it's not only EOL but also not the newest patch version). Let me know if 1.27 was on purpose still in 24.05.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@NixOS/k3s

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: k3s Kubernates distribution (https://k3s.io/) label Sep 6, 2024
@ofborg ofborg bot added 8.has: clean-up 8.has: package (new) This PR adds a new package labels Sep 6, 2024
@ofborg ofborg bot requested review from euank and Mic92 September 6, 2024 10:25
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 labels Sep 6, 2024
@rorosen
Copy link
Contributor Author

rorosen commented Sep 6, 2024

The cherry picks checker fails probably because I made some manual changes:

  • Do not set the k3s alias to k3s_1_31 on stable
  • Remove images-versions.json as the builder on stable can't handle it

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Sep 6, 2024
Copy link
Member

@wrmilling wrmilling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Result of nixpkgs-review pr 340037 run on x86_64-linux 1

4 packages built:
  • k3s (k3s_1_30)
  • k3s_1_28
  • k3s_1_29
  • k3s_1_31

@wrmilling wrmilling added the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package label Sep 11, 2024
@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Sep 12, 2024
@fabianhjr
Copy link
Member

@wrmilling
Copy link
Member

wrmilling commented Sep 13, 2024

Cherry-pick check is failing: https://github.com/NixOS/nixpkgs/actions/runs/10736215337/job/29775134085?pr=340037

Thank you for the call-out, in this case it would be expected to fail as the PRs commits will not match exactly. We are not going to be migrating the k3s alias on stable to a newer revision as was done on unstable, but we still want the latest revision(s) to be available on stable (e.g. k3s_1_28, k3s_1_29, k3s_1_30, and k3s_1_31 packages)

@fabianhjr fabianhjr merged commit e57ee19 into NixOS:release-24.05 Sep 13, 2024
32 of 34 checks passed
@rorosen rorosen deleted the backport-339264-to-release-24.05 branch September 14, 2024 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: k3s Kubernates distribution (https://k3s.io/) 8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants