Skip to content

Commit

Permalink
July 2024 v129 (#6363)
Browse files Browse the repository at this point in the history
  • Loading branch information
briandowns authored Jul 18, 2024
1 parent 8f353e6 commit 9181a65
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG KUBERNETES_VERSION=dev

# Build environment
FROM rancher/hardened-build-base:v1.21.11b2 AS build
FROM rancher/hardened-build-base:v1.22.5b1 AS build
ARG DAPPER_HOST_ARCH
ENV ARCH $DAPPER_HOST_ARCH
RUN set -x && \
Expand Down Expand Up @@ -113,7 +113,7 @@ RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml
# 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.29.6-rke2r1-build20240619 AS kubernetes
FROM rancher/hardened-kubernetes:v1.29.7-rke2r1-build20240717 AS kubernetes
FROM rancher/hardened-containerd:v1.7.17-k3s1-build20240605 AS containerd
FROM rancher/hardened-crictl:v1.29.0-build20231219 AS crictl
FROM rancher/hardened-runc:v1.1.12-build20240201 AS runc
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/rancher/rke2

go 1.21.11
go 1.22.5

replace (
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.11.1
Expand Down
4 changes: 2 additions & 2 deletions scripts/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,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.29.6}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.6-rke2r1-build20240619}
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.29.7}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.7-rke2r1-build20240717}
ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1}
PAUSE_VERSION=${PAUSE_VERSION:-3.6}
CCM_VERSION=${CCM_VERSION:-v1.29.3-build20240515}
Expand Down

0 comments on commit 9181a65

Please sign in to comment.