git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #140790 from superherointj/package-k3s-updateScript-fix
commitf855bcbf0564fdd4f71e8e98127c2521af1f8604 authorSandro <sandro.jaeckel@gmail.com> dateThu 7 Oct 2021, 00:00 (5 years ago) parent9e01667bc9b01f
2 files changed+11−11
pkgs/applications/networking/cluster/k3s/default.nix+1−1 pkgs/applications/networking/cluster/k3s/update.sh+10−10
pkgs/applications/networking/cluster/k3s/default.nix+1−1
@@ -47,7 +47,7 @@ let
4747 k3sCommit = "3e250fdbab72d88f7e6aae57446023a0567ffc97"; # k3s git commit at the above version
4848 k3sRepoSha256 = "1w7drvk0bmlmqrxh1y6dxjy7dk6bdrl72pkd25lc1ir6wbzb05h9";
4949
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
5151 traefikChartSha256 = "sha256-9d7p0ngyMN27u4OPgz7yI14Zj9y36t9o/HMX5wyDpUI=";
5252
5353 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]}")
1010
1111LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json
1212curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
13− https://api.github.com/repos/k3s-io/k3s/releases/latest > ${LATEST_TAG_RAWFILE}
14−
15−LATEST_TAG_NAME=$(jq -r '.tag_name' ${LATEST_TAG_RAWFILE})
13+ https://api.github.com/repos/k3s-io/k3s/releases > ${LATEST_TAG_RAWFILE}
1614
15+LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | grep -v -e rc -e engine | sed 's/["|,| ]//g' | sort -r | head -n1)
1716K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//')
1817
19−LATEST_TAG_TARBALL_URL=$(jq -r '.tarball_url' ${LATEST_TAG_RAWFILE})
20−
2118K3S_COMMIT=$(curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
2219 https://api.github.com/repos/k3s-io/k3s/tags \
2320 | jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha")
2421
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)
2623
2724FILE_SCRIPTS_DOWNLOAD=${WORKDIR}/scripts-download
2825curl --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
3027FILE_SCRIPTS_VERSION=${WORKDIR}/scripts-version.sh
3128curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/version.sh > $FILE_SCRIPTS_VERSION
3229
33−TRAEFIK_CHART_VERSION=$(grep TRAEFIK_VERSION= $FILE_SCRIPTS_DOWNLOAD \
34− | cut -d'=' -f2 | cut -d' ' -f1)
30+FILE_MANIFESTS_TRAEFIK=${WORKDIR}/manifests-traefik.yaml
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+
3535TRAEFIK_CHART_SHA256=$(nix-prefetch-url --quiet "https://helm.traefik.io/traefik/traefik-${TRAEFIK_CHART_VERSION}.tgz")
3636
37−K3S_ROOT_VERSION=$(grep ROOT_VERSION= $FILE_SCRIPTS_DOWNLOAD \
37+K3S_ROOT_VERSION=$(grep 'ROOT_VERSION=' ${FILE_SCRIPTS_DOWNLOAD} \
3838 | cut -d'=' -f2 | cut -d' ' -f1 | sed 's/^v//')
3939K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \
4040 "https://github.com/k3s-io/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar")
4141
42−CNIPLUGINS_VERSION=$(grep VERSION_CNIPLUGINS= $FILE_SCRIPTS_VERSION \
42+CNIPLUGINS_VERSION=$(grep 'VERSION_CNIPLUGINS=' ${FILE_SCRIPTS_VERSION} \
4343 | cut -d'=' -f2 | cut -d' ' -f1 | sed -e 's/"//g' -e 's/^v//')
4444CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \
4545 "https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz")