diff --git a/Dockerfile b/Dockerfile index 6450cfb47a..c637154d43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,8 +49,7 @@ RUN curl -sL "https://github.com/cli/cli/releases/download/v2.53.0/gh_2.53.0_lin 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 + chmod a+x /usr/local/bin/kubectl RUN python3 -m pip install awscli RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.2 diff --git a/Dockerfile.windows b/Dockerfile.windows index 93fb23d85c..7ef2118b1c 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -32,8 +32,7 @@ RUN set -x && \ 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 + chmod a+x /usr/local/bin/kubectl RUN curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.2 WORKDIR /source # End Dapper stuff diff --git a/charts/chart_versions.yaml b/charts/chart_versions.yaml index f6be26cec1..b937909998 100644 --- a/charts/chart_versions.yaml +++ b/charts/chart_versions.yaml @@ -14,7 +14,7 @@ charts: - version: 1.36.102 filename: /charts/rke2-coredns.yaml bootstrap: true - - version: 4.10.503 + - version: 4.12.002 filename: /charts/rke2-ingress-nginx.yaml bootstrap: false - version: 27.0.200 diff --git a/scripts/build-images b/scripts/build-images index 79f8fed20c..b636dc1e74 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -22,8 +22,8 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt ${REGISTRY}/rancher/klipper-helm:v0.9.3-build20241008 ${REGISTRY}/rancher/klipper-lb:v0.4.9 ${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION} - ${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.4.4 - ${REGISTRY}/rancher/nginx-ingress-controller:v1.10.5-hardened6 + ${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.5.0 + ${REGISTRY}/rancher/nginx-ingress-controller:v1.12.0-hardened1 ${REGISTRY}/rancher/rke2-cloud-provider:${CCM_VERSION} ${REGISTRY}/rancher/mirrored-sig-storage-snapshot-controller:v8.2.0 EOF