git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #140790 from superherointj/package-k3s-updateScript-fix
f855bcbSandro
pkgs/applications/networking/cluster/k3s/default.nix+1−1
@@ -47,7 +47,7 @@ let
47 k3sCommit = "3e250fdbab72d88f7e6aae57446023a0567ffc97"; # k3s git commit at the above version
47 k3sCommit = "3e250fdbab72d88f7e6aae57446023a0567ffc97"; # k3s git commit at the above version
48 k3sRepoSha256 = "1w7drvk0bmlmqrxh1y6dxjy7dk6bdrl72pkd25lc1ir6wbzb05h9";
48 k3sRepoSha256 = "1w7drvk0bmlmqrxh1y6dxjy7dk6bdrl72pkd25lc1ir6wbzb05h9";
49
49
50− traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION
50+ traefikChartVersion = "9.18.2"; # taken from ./manifests/traefik.yaml at spec.version
51 traefikChartSha256 = "sha256-9d7p0ngyMN27u4OPgz7yI14Zj9y36t9o/HMX5wyDpUI=";
51 traefikChartSha256 = "sha256-9d7p0ngyMN27u4OPgz7yI14Zj9y36t9o/HMX5wyDpUI=";
52
52
53 k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION
53 k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION
pkgs/applications/networking/cluster/k3s/update.sh+10−10
@@ -10,19 +10,16 @@ cd $(dirname "${BASH_SOURCE[0]}")
10
10
11LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json
11LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json
12curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
12curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
13− https://api.github.com/repos/k3s-io/k3s/releases/latest > ${LATEST_TAG_RAWFILE}
13+ https://api.github.com/repos/k3s-io/k3s/releases > ${LATEST_TAG_RAWFILE}
14−
15−LATEST_TAG_NAME=$(jq -r '.tag_name' ${LATEST_TAG_RAWFILE})
16
14
15+LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | grep -v -e rc -e engine | sed 's/["|,| ]//g' | sort -r | head -n1)
17K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//')
16K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//')
18
17
19−LATEST_TAG_TARBALL_URL=$(jq -r '.tarball_url' ${LATEST_TAG_RAWFILE})
20−
21K3S_COMMIT=$(curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
18K3S_COMMIT=$(curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
22 https://api.github.com/repos/k3s-io/k3s/tags \
19 https://api.github.com/repos/k3s-io/k3s/tags \
23 | jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha")
20 | jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha")
24
21
25−K3S_REPO_SHA256=$(nix-prefetch-url --quiet --unpack ${LATEST_TAG_TARBALL_URL})
22+K3S_REPO_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/k3s-io/k3s/archive/refs/tags/${LATEST_TAG_NAME}.tar.gz)
26
23
27FILE_SCRIPTS_DOWNLOAD=${WORKDIR}/scripts-download
24FILE_SCRIPTS_DOWNLOAD=${WORKDIR}/scripts-download
28curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/download > $FILE_SCRIPTS_DOWNLOAD
25curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/download > $FILE_SCRIPTS_DOWNLOAD
@@ -30,16 +27,19 @@ curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts
30FILE_SCRIPTS_VERSION=${WORKDIR}/scripts-version.sh
27FILE_SCRIPTS_VERSION=${WORKDIR}/scripts-version.sh
31curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/version.sh > $FILE_SCRIPTS_VERSION
28curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/version.sh > $FILE_SCRIPTS_VERSION
32
29
33−TRAEFIK_CHART_VERSION=$(grep TRAEFIK_VERSION= $FILE_SCRIPTS_DOWNLOAD \
30+FILE_MANIFESTS_TRAEFIK=${WORKDIR}/manifests-traefik.yaml
34− | cut -d'=' -f2 | cut -d' ' -f1)
31+curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/manifests/traefik.yaml > $FILE_MANIFESTS_TRAEFIK
32+
33+TRAEFIK_CHART_VERSION=$(awk -F/ '/traefik-([[:digit:]]+\.)/ {sub(/traefik-/, "", $6) ; sub(/\.tgz/, "", $6); print $6}' $FILE_MANIFESTS_TRAEFIK)
34+
35TRAEFIK_CHART_SHA256=$(nix-prefetch-url --quiet "https://helm.traefik.io/traefik/traefik-${TRAEFIK_CHART_VERSION}.tgz")
35TRAEFIK_CHART_SHA256=$(nix-prefetch-url --quiet "https://helm.traefik.io/traefik/traefik-${TRAEFIK_CHART_VERSION}.tgz")
36
36
37−K3S_ROOT_VERSION=$(grep ROOT_VERSION= $FILE_SCRIPTS_DOWNLOAD \
37+K3S_ROOT_VERSION=$(grep 'ROOT_VERSION=' ${FILE_SCRIPTS_DOWNLOAD} \
38 | cut -d'=' -f2 | cut -d' ' -f1 | sed 's/^v//')
38 | cut -d'=' -f2 | cut -d' ' -f1 | sed 's/^v//')
39K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \
39K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \
40 "https://github.com/k3s-io/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar")
40 "https://github.com/k3s-io/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar")
41
41
42−CNIPLUGINS_VERSION=$(grep VERSION_CNIPLUGINS= $FILE_SCRIPTS_VERSION \
42+CNIPLUGINS_VERSION=$(grep 'VERSION_CNIPLUGINS=' ${FILE_SCRIPTS_VERSION} \
43 | cut -d'=' -f2 | cut -d' ' -f1 | sed -e 's/"//g' -e 's/^v//')
43 | cut -d'=' -f2 | cut -d' ' -f1 | sed -e 's/"//g' -e 's/^v//')
44CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \
44CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \
45 "https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz")
45 "https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz")