Skip to content

Commit

Permalink
update to kubernetes v1.26.9 and go v1.20.8 (#4762)
Browse files Browse the repository at this point in the history
Signed-off-by: Brooks Newberry <[email protected]>
  • Loading branch information
brooksn authored Sep 13, 2023
1 parent 48ee3af commit 368ba42
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,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
Expand All @@ -47,7 +47,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:
Expand Down Expand Up @@ -76,7 +76,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
Expand Down Expand Up @@ -115,7 +115,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
Expand All @@ -139,7 +139,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:
Expand Down Expand Up @@ -227,7 +227,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
Expand Down
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.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 \
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.26.8-rke2r1-build20230824 AS kubernetes
FROM rancher/hardened-kubernetes:v1.26.9-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
Expand Down
4 changes: 2 additions & 2 deletions scripts/version.sh
Original file line number Diff line number Diff line change
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.26.8}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.8-rke2r1-build20230824}
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.26.9}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.9-rke2r1-build20230913}
ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1}
PAUSE_VERSION=${PAUSE_VERSION:-3.6}
CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230406}
Expand Down

0 comments on commit 368ba42

Please sign in to comment.