Skip to content

Commit

Permalink
update 1.24 and Go (#4030)
Browse files Browse the repository at this point in the history
  • Loading branch information
briandowns committed Mar 17, 2023
1 parent 6ca7cab commit 1cbcfe3
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions .drone.yml
Expand Up @@ -11,7 +11,7 @@ steps:
- name: validate-release
image: rancher/dapper:v0.5.5
commands:
- docker pull --quiet rancher/hardened-build-base:v1.19.6b1
- docker pull --quiet rancher/hardened-build-base:v1.19.7b1
- dapper -f Dockerfile --target dapper make validate-release
volumes:
- name: docker
Expand All @@ -31,7 +31,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.6b1
- docker pull --quiet rancher/hardened-build-base:v1.19.7b1
- docker pull --quiet alpine:3.15
- dapper -f Dockerfile --target dapper make dapper-ci
volumes:
Expand Down Expand Up @@ -60,7 +60,7 @@ steps:
- name: package-images
image: rancher/dapper:v0.5.5
commands:
- docker pull --quiet rancher/hardened-build-base:v1.19.6b1
- docker pull --quiet rancher/hardened-build-base:v1.19.7b1
- dapper -f Dockerfile --target dapper make package-images
volumes:
- name: docker
Expand Down Expand Up @@ -99,7 +99,7 @@ steps:
path: /var/run/docker.sock

- name: publish-image-runtime
image: rancher/hardened-build-base:v1.19.6b1
image: rancher/hardened-build-base:v1.19.7b1
commands:
- docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
- DRONE_TAG=${DRONE_TAG} make publish-image-runtime
Expand All @@ -123,7 +123,7 @@ steps:
- name: package-windows-images
image: rancher/dapper:v0.5.5
commands:
- docker pull --quiet rancher/hardened-build-base:v1.19.6b1
- docker pull --quiet rancher/hardened-build-base:v1.19.7b1
- dapper -f Dockerfile --target dapper make package-windows-images
when:
event:
Expand Down Expand Up @@ -233,7 +233,7 @@ steps:
- drone-publish.rancher.io

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

# Build environment
FROM rancher/hardened-build-base:v1.19.6b1 AS build
FROM rancher/hardened-build-base:v1.19.7b1 AS build
ARG DAPPER_HOST_ARCH
ENV ARCH $DAPPER_HOST_ARCH
RUN set -x \
Expand Down Expand Up @@ -134,7 +134,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.24.11-rke2r1-build20230228 AS kubernetes
FROM rancher/hardened-kubernetes:v1.24.12-rke2r1-build20230317 AS kubernetes
FROM rancher/hardened-containerd:v1.6.19-k3s1-build20230310 AS containerd
FROM rancher/hardened-crictl:v1.24.0-build20221011 AS crictl
FROM rancher/hardened-runc:v1.1.4-build20221012 AS runc
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.windows
Expand Up @@ -5,7 +5,7 @@ RUN apk --no-cache add \
unzip

# Dapper/Drone/CI environment
FROM rancher/hardened-build-base:v1.19.6b1 AS dapper
FROM rancher/hardened-build-base:v1.19.7b1 AS dapper
ENV DAPPER_ENV GODEBUG REPO TAG DRONE_TAG PAT_USERNAME PAT_TOKEN KUBERNETES_VERSION DOCKER_BUILDKIT DRONE_BUILD_EVENT IMAGE_NAME AWS_SECRET_ACCESS_KEY AWS_ACCESS_KEY_ID ENABLE_REGISTRY
ARG DAPPER_HOST_ARCH
ENV ARCH $DAPPER_HOST_ARCH
Expand Down
4 changes: 2 additions & 2 deletions scripts/version.sh
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.24.11}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.24.11-rke2r1-build20230228}
KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.24.12}
KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.24.12-rke2r1-build20230317}
ETCD_VERSION=${ETCD_VERSION:-v3.5.4-k3s1}
PAUSE_VERSION=${PAUSE_VERSION:-3.6}
CCM_VERSION=${CCM_VERSION:-v1.26.1-build20230210}
Expand Down

0 comments on commit 1cbcfe3

Please sign in to comment.