From 2c0504f9d9034fa14609bfac56264a499176808e Mon Sep 17 00:00:00 2001 From: "renovate-rancher[bot]" <119870437+renovate-rancher[bot]@users.noreply.github.com> Date: Thu, 20 Apr 2023 04:38:52 +0000 Subject: [PATCH] Update k3s --- Dockerfile.dapper | 4 ++-- package/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index f1bf95e6..8db30f4a 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -9,7 +9,7 @@ ARG DAPPER_HOST_ARCH ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} ENV CATTLE_HELM_VERSION v2.16.8-rancher2 ENV CATTLE_MACHINE_VERSION v0.15.0-rancher95 -ENV CATTLE_K3S_VERSION v1.24.8+k3s1 +ENV CATTLE_K3S_VERSION v1.24.12+k3s1 # version used by helm plugin install script ENV CATTLE_HELM_UNITTEST_VERSION v0.1.7-rancher4 # helm 3 version @@ -64,7 +64,7 @@ RUN mkdir /usr/tmp && \ chmod +x /usr/bin/kustomize # Set up K3s: copy the necessary binaries from the K3s image. -COPY --from=rancher/k3s:v1.24.8-k3s1 \ +COPY --from=rancher/k3s:v1.24.13-k3s1 \ /bin/blkid \ /bin/charon \ /bin/cni \ diff --git a/package/Dockerfile b/package/Dockerfile index b155d4d7..f4ca845e 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -31,7 +31,7 @@ ENV CATTLE_PARTNER_CHART_DEFAULT_BRANCH=$PARTNER_CHART_DEFAULT_BRANCH ENV CATTLE_RKE2_CHART_DEFAULT_BRANCH=$RKE2_CHART_DEFAULT_BRANCH ENV CATTLE_HELM_VERSION v2.16.8-rancher2 ENV CATTLE_MACHINE_VERSION v0.15.0-rancher95 -ENV CATTLE_K3S_VERSION v1.24.8+k3s1 +ENV CATTLE_K3S_VERSION v1.24.12+k3s1 ENV CATTLE_MACHINE_PROVISION_IMAGE rancher/machine:${CATTLE_MACHINE_VERSION} ENV CATTLE_ETCD_VERSION v3.5.1 ENV LOGLEVEL_VERSION v0.1.5 @@ -116,7 +116,7 @@ RUN curl ${HELM_URL_V3} | tar xvzf - --strip-components=1 -C /usr/bin && \ chmod +x /usr/bin/kustomize # Set up K3s: copy the necessary binaries from the K3s image. -COPY --from=rancher/k3s:v1.24.8-k3s1 \ +COPY --from=rancher/k3s:v1.24.13-k3s1 \ /bin/blkid \ /bin/charon \ /bin/cni \