Merge branch 'rancher:master' into data-directory-cleanup

.drone.yml

@@ -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
@@ -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.6b2
     commands:
       - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
       - DRONE_TAG=${DRONE_TAG} make publish-image-runtime
@@ -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
@@ -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.6b2
     commands:
       - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
       - DRONE_TAG=${DRONE_TAG} make publish-image-runtime

.github/workflows/docs.yaml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - run: pip install mkdocs-material

.github/workflows/spellcheck.yaml

@@ -15,7 +15,7 @@ jobs:
       with:
         fetch-depth: 1
     - name: Set up Python 🐍
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
     - name: Install codespell
       run: |
         python -m pip install --upgrade pip

.github/workflows/updatecli.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: 'stable'
 

Dockerfile

@@ -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.6b2 AS build
 ARG DAPPER_HOST_ARCH
 ENV ARCH $DAPPER_HOST_ARCH
 RUN set -x && \
@@ -42,14 +42,14 @@ RUN if [ "${ARCH}" = "amd64" ] || [ "${ARCH}" = "arm64" ]; then \
         curl -sL "https://github.com/vmware-tanzu/sonobuoy/releases/download/v${VERSION}/sonobuoy_${VERSION}_${OS}_${ARCH}.tar.gz" | \
         tar -xzf - -C /usr/local/bin; \
     fi
-RUN curl -sL https://storage.googleapis.com/kubernetes-release/release/$( \
-    curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt \
+RUN curl -sL https://dl.k8s.io/release/$( \
+    curl -sL https://dl.k8s.io/release/stable.txt \
     )/bin/linux/${ARCH}/kubectl -o /usr/local/bin/kubectl && \
     chmod a+x /usr/local/bin/kubectl; \
     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 \
@@ -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.1-rke2r1-build20240117 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

Dockerfile.windows

@@ -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
@@ -29,12 +29,12 @@ RUN set -x && \
     file \
     bash \
     py-pip
-RUN curl -sL https://storage.googleapis.com/kubernetes-release/release/$( \
-    curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt \
+RUN curl -sL https://dl.k8s.io/release/$( \
+    curl -sL https://dl.k8s.io/release/stable.txt \
     )/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
 
@@ -43,12 +43,15 @@ 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"
 
 RUN mkdir -p rancher
 
+# The charts directory is intentionally empty on windows, but its presence is required to address https://github.com/rancher/rke2/issues/5138
+RUN mkdir -p charts
+
 # We use the containerd-shim-runhcs-v1.exe binary from upstream, as it apparently can't be cross-built on Linux
 COPY Dockerfile ./
 RUN CONTAINERD_VERSION=$(grep "rancher/hardened-containerd" Dockerfile | grep ':v' | cut -d '=' -f 2- | grep -oE "([0-9]+)\.([0-9]+)\.([0-9]+)") \
@@ -101,3 +104,4 @@ FROM scratch AS windows-runtime
 COPY --from=containerd /usr/local/bin/*.exe /bin/
 COPY --from=windows-runtime-collect ./rancher/* /bin/
 COPY --from=windows-runtime-collect ./confd/ /bin/confd
+COPY --from=windows-runtime-collect ./charts /charts/

channels.yaml

@@ -1,6 +1,6 @@
 channels:
 - name: stable
-  latest: v1.26.11+rke2r1
+  latest: v1.26.12+rke2r1
 - name: latest
   latestRegexp: .*
   excludeRegexp: (^[^+]+-|v1\.25\.5\+rke2r1|v1\.26\.0\+rke2r1)
@@ -39,6 +39,9 @@ channels:
 - name: v1.28
   latestRegexp: v1\.28\..*
   excludeRegexp: ^[^+]+-
+- name: v1.29
+  latestRegexp: v1\.29\..*
+  excludeRegexp: ^[^+]+-
 github:
   owner: rancher
   repo: rke2

charts/chart_versions.yaml

@@ -11,7 +11,7 @@ charts:
   - version: v3.26.300
     filename: /charts/rke2-calico-crd.yaml
     bootstrap: true
-  - version: 1.24.007
+  - version: 1.24.008
     filename: /charts/rke2-coredns.yaml
     bootstrap: true
   - version: 4.8.200
@@ -20,7 +20,7 @@ charts:
   - version: 2.11.100-build2023051511
     filename: /charts/rke2-metrics-server.yaml
     bootstrap: false
-  - version: v4.0.2-build2023081103
+  - version: v4.0.2-build2023081107
     filename: /charts/rke2-multus.yaml
     bootstrap: true
   - version: 1.5.100