-
-
Notifications
You must be signed in to change notification settings - Fork 13.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
On unstable, we're now tracking | version | EOL | |---------|-----| | 1.24 | 07/2023 | | 1.25 | 10/2023 | | 1.26 | 02/2024 | | 1.27 | 06/2024 | This commit adds 1.27 using the 1_26 builder introduced in the last commit. Notably, this commit also updates the 'update.sh' script to work for the new setup I have here.
- Loading branch information
Showing
5 changed files
with
161 additions
and
3 deletions.
There are no files selected for viewing
10 changes: 10 additions & 0 deletions
10
pkgs/applications/networking/cluster/k3s/1_27/chart-versions.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
{ | ||
traefik-crd = { | ||
url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-20.3.1+up20.3.0.tgz"; | ||
sha256 = "1775vjldvqvhzdbzanxhbaqbmkih09yb91im651q8bc7z5sb9ckn"; | ||
}; | ||
traefik = { | ||
url = "https://k3s.io/k3s-charts/assets/traefik/traefik-20.3.1+up20.3.0.tgz"; | ||
sha256 = "1rj0f0n0vgjcbzfwzhqmsd501i2f6vw145w9plbp8gwdyzmg2nc6"; | ||
}; | ||
} |
127 changes: 127 additions & 0 deletions
127
pkgs/applications/networking/cluster/k3s/1_27/update.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
#!/usr/bin/env nix-shell | ||
#!nix-shell -i bash -p curl gnugrep gnused jq yq-go nix-prefetch | ||
|
||
set -x -eu -o pipefail | ||
|
||
WORKDIR=$(mktemp -d) | ||
trap "rm -rf ${WORKDIR}" EXIT | ||
|
||
NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/ | ||
NIXPKGS_K3S_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ | ||
cd ${NIXPKGS_K3S_PATH} | ||
|
||
LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json | ||
curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ | ||
https://api.github.com/repos/k3s-io/k3s/releases > ${LATEST_TAG_RAWFILE} | ||
|
||
LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | \ | ||
grep -v -e rc -e engine | tail -n +2 | head -n -1 | sed 's|[", ]||g' | sort -rV | head -n1) | ||
|
||
K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//') | ||
|
||
K3S_COMMIT=$(curl --silent -f ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ | ||
https://api.github.com/repos/k3s-io/k3s/tags \ | ||
| jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha") | ||
|
||
K3S_REPO_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/k3s-io/k3s/archive/refs/tags/${LATEST_TAG_NAME}.tar.gz) | ||
|
||
FILE_SCRIPTS_DOWNLOAD=${WORKDIR}/scripts-download | ||
curl --silent -f https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/download > $FILE_SCRIPTS_DOWNLOAD | ||
|
||
FILE_SCRIPTS_VERSION=${WORKDIR}/scripts-version.sh | ||
curl --silent -f https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/version.sh > $FILE_SCRIPTS_VERSION | ||
|
||
FILE_TRAEFIK_MANIFEST=${WORKDIR}/traefik.yml | ||
curl --silent -f -o "$FILE_TRAEFIK_MANIFEST" https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/manifests/traefik.yaml | ||
|
||
CHART_FILES=( $(yq eval --no-doc .spec.chart "$FILE_TRAEFIK_MANIFEST" | xargs -n1 basename) ) | ||
# These files are: | ||
# 1. traefik-crd-20.3.1+up20.3.0.tgz | ||
# 2. traefik-20.3.1+up20.3.0.tgz | ||
# at the time of writing | ||
|
||
if [[ "${#CHART_FILES[@]}" != "2" ]]; then | ||
echo "New manifest charts added, the packaging scripts will need to be updated: ${CHART_FILES}" | ||
exit 1 | ||
fi | ||
|
||
CHARTS_URL=https://k3s.io/k3s-charts/assets | ||
# Get metadata for both files | ||
rm -f chart-versions.nix.update | ||
cat > chart-versions.nix.update <<EOF | ||
{ | ||
traefik-crd = { | ||
url = "${CHARTS_URL}/traefik-crd/${CHART_FILES[0]}"; | ||
sha256 = "$(nix-prefetch-url --quiet "${CHARTS_URL}/traefik-crd/${CHART_FILES[0]}")"; | ||
}; | ||
traefik = { | ||
url = "${CHARTS_URL}/traefik/${CHART_FILES[1]}"; | ||
sha256 = "$(nix-prefetch-url --quiet "${CHARTS_URL}/traefik/${CHART_FILES[1]}")"; | ||
}; | ||
} | ||
EOF | ||
mv chart-versions.nix.update chart-versions.nix | ||
|
||
FILE_GO_MOD=${WORKDIR}/go.mod | ||
curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/go.mod > $FILE_GO_MOD | ||
|
||
|
||
K3S_ROOT_VERSION=$(grep 'VERSION_ROOT=' ${FILE_SCRIPTS_VERSION} \ | ||
| cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//') | ||
K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \ | ||
"https://github.com/k3s-io/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar") | ||
|
||
CNIPLUGINS_VERSION=$(grep 'VERSION_CNIPLUGINS=' ${FILE_SCRIPTS_VERSION} \ | ||
| cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//') | ||
CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \ | ||
"https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz") | ||
|
||
CONTAINERD_VERSION=$(grep 'VERSION_CONTAINERD=' ${FILE_SCRIPTS_VERSION} \ | ||
| cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//') | ||
CONTAINERD_SHA256=$(nix-prefetch-url --quiet --unpack \ | ||
"https://github.com/k3s-io/containerd/archive/refs/tags/v${CONTAINERD_VERSION}.tar.gz") | ||
|
||
CRI_CTL_VERSION=$(grep github.com/kubernetes-sigs/cri-tools ${FILE_GO_MOD} \ | ||
| head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//') | ||
|
||
setKV () { | ||
sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ${NIXPKGS_K3S_PATH}default.nix | ||
} | ||
|
||
FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; | ||
|
||
cat >versions.nix <<EOF | ||
{ | ||
k3sVersion = "${K3S_VERSION}"; | ||
k3sCommit = "${K3S_COMMIT}"; | ||
k3sRepoSha256 = "${K3S_REPO_SHA256}"; | ||
k3sVendorSha256 = "${FAKE_HASH}"; | ||
chartVersions = import ./chart-versions.nix; | ||
k3sRootVersion = "${K3S_ROOT_VERSION}"; | ||
k3sRootSha256 = "${K3S_ROOT_SHA256}"; | ||
k3sCNIVersion = "${CNIPLUGINS_VERSION}"; | ||
k3sCNISha256 = "${CNIPLUGINS_SHA256}"; | ||
containerdVersion = "${CONTAINERD_VERSION}"; | ||
containerdSha256 = "${CONTAINERD_SHA256}"; | ||
criCtlVersion = "${CRI_CTL_VERSION}"; | ||
} | ||
EOF | ||
|
||
set +e | ||
K3S_VENDOR_SHA256=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} "{ sha256 }: (import ${NIXPKGS_ROOT}. {}).k3s.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })") | ||
set -e | ||
|
||
if [ -n "${K3S_VENDOR_SHA256:-}" ]; then | ||
sed "s|${FAKE_HASH}|${K3S_VENDOR_SHA256}|g" ./versions.nix | ||
else | ||
echo "Update failed. K3S_VENDOR_SHA256 is empty." | ||
exit 1 | ||
fi | ||
|
||
# `git` flag here is to be used by local maintainers to speed up the bump process | ||
if [ $# -eq 1 ] && [ "$1" = "git" ]; then | ||
OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_ROOT. {}; k3s.version or (builtins.parseDrvName k3s.name).version" | tr -d '"')" | ||
git switch -c "package-k3s-${K3S_VERSION}" | ||
git add "$NIXPKGS_K3S_PATH"/default.nix | ||
git commit -m "k3s: ${OLD_VERSION} -> ${K3S_VERSION}" | ||
fi |
14 changes: 14 additions & 0 deletions
14
pkgs/applications/networking/cluster/k3s/1_27/versions.nix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
{ | ||
k3sVersion = "1.27.1+k3s1"; | ||
k3sCommit = "bc5b42c27908ab430101eff0db0a0b22f870bd7a"; | ||
k3sRepoSha256 = "1xj3blfayrsfbcsljjdaswy49hhz8yiwf1d85arnsgbn8fidswpm"; | ||
k3sVendorSha256 = "sha256-+sM2fjS88kxMQzra2t+jU1IaKCoJpW7p3w7lCOv5mMU="; | ||
chartVersions = import ./chart-versions.nix; | ||
k3sRootVersion = "0.12.1"; | ||
k3sRootSha256 = "0724yx3zk89m2239fmdgwzf9w672pik71xqrvgb7pdmknmmdn9f4"; | ||
k3sCNIVersion = "1.1.1-k3s1"; | ||
k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl"; | ||
containerdVersion = "1.6.19-k3s1"; | ||
containerdSha256 = "12dwqh77wplg30kdi73d90qni23agw2cwxjd2p5lchq86mpmmwwr"; | ||
criCtlVersion = "1.26.0-rc.0-k3s1"; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters