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

rke2: fix update script and update all rke2 packages (#374267)

Browse Source
This commit is contained in:
Jonas Chevalier
2025-01-17 16:20:35 +01:00
committed by GitHub
parent 86bcc8d9b6 d9ad15355f
commit 2dda684f9b
4 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/cluster/rke2/latest/versions.nix
+11 -11
View File
@@ -1,14 +1,14 @@
{
rke2Version = "1.31.1+rke2r1";
rke2Commit = "909d20d6a28cd7656b7177190f06f69f57927613";
rke2TarballHash = "sha256-9ZryOX6QMNpjDtsOXLOVNPjCc6AMAa+XDLOn1EpyCcg=";
rke2VendorHash = "sha256-7nWbWi4oJTOWZ5iZr9ptECDJJakPg4qZ7hW+tU7LBsI=";
k8sVersion = "v1.31.1";
k8sImageTag = "v1.31.1-rke2r1-build20240912";
etcdVersion = "v3.5.13-k3s1-build20240910";
rke2Version = "1.32.0+rke2r1";
rke2Commit = "1182e7eb91b27b1686e69306eb2e227928a27a38";
rke2TarballHash = "sha256-mmHQxiNcfgZTTdYPJPO7WTIlaCRM4CWsWwfRUcAR8ho=";
rke2VendorHash = "sha256-6Y3paEQJ8yHzONqalzoe15TjWhF3zGsM92LS1AcJ2GM=";
k8sVersion = "v1.32.0";
k8sImageTag = "v1.32.0-rke2r1-build20241212";
etcdVersion = "v3.5.16-k3s1-build20241106";
pauseVersion = "3.6";
ccmVersion = "v1.31.0-build20240910";
dockerizedVersion = "v1.31.1-rke2r1";
golangVersion = "go1.22.6";
eol = "2025-10-28";
ccmVersion = "v1.32.0-rc3.0.20241220224140-68fbd1a6b543-build20250101";
dockerizedVersion = "v1.32.0-rke2r1";
golangVersion = "go1.23.3";
eol = "2026-02-28";
}
pkgs/applications/networking/cluster/rke2/stable/versions.nix
+11 -11
View File
@@ -1,14 +1,14 @@
{
rke2Version = "1.30.5+rke2r1";
rke2Commit = "0c83bc82315cd61664880d0b52a7e070e9fbd623";
rke2TarballHash = "sha256-K5e7TNlL97PQ13IYnr4PSrXb4XaGJT9bPq55iWL0m1g=";
rke2VendorHash = "sha256-QIcVyWnedKNF10OqJ2WmZqZeKA+8hvwDQ4Pl+WUOEJY=";
k8sVersion = "v1.30.5";
k8sImageTag = "v1.30.5-rke2r1-build20240912";
etcdVersion = "v3.5.13-k3s1-build20240910";
rke2Version = "1.31.4+rke2r1";
rke2Commit = "5142beec71f7a61804840df5b434c2fd7137ce82";
rke2TarballHash = "sha256-Lebi3a7kNA9IQCVVkYfUoGEeEiLScqpOx1aTCFElDvw=";
rke2VendorHash = "sha256-DGmu1vFNcu1O2wuEwRZRBTL/TP2lJ9ggQ2M/Ix+jknM=";
k8sVersion = "v1.31.4";
k8sImageTag = "v1.31.4-rke2r1-build20241212";
etcdVersion = "v3.5.16-k3s1-build20241106";
pauseVersion = "3.6";
ccmVersion = "v1.30.4-build20240910";
dockerizedVersion = "v1.30.5-rke2r1";
golangVersion = "go1.22.6";
eol = "2025-06-28";
ccmVersion = "v1.31.2-0.20241016053446-0955fa330f90-build20241016";
dockerizedVersion = "v1.31.4-rke2r1";
golangVersion = "go1.22.9";
eol = "2025-10-28";
}
pkgs/applications/networking/cluster/rke2/testing/versions.nix
+10 -10
View File
@@ -1,14 +1,14 @@
{
rke2Version = "1.31.1-rc3+rke2r1";
rke2Commit = "909d20d6a28cd7656b7177190f06f69f57927613";
rke2TarballHash = "sha256-9ZryOX6QMNpjDtsOXLOVNPjCc6AMAa+XDLOn1EpyCcg=";
rke2VendorHash = "sha256-7nWbWi4oJTOWZ5iZr9ptECDJJakPg4qZ7hW+tU7LBsI=";
k8sVersion = "v1.31.1";
k8sImageTag = "v1.31.1-rke2r1-build20240912";
etcdVersion = "v3.5.13-k3s1-build20240910";
rke2Version = "1.31.4-rc3+rke2r1";
rke2Commit = "b2d8003d79075e7331ab8f2d1e1a3c494ed944b9";
rke2TarballHash = "sha256-eTA+/fF6HuXDT4EUnvPIaJtLfbNGk9BXG+z3zCRPh9s=";
rke2VendorHash = "sha256-akP6XLkeBtVVGgaLBcn+e1bwFtMPRs1/NGR9VN5UuCo=";
k8sVersion = "v1.31.4";
k8sImageTag = "v1.31.4-rke2r1-build20241212";
etcdVersion = "v3.5.16-k3s1-build20241106";
pauseVersion = "3.6";
ccmVersion = "v1.31.0-build20240910";
dockerizedVersion = "v1.31.1-rc3-rke2r1";
golangVersion = "go1.22.6";
ccmVersion = "v1.31.2-0.20241016053446-0955fa330f90-build20241016";
dockerizedVersion = "v1.31.4-rc3-rke2r1";
golangVersion = "go1.22.9";
eol = "2025-10-28";
}
pkgs/applications/networking/cluster/rke2/update-script.sh
+2 -3
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl git gnugrep gnused yq-go nix-prefetch go
#!nix-shell -i bash -p curl git gnugrep gnused yq-go nurl go
SHELL_FLAGS=$(set +o)
set -x -eu -o pipefail
@@ -54,8 +54,7 @@ cat << EOF > "${WORKDIR}/${CHANNEL_NAME}/versions.nix"
EOF
set +e
RKE2_VENDOR_HASH=$(nix-prefetch -I nixpkgs=$(git rev-parse --show-toplevel) \
"{ sha256 }: rke2_${CHANNEL_NAME}.goModules.overrideAttrs (_: { vendorHash = sha256; })")
RKE2_VENDOR_HASH=$(nurl -e "(import $(git rev-parse --show-toplevel) {}).rke2_${CHANNEL_NAME}.goModules")
set -e
if [ -n "${RKE2_VENDOR_HASH:-}" ]; then