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

Jump to bottom

Update Kubernetes to v1.26.10 #4921

Merged
merged 4 commits into from Oct 19, 2023
Merged

Update Kubernetes to v1.26.10 #4921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab570cd
remove windows binaries from release
brooksn Oct 19, 2023
40f2f65
update Go
brooksn Oct 19, 2023
1f15e09
update Kubernetes
brooksn Oct 19, 2023
1789907
Revert "remove windows binaries from release"
brooksn Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .drone.yml
View file
Open in desktop
Expand Up @@ -112,7 +112,7 @@ steps:
path: /var/run/docker.sock

- name: publish-image-runtime
image: rancher/hardened-build-base:v1.20.8b2
image: rancher/hardened-build-base:v1.20.10b1
commands:
- docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
- DRONE_TAG=${DRONE_TAG} make publish-image-runtime
Expand Down Expand Up @@ -223,7 +223,7 @@ steps:
- drone-publish.rancher.io

- name: publish-image-runtime
image: rancher/hardened-build-base:v1.20.8b2
image: rancher/hardened-build-base:v1.20.10b1
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
@@ -1,7 +1,7 @@
ARG KUBERNETES_VERSION=dev

# Build environment
FROM rancher/hardened-build-base:v1.20.8b2 AS build
FROM rancher/hardened-build-base:v1.20.10b1 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.9-rke2r1-build20230913 AS kubernetes
FROM rancher/hardened-kubernetes:v1.26.10-rke2r1-build20231018 AS kubernetes
FROM rancher/hardened-containerd:v1.7.7-k3s1-build20231010 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
View file
Open in desktop
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.9}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.9-rke2r1-build20230913}
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.26.10}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.26.10-rke2r1-build20231018}
ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1}
PAUSE_VERSION=${PAUSE_VERSION:-3.6}
CCM_VERSION=${CCM_VERSION:-v1.26.3-build20230406}
Expand Down