[release-1.30] Bump k3s, traefik, etcd, crictl

Dockerfile

@@ -119,7 +119,7 @@ RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml
 # This means bin/foo/bar will become bin/bar when rke2 installs this to the host
 FROM rancher/hardened-kubernetes:v1.30.9-rke2r1-build20250116 AS kubernetes
 FROM rancher/hardened-containerd:v1.7.23-k3s2-build20241203 AS containerd
-FROM rancher/hardened-crictl:v1.30.1-build20241008 AS crictl
+FROM rancher/hardened-crictl:v1.30.1-build20250211 AS crictl
 FROM rancher/hardened-runc:v1.2.4-build20250109 AS runc
 
 FROM scratch AS runtime-collect

charts/chart_versions.yaml

@@ -14,13 +14,13 @@ charts:
   - version: 1.36.102
     filename: /charts/rke2-coredns.yaml
     bootstrap: true
-  - version: 4.12.003
+  - version: 4.12.004
     filename: /charts/rke2-ingress-nginx.yaml
     bootstrap: false
-  - version: 27.0.200
+  - version: 27.0.201
     filename: /charts/rke2-traefik.yaml
     bootstrap: false
-  - version: 27.0.200
+  - version: 27.0.201
     filename: /charts/rke2-traefik-crd.yaml
     bootstrap: false
   - version: 3.12.200

pkg/cli/cmds/etcd_snapshot.go

@@ -40,6 +40,7 @@ func NewEtcdSnapshotCommand() cli.Command {
 		"s3-proxy":           copyFlag,
 		"s3-region":          copyFlag,
 		"s3-secret-key":      copyFlag,
+		"s3-session-token":   copyFlag,
 		"s3-skip-ssl-verify": copyFlag,
 		"s3-timeout":         copyFlag,
 	}

pkg/cli/cmds/server.go

@@ -145,6 +145,7 @@ var (
 		"etcd-s3-proxy":                     copyFlag,
 		"etcd-s3-region":                    copyFlag,
 		"etcd-s3-secret-key":                copyFlag,
+		"etcd-s3-session-token":             copyFlag,
 		"etcd-s3-skip-ssl-verify":           copyFlag,
 		"etcd-s3-timeout":                   copyFlag,
 		"disable-helm-controller":           dropFlag,

scripts/build-binary

@@ -30,7 +30,7 @@ VERSION_FLAGS="
     -X ${K3S_PKG}/pkg/version.Version=${VERSION}
     -X ${K3S_PKG}/pkg/version.UpstreamGolang=${VERSION_GOLANG}
     -X ${RKE2_PKG}/pkg/images.DefaultRegistry=${REGISTRY}
-    -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20241106
+    -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20250210
     -X ${RKE2_PKG}/pkg/images.DefaultKubernetesImage=rancher/hardened-kubernetes:${KUBERNETES_IMAGE_TAG}
     -X ${RKE2_PKG}/pkg/images.DefaultPauseImage=rancher/mirrored-pause:${PAUSE_VERSION}
     -X ${RKE2_PKG}/pkg/images.DefaultRuntimeImage=${REPO}/${PROG}-runtime:${DOCKERIZED_VERSION}

scripts/build-images

@@ -16,11 +16,11 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
     ${REGISTRY}/rancher/hardened-coredns:v1.12.0-build20241126
     ${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.9.0-build20241126
     ${REGISTRY}/rancher/hardened-dns-node-cache:1.24.0-build20241211
-    ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20241106
+    ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20250210
     ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.7.2-build20250110
     ${REGISTRY}/rancher/hardened-addon-resizer:1.8.22-build20250110
-    ${REGISTRY}/rancher/klipper-helm:v0.9.3-build20241008
-    ${REGISTRY}/rancher/klipper-lb:v0.4.9
+    ${REGISTRY}/rancher/klipper-helm:v0.9.4-build20250113
+    ${REGISTRY}/rancher/klipper-lb:v0.4.10
     ${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION}
     ${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.5.0
     ${REGISTRY}/rancher/nginx-ingress-controller:v1.12.0-hardened2
@@ -29,7 +29,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
 EOF
 
 xargs -n1 -t docker image pull --quiet << EOF > build/images-traefik.txt
-    ${REGISTRY}/rancher/mirrored-library-traefik:2.11.10
+    ${REGISTRY}/rancher/mirrored-library-traefik:2.11.20
 EOF
 
 xargs -n1 -t docker image pull --quiet << EOF > build/images-canal.txt

scripts/version.sh

@@ -34,7 +34,7 @@ RELEASE=${PROG}.${PLATFORM}
 # hardcode versions unless set specifically
 KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.30.9}
 KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.9-rke2r1-build20250116}
-ETCD_VERSION=${ETCD_VERSION:-v3.5.16-k3s1}
+ETCD_VERSION=${ETCD_VERSION:-v3.5.18-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
 CCM_VERSION=${CCM_VERSION:-v1.30.6-0.20241016053533-5ec454f50e7a-build20241016}