Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Kubernetes to v1.28.2 Go to v1.20.8 #4760

Merged
merged 1 commit into from
Sep 13, 2023
Merged

Update Kubernetes to v1.28.2 Go to v1.20.8 #4760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ steps:
- name: validate-release
image: rancher/dapper:v0.5.5
commands:
- docker pull --quiet rancher/hardened-build-base:v1.20.4b11
- docker pull --quiet rancher/hardened-build-base:v1.20.8b2
- dapper -f Dockerfile --target dapper make validate-release
volumes:
- name: docker
Expand All @@ -52,7 +52,7 @@ steps:
AWS_SECRET_ACCESS_KEY:
from_secret: AWS_SECRET_ACCESS_KEY-rke2-ci-uploader
commands:
- docker pull --quiet rancher/hardened-build-base:v1.20.4b11
- 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 @@ -88,7 +88,7 @@ steps:
- name: package-images
image: rancher/dapper:v0.5.5
commands:
- docker pull --quiet rancher/hardened-build-base:v1.20.4b11
- 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 @@ -139,7 +139,7 @@ steps:
- refs/tags/*

- name: publish-image-runtime
image: rancher/hardened-build-base:v1.20.4b11
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 @@ -163,7 +163,7 @@ steps:
- name: package-windows-images
image: rancher/dapper:v0.5.5
commands:
- docker pull --quiet rancher/hardened-build-base:v1.20.4b11
- 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 @@ -234,7 +234,7 @@ steps:
- name: validate-release
image: rancher/dapper:v0.5.5
commands:
- docker pull --quiet rancher/hardened-build-base:v1.20.4b11
- docker pull --quiet rancher/hardened-build-base:v1.20.8b2
- dapper -f Dockerfile --target dapper make validate-release
volumes:
- name: docker
Expand All @@ -254,7 +254,7 @@ steps:
AWS_SECRET_ACCESS_KEY:
from_secret: AWS_SECRET_ACCESS_KEY-rke2-ci-uploader
commands:
- docker pull --quiet rancher/hardened-build-base:v1.20.4b11
- 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 @@ -290,7 +290,7 @@ steps:
- name: package-images
image: rancher/dapper:v0.5.5
commands:
- docker pull --quiet rancher/hardened-build-base:v1.20.4b11
- 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 @@ -319,7 +319,7 @@ steps:
- refs/tags/*

- name: publish-image-runtime
image: rancher/hardened-build-base:v1.20.4b11
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 Expand Up @@ -428,7 +428,7 @@ steps:
- drone-publish.rancher.io

- name: publish-image-runtime
image: rancher/hardened-build-base:v1.20.4b11
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
View file
Open in desktop
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 @@ -126,7 +126,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.28.1-rke2r1-build20230825 AS kubernetes
FROM rancher/hardened-kubernetes:v1.28.2-rke2r1-build20230913 AS kubernetes
FROM rancher/hardened-containerd:v1.7.3-k3s1-build20230802 AS containerd
FROM rancher/hardened-crictl:v1.26.1-build20230606 AS crictl
FROM rancher/hardened-runc:v1.1.8-build20230802 AS runc
Expand Down
4 changes: 2 additions & 2 deletions scripts/version.sh
View file
Open in desktop
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.28.1}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.28.1-rke2r1-build20230825}
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.28.2}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.28.2-rke2r1-build20230913}
ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1}
PAUSE_VERSION=${PAUSE_VERSION:-3.6}
CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230608}
Expand Down