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.

Sign up for GitHub

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

Upgrade k3s version to v1.27.9+k3s1 #108

Closed
wants to merge 1 commit into from
Closed

Upgrade k3s version to v1.27.9+k3s1 #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions modules/flake/overlays.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,28 @@
{
# Provide overlay to add `nix-snapshotter`.
flake.overlays.default = self: super: {
nix-snapshotter = self.callPackage ../../package.nix {};
nix-snapshotter = self.callPackage ../../package.nix { };

# Depends on PR merged into main, but not yet in a release tag.
# Depends on PR merged into main, but not yet in nixpkgs. Included in 2.0.0-beta.1 and later.
# See: https://github.com/containerd/containerd/pull/9028
containerd = super.containerd.overrideAttrs(o: {
containerd = super.containerd.overrideAttrs (o: {
src = self.fetchFromGitHub {
inherit (o.src) owner repo;
rev = "779875a057ff98e9b754371c193fe3b0c23ae7a2";
hash = "sha256-sXMDMX0QPbnFvRYrAP+sVFjTI9IqzOmLnmqAo8lE9pg=";
};
});


# Fixes https://github.com/pdtpartners/nix-snapshotter/issues/102 due to 23.11 only supporting v1.27.6 while we need v1.27.7.
# Remove once we upgrade to the next stable release.
k3s = super.k3s.overrideAttrs (oldAttrs: {
k3sRepo = super.fetchgit {
url = "https://github.com/k3s-io/k3s";
rev = "v1.27.9+k3s1";
sha256 = "sha256-Zr9Zp9pi7S3PCTveiuSb0RebiGZrxxKC+feTAWO47Js=";
Comment on lines +18 to +24
Copy link
Contributor

Choose a reason for hiding this comment

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

@RobbieBuxton I just wanted to point out that nixpkgs-unstable has a recent enough version (it's currently 1.27.9+k3s1). Should we depend on this one instead?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yeah, this is the same version as what unstable has and I don't think the implementation of k3s has changed since the introduction of 23.11 so this is a nice way to get an updated package without having to subscribe to two version of nixpkgs.

};
});
};

perSystem = { system, ... }: {
Expand Down
1 change: 1 addition & 0 deletions modules/nixos/k3s.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ in {
enable = true;
extraFlags = toString [
"--container-runtime-endpoint unix:///run/containerd/containerd.sock"
"--image-service-endpoint unix:///run/nix-snapshotter/nix-snapshotter.sock"
];
};

Expand Down