Skip to content

Commit

Permalink
[master] September K8s patch (#6813)
Browse files Browse the repository at this point in the history
* update k8s version

* update build-base
  • Loading branch information
rafaelbreno authored Sep 13, 2024
1 parent 5d229c9 commit 0d05325
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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.22.5b1 AS build
FROM rancher/hardened-build-base:v1.22.6b1 AS build
ARG DAPPER_HOST_ARCH
ENV ARCH $DAPPER_HOST_ARCH
RUN set -x && \
Expand Down Expand Up @@ -117,7 +117,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.31.0-rke2r1-build20240910 AS kubernetes
FROM rancher/hardened-kubernetes:v1.31.1-rke2r1-build20240912 AS kubernetes
FROM rancher/hardened-containerd:v1.7.21-k3s2-build20240910 AS containerd
FROM rancher/hardened-crictl:v1.30.1-build20240910 AS crictl
FROM rancher/hardened-runc:v1.1.14-build20240910 AS runc
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.31.0}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.31.0-rke2r1-build20240815}
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.31.1}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.31.1-rke2r1-build20240912}
ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1}
PAUSE_VERSION=${PAUSE_VERSION:-3.6}
CCM_VERSION=${CCM_VERSION:-v1.31.0-build20240910}
Expand Down

0 comments on commit 0d05325

Please sign in to comment.