public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118822 from superherointj/package-k3s-v1.20.5+k3s1

Browse Source 
k3s: 1.20.4+k3s1 -> 1.20.5+k3s1
This commit is contained in:
Pascal Bach 2021-04-09 07:39:06 +02:00 committed by GitHub
commit c80690a681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/networking/cluster/k3s/default.nix
View File

@ -44,7 +44,7 @@ with lib;
# Those pieces of software we entirely ignore upstream's handling of, and just # Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired. # make sure they're in the path if desired.
let let
k3sVersion = "1.20.4+k3s1"; # k3s git tag k3sVersion = "1.20.5+k3s1"; # k3s git tag
traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag
k3sRootVersion = "0.8.1"; # taken from ./scripts/download at the above k3s tag k3sRootVersion = "0.8.1"; # taken from ./scripts/download at the above k3s tag
k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag
@ -79,7 +79,7 @@ let
owner = "rancher"; owner = "rancher";
repo = "plugins"; repo = "plugins";
rev = "v${version}"; rev = "v${version}";
sha256 = "13kx9msn5y9rw8v1p717wx0wbjqln59g6y3qfb1760aiwknva35q"; sha256 = "sha256-uAy17eRRAXPCcnh481KxFMvFQecnnBs24jn5YnVNfY4=";
}; };
meta = { meta = {
@ -96,7 +96,7 @@ let
url = "https://github.com/k3s-io/k3s"; url = "https://github.com/k3s-io/k3s";
rev = "v${k3sVersion}"; rev = "v${k3sVersion}";
leaveDotGit = true; # ./scripts/version.sh depends on git leaveDotGit = true; # ./scripts/version.sh depends on git
sha256 = "0rmn3nh8a94axv6lb2xjnn3gpq0scnvj69bvcs74azvw62fvq016"; sha256 = "sha256-7RAZkSTh15BEZ3p6u2xE9vd5fpy4KBYrl2TjtpIiStM=";
}; };
# Stage 1 of the k3s build: # Stage 1 of the k3s build:
# Let's talk about how k3s is structured. # Let's talk about how k3s is structured.
@ -243,16 +243,17 @@ stdenv.mkDerivation rec {
iproute2 iproute2
bridge-utils bridge-utils
ethtool ethtool
util-linux util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388
ipset ipset
conntrack-tools conntrack-tools
]; ];
buildInputs = [ buildInputs = [
k3sBin k3sBin
makeWrapper
] ++ k3sRuntimeDeps; ] ++ k3sRuntimeDeps;
nativeBuildInputs = [ makeWrapper ];
unpackPhase = "true"; unpackPhase = "true";
# And, one final derivation (you thought the last one was it, right?) # And, one final derivation (you thought the last one was it, right?)