Skip to content

Commit

Permalink
update k8s v1.30.1 and Go (#5914)
Browse files Browse the repository at this point in the history
  • Loading branch information
briandowns committed May 15, 2024
1 parent c1ef2c3 commit 3e0fb75
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .drone.yml
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.9b1
image: rancher/hardened-build-base:v1.22.2b1
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.9b1
image: rancher/hardened-build-base:v1.22.2b1
commands:
- docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
- DRONE_TAG=${DRONE_TAG} make publish-image-runtime
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
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.30.0-rke2r1-build20240506 AS kubernetes
FROM rancher/hardened-kubernetes:v1.30.1-rke2r1-build20240515 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
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.30.0}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.0-rke2r1-build20240506}
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.30.1}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.1-rke2r1-build20240515}
ETCD_VERSION=${ETCD_VERSION:-v3.5.9-k3s1}
PAUSE_VERSION=${PAUSE_VERSION:-3.6}
CCM_VERSION=${CCM_VERSION:-v1.29.3-build20240412}
Expand Down

0 comments on commit 3e0fb75

Please sign in to comment.