Skip to content

Commit 3a6846a

Browse files
authored
[v1.29] Bump hardened k8s and build base (#7426)
* Bump hardened k8s and build base
1 parent 51e7e5d commit 3a6846a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG KUBERNETES_VERSION=dev
22

33
# Build environment
4-
FROM rancher/hardened-build-base:v1.22.8b1 AS build
4+
FROM rancher/hardened-build-base:v1.22.9b1 AS build
55
ARG DAPPER_HOST_ARCH
66
ENV ARCH $DAPPER_HOST_ARCH
77
RUN set -x && \
@@ -117,7 +117,7 @@ RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml
117117
# This image includes any host level programs that we might need. All binaries
118118
# must be placed in bin/ of the file image and subdirectories of bin/ will be flattened during installation.
119119
# This means bin/foo/bar will become bin/bar when rke2 installs this to the host
120-
FROM rancher/hardened-kubernetes:v1.29.11-rke2r1-build20241202 AS kubernetes
120+
FROM rancher/hardened-kubernetes:v1.29.12-rke2r1-build20241212 AS kubernetes
121121
FROM rancher/hardened-containerd:v1.7.23-k3s2-build20241203 AS containerd
122122
FROM rancher/hardened-crictl:v1.29.0-build20241008 AS crictl
123123
FROM rancher/hardened-runc:v1.1.14-build20240910 AS runc

scripts/version.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code;
3232
PLATFORM=${GOOS}-${GOARCH}
3333
RELEASE=${PROG}.${PLATFORM}
3434
# hardcode versions unless set specifically
35-
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.29.11}
36-
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.11-rke2r1-build20241202}
35+
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.29.12}
36+
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.12-rke2r1-build20241212}
3737
ETCD_VERSION=${ETCD_VERSION:-v3.5.16-k3s1}
3838
PAUSE_VERSION=${PAUSE_VERSION:-3.6}
3939
CCM_VERSION=${CCM_VERSION:-v1.29.10-0.20241016053521-9510ac25fefb-build20241016}

0 commit comments

Comments
 (0)