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.29.4 #5799

Merged
merged 3 commits into from
Apr 18, 2024
+9 −9
Merged

Update Kubernetes to v1.29.4 #5799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e814a8
update Go to v1.21.9
brooksn Apr 16, 2024
9d9372a
update Kubernetes to v1.29.4
brooksn Apr 16, 2024
c90dfe2
update hardened-etcd image
brooksn Apr 18, 2024
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
4 changes: 2 additions & 2 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ steps:
- refs/tags/*

- name: publish-image-runtime
image: rancher/hardened-build-base:v1.21.8b1
image: rancher/hardened-build-base:v1.21.9b1
commands:
- docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
- DRONE_TAG=${DRONE_TAG} make publish-image-runtime
Expand Down Expand Up @@ -312,7 +312,7 @@ steps:
- refs/tags/*

- name: publish-image-runtime
image: rancher/hardened-build-base:v1.21.8b1
image: rancher/hardened-build-base:v1.21.9b1
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.21.8b1 AS build
FROM rancher/hardened-build-base:v1.21.9b1 AS build
ARG DAPPER_HOST_ARCH
ENV ARCH $DAPPER_HOST_ARCH
RUN set -x && \
Expand Down Expand Up @@ -113,7 +113,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.29.3-rke2r1-build20240315 AS kubernetes
FROM rancher/hardened-kubernetes:v1.29.4-rke2r1-build20240416 AS kubernetes
FROM rancher/hardened-containerd:v1.7.11-k3s2-build20231211 AS containerd
FROM rancher/hardened-crictl:v1.29.0-build20231219 AS crictl
FROM rancher/hardened-runc:v1.1.12-build20240201 AS runc
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ VERSION_FLAGS="
-X ${K3S_PKG}/pkg/version.Version=${VERSION}
-X ${K3S_PKG}/pkg/version.UpstreamGolang=${VERSION_GOLANG}
-X ${RKE2_PKG}/pkg/images.DefaultRegistry=${REGISTRY}
-X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20230802
-X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20240418
-X ${RKE2_PKG}/pkg/images.DefaultKubernetesImage=rancher/hardened-kubernetes:${KUBERNETES_IMAGE_TAG}
-X ${RKE2_PKG}/pkg/images.DefaultPauseImage=rancher/mirrored-pause:${PAUSE_VERSION}
-X ${RKE2_PKG}/pkg/images.DefaultRuntimeImage=${REPO}/${PROG}-runtime:${DOCKERIZED_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-images
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt
${REGISTRY}/rancher/hardened-coredns:v1.11.1-build20240305
${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.10-build20240124
${REGISTRY}/rancher/hardened-dns-node-cache:1.22.28-build20240125
${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20230802
${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20240418
${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.7.1-build20240401
${REGISTRY}/rancher/hardened-addon-resizer:1.8.20-build20240410
${REGISTRY}/rancher/klipper-helm:v0.8.3-build20240228
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-windows-binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ VERSION_FLAGS="
-X ${K3S_PKG}/pkg/version.Version=${VERSION}
-X ${K3S_PKG}/pkg/version.UpstreamGolang=${VERSION_GOLANG}
-X ${RKE2_PKG}/pkg/images.DefaultRegistry=${REGISTRY}
-X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20230802
-X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20240418
-X ${RKE2_PKG}/pkg/images.DefaultKubernetesImage=${REPO}/hardened-kubernetes:${KUBERNETES_IMAGE_TAG}
-X ${RKE2_PKG}/pkg/images.DefaultPauseImage=rancher/mirrored-pause:${PAUSE_VERSION}
-X ${RKE2_PKG}/pkg/images.DefaultRuntimeImage=${REPO}/${PROG}-runtime:${DOCKERIZED_VERSION}-${GOOS}-${GOARCH}
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.29.3}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.3-rke2r1-build20240315}
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.29.4}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.4-rke2r1-build20240416}
ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1}
PAUSE_VERSION=${PAUSE_VERSION:-3.6}
CCM_VERSION=${CCM_VERSION:-v1.29.3-build20240412}
Expand Down
Loading