update to kubernetes v1.25.14 and go v1.20.8 (#4763)

Signed-off-by: Brooks Newberry <brooks@newberry.com>
rancher · Sep 13, 2023 · 36d7417 · 36d7417
1 parent e9620fd
commit 36d7417
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -11,7 +11,7 @@ steps:
   - name: validate-release
     image: rancher/dapper:v0.5.5
     commands:
-      - docker pull --quiet rancher/hardened-build-base:v1.19.9b2
+      - docker pull --quiet rancher/hardened-build-base:v1.20.8b2
       - dapper -f Dockerfile --target dapper make validate-release
     volumes:
       - name: docker
@@ -31,7 +31,7 @@ steps:
       AWS_SECRET_ACCESS_KEY:
         from_secret: AWS_SECRET_ACCESS_KEY-rke2-ci-uploader     
     commands:
-      - docker pull --quiet rancher/hardened-build-base:v1.19.9b2
+      - docker pull --quiet rancher/hardened-build-base:v1.20.8b2
       - docker pull --quiet alpine:3.17
       - dapper -f Dockerfile --target dapper make dapper-ci
     volumes:
@@ -60,7 +60,7 @@ steps:
   - name: package-images
     image: rancher/dapper:v0.5.5
     commands:
-      - docker pull --quiet rancher/hardened-build-base:v1.19.9b2
+      - docker pull --quiet rancher/hardened-build-base:v1.20.8b2
       - dapper -f Dockerfile --target dapper make package-images
     volumes:
       - name: docker
@@ -99,7 +99,7 @@ steps:
         path: /var/run/docker.sock
 
   - name: publish-image-runtime
-    image: rancher/hardened-build-base:v1.19.9b2
+    image: rancher/hardened-build-base:v1.20.8b2
     commands:
       - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
       - DRONE_TAG=${DRONE_TAG} make publish-image-runtime
@@ -123,7 +123,7 @@ steps:
   - name: package-windows-images
     image: rancher/dapper:v0.5.5
     commands:
-      - docker pull --quiet rancher/hardened-build-base:v1.19.9b2
+      - docker pull --quiet rancher/hardened-build-base:v1.20.8b2
       - dapper -f Dockerfile --target dapper make package-windows-images
     when:
       event:
@@ -195,7 +195,7 @@ steps:
         - drone-publish.rancher.io
 
   - name: publish-image-runtime
-    image: rancher/hardened-build-base:v1.19.9b2
+    image: rancher/hardened-build-base:v1.20.8b2
     commands:
       - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
       - DRONE_TAG=${DRONE_TAG} make publish-image-runtime

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 ARG KUBERNETES_VERSION=dev
 
 # Build environment
-FROM rancher/hardened-build-base:v1.20.7b3 AS build
+FROM rancher/hardened-build-base:v1.20.8b2 AS build
 ARG DAPPER_HOST_ARCH
 ENV ARCH $DAPPER_HOST_ARCH
 RUN set -x \
@@ -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.13-rke2r1-build20230824 AS kubernetes
+FROM rancher/hardened-kubernetes:v1.25.14-rke2r1-build20230913 AS kubernetes
 FROM rancher/hardened-containerd:v1.7.3-k3s1-build20230802 AS containerd
 FROM rancher/hardened-crictl:v1.26.1-build20230406 AS crictl
 FROM rancher/hardened-runc:v1.1.8-build20230802 AS runc

diff --git a/scripts/version.sh b/scripts/version.sh
@@ -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.13}
-KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.25.13-rke2r1-build20230824}
+KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.25.14}
+KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.25.14-rke2r1-build20230913}
 ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1}
 PAUSE_VERSION=${PAUSE_VERSION:-3.6}
 CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230406}