Skip to content

Commit

Permalink
Update to 1.25.12 (#4496)
Browse files Browse the repository at this point in the history
  • Loading branch information
briandowns committed Jul 19, 2023
1 parent cc87f30 commit a0aa49e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,7 +1,7 @@
ARG KUBERNETES_VERSION=dev

# Build environment
FROM rancher/hardened-build-base:v1.19.10b2 AS build
FROM rancher/hardened-build-base:v1.20.6b2 AS build
ARG DAPPER_HOST_ARCH
ENV ARCH $DAPPER_HOST_ARCH
RUN set -x \
Expand Down Expand Up @@ -138,7 +138,7 @@ RUN rm -vf /charts/*.sh /charts/*.md
# This image includes any host level programs that we might need. All binaries
# must be placed in bin/ of the file image and subdirectories of bin/ will be flattened during installation.
# This means bin/foo/bar will become bin/bar when rke2 installs this to the host
FROM rancher/hardened-kubernetes:v1.25.11-rke2r1-build20230614 AS kubernetes
FROM rancher/hardened-kubernetes:v1.25.12-rke2r1-build20230719 AS kubernetes
FROM rancher/hardened-containerd:v1.7.1-k3s1-build20230511 AS containerd
FROM rancher/hardened-crictl:v1.26.1-build20230406 AS crictl
FROM rancher/hardened-runc:v1.1.7-build20230511 AS runc
Expand Down
4 changes: 2 additions & 2 deletions scripts/version.sh
Expand Up @@ -31,8 +31,8 @@ REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code;
PLATFORM=${GOOS}-${GOARCH}
RELEASE=${PROG}.${PLATFORM}
# hardcode versions unless set specifically
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.25.11}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.25.11-rke2r1-build20230614}
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.25.12}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.25.12-rke2r1-build20230719}
ETCD_VERSION=${ETCD_VERSION:-v3.5.7-k3s1}
PAUSE_VERSION=${PAUSE_VERSION:-3.6}
CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230406}
Expand Down

0 comments on commit a0aa49e

Please sign in to comment.