Skip to content

Commit

Permalink
Bump K3s version for v1.29
Browse files Browse the repository at this point in the history
Updates k3s: k3s-io/k3s@08509a2...9411196

Signed-off-by: Brad Davidson <[email protected]>
  • Loading branch information
brandond committed Dec 19, 2023
1 parent c1494f5 commit c7f5095
Show file tree
Hide file tree
Showing 7 changed files with 245 additions and 217 deletions.
8 changes: 4 additions & 4 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ steps:
AWS_SECRET_ACCESS_KEY:
from_secret: AWS_SECRET_ACCESS_KEY-rke2-ci-uploader
commands:
- docker pull --quiet alpine:3.17
- docker pull --quiet alpine:3.18
- dapper -f Dockerfile --target dapper make dapper-ci
volumes:
- name: docker
Expand Down Expand Up @@ -136,7 +136,7 @@ steps:
- refs/tags/*

- name: publish-image-runtime
image: rancher/hardened-build-base:v1.20.11b1
image: rancher/hardened-build-base:v1.21.5b2
commands:
- docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
- DRONE_TAG=${DRONE_TAG} make publish-image-runtime
Expand Down Expand Up @@ -249,7 +249,7 @@ steps:
AWS_SECRET_ACCESS_KEY:
from_secret: AWS_SECRET_ACCESS_KEY-rke2-ci-uploader
commands:
- docker pull --quiet alpine:3.17
- docker pull --quiet alpine:3.18
- dapper -f Dockerfile --target dapper make dapper-ci
volumes:
- name: docker
Expand Down Expand Up @@ -312,7 +312,7 @@ steps:
- refs/tags/*

- name: publish-image-runtime
image: rancher/hardened-build-base:v1.20.11b1
image: rancher/hardened-build-base:v1.21.5b2
commands:
- docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
- DRONE_TAG=${DRONE_TAG} make publish-image-runtime
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
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.11b1 AS build
FROM rancher/hardened-build-base:v1.21.5b2 AS build
ARG DAPPER_HOST_ARCH
ENV ARCH $DAPPER_HOST_ARCH
RUN set -x && \
Expand Down Expand Up @@ -49,7 +49,7 @@ RUN curl -sL https://storage.googleapis.com/kubernetes-release/release/$( \
pip install codespell

RUN python3 -m pip install awscli
RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.52.2
RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.2
RUN set -x && \
apk --no-cache add \
libarchive-tools \
Expand Down Expand Up @@ -113,9 +113,9 @@ 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.28.4-rke2r1-build20231115 AS kubernetes
FROM rancher/hardened-kubernetes:v1.29.0-rke2r1-build20231213 AS kubernetes
FROM rancher/hardened-containerd:v1.7.11-k3s2-build20231211 AS containerd
FROM rancher/hardened-crictl:v1.26.1-build20231010 AS crictl
FROM rancher/hardened-crictl:v1.29.0-build20231219 AS crictl
FROM rancher/hardened-runc:v1.1.10-build20231208 AS runc

FROM scratch AS runtime-collect
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN apk --no-cache add \
unzip

# Dapper/Drone/CI environment
FROM rancher/hardened-build-base:v1.20.4b11 AS dapper
FROM rancher/hardened-build-base:v1.21.5b2 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 Expand Up @@ -34,7 +34,7 @@ RUN curl -sL https://storage.googleapis.com/kubernetes-release/release/$( \
)/bin/linux/${ARCH}/kubectl -o /usr/local/bin/kubectl && \
chmod a+x /usr/local/bin/kubectl; \
pip install codespell
RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.47.3
RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.2
WORKDIR /source
# End Dapper stuff

Expand All @@ -43,7 +43,7 @@ FROM build as windows-runtime-collect
ARG KUBERNETES_VERSION=dev

# windows runtime image
ENV CRICTL_VERSION="v1.27.0"
ENV CRICTL_VERSION="v1.29.0"
ENV CALICO_VERSION="v3.26.1"
ENV CNI_PLUGIN_VERSION="v1.1.1"

Expand Down
Loading

0 comments on commit c7f5095

Please sign in to comment.