From 6288da1de24de30d8109b98c78d5c8a84b69f67a Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Fri, 14 Oct 2022 14:48:15 -0700 Subject: [PATCH] October RKE2 K8s Update v1.25.3 (#3460) --- Dockerfile | 18 +++++++++--------- scripts/build-binary | 2 +- scripts/build-images | 18 +++++++++--------- scripts/version.sh | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index 245562c82c..1bbed3377f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -115,13 +115,13 @@ ARG CACHEBUST="cachebust" COPY charts/ /charts/ RUN echo ${CACHEBUST}>/dev/null RUN CHART_VERSION="1.12.102" CHART_FILE=/charts/rke2-cilium.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="v3.24.1-build2022101102" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh +RUN CHART_VERSION="v3.24.1-build2022101103" CHART_FILE=/charts/rke2-canal.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="v3.24.102" CHART_FILE=/charts/rke2-calico.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="v3.24.102" CHART_FILE=/charts/rke2-calico-crd.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="1.19.400" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh -RUN CHART_VERSION="4.1.004" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh -RUN CHART_VERSION="2.11.100-build2022092906" CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh -RUN CHART_VERSION="v3.8-build2021110403" CHART_FILE=/charts/rke2-multus.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh +RUN CHART_VERSION="1.19.401" CHART_FILE=/charts/rke2-coredns.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh +RUN CHART_VERSION="4.1.005" CHART_FILE=/charts/rke2-ingress-nginx.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh +RUN CHART_VERSION="2.11.100-build2022101106" CHART_FILE=/charts/rke2-metrics-server.yaml CHART_BOOTSTRAP=false /charts/build-chart.sh +RUN CHART_VERSION="v3.8-build2022101103" CHART_FILE=/charts/rke2-multus.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="1.4.001" CHART_FILE=/charts/rancher-vsphere-cpi.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="2.6.1-rancher101" CHART_FILE=/charts/rancher-vsphere-csi.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh RUN CHART_VERSION="0.1.1300" CHART_FILE=/charts/harvester-cloud-provider.yaml CHART_BOOTSTRAP=true /charts/build-chart.sh @@ -132,10 +132,10 @@ 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.25.2-rke2r1-build20220921 AS kubernetes -FROM rancher/hardened-containerd:v1.6.8-k3s1-build20220901 AS containerd -FROM rancher/hardened-crictl:v1.24.0-build20220506 AS crictl -FROM rancher/hardened-runc:v1.1.4-build20220901 AS runc +FROM rancher/hardened-kubernetes:v1.25.3-rke2r1-build20221013 AS kubernetes +FROM rancher/hardened-containerd:v1.6.8-k3s1-build20221011 AS containerd +FROM rancher/hardened-crictl:v1.24.0-build20221011 AS crictl +FROM rancher/hardened-runc:v1.1.4-build20221012 AS runc FROM scratch AS runtime-collect COPY --from=runc \ diff --git a/scripts/build-binary b/scripts/build-binary index c8af58f95c..a9968a81eb 100755 --- a/scripts/build-binary +++ b/scripts/build-binary @@ -24,7 +24,7 @@ VERSION_FLAGS=" -X ${K3S_PKG}/pkg/version.Program=${PROG} -X ${K3S_PKG}/pkg/version.Version=${VERSION} -X ${RKE2_PKG}/pkg/images.DefaultRegistry=${REGISTRY} - -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20220504 + -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20221011 -X ${RKE2_PKG}/pkg/images.DefaultKubernetesImage=rancher/hardened-kubernetes:${KUBERNETES_IMAGE_TAG} -X ${RKE2_PKG}/pkg/images.DefaultPauseImage=rancher/pause:${PAUSE_VERSION} -X ${RKE2_PKG}/pkg/images.DefaultRuntimeImage=${REPO}/${PROG}-runtime:${DOCKERIZED_VERSION} diff --git a/scripts/build-images b/scripts/build-images index 32e6d00398..7770cc2234 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -13,22 +13,22 @@ EOF xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt ${REGISTRY}/rancher/hardened-kubernetes:${KUBERNETES_IMAGE_TAG} - ${REGISTRY}/rancher/hardened-coredns:v1.9.3-build20220613 - ${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.5-build20211119 - ${REGISTRY}/rancher/hardened-dns-node-cache:1.21.2-build20211119 - ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20220504 - ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.6.1-build20220929 + ${REGISTRY}/rancher/hardened-coredns:v1.9.3-build20221011 + ${REGISTRY}/rancher/hardened-cluster-autoscaler:v1.8.5-build20221011 + ${REGISTRY}/rancher/hardened-dns-node-cache:1.21.2-build20221011 + ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20221011 + ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.6.1-build20221011 ${REGISTRY}/rancher/klipper-helm:v0.7.3-build20220613 ${REGISTRY}/rancher/klipper-lb:v0.3.5 ${REGISTRY}/rancher/pause:${PAUSE_VERSION} ${REGISTRY}/rancher/mirrored-ingress-nginx-kube-webhook-certgen:v1.1.1 - ${REGISTRY}/rancher/nginx-ingress-controller:nginx-1.2.1-hardened7 + ${REGISTRY}/rancher/nginx-ingress-controller:nginx-1.2.1-hardened9 ${REGISTRY}/rancher/rke2-cloud-provider:${CCM_VERSION} EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-canal.txt ${REGISTRY}/rancher/hardened-calico:v3.24.1-build20221011 - ${REGISTRY}/rancher/hardened-flannel:v0.19.1-build20220810 + ${REGISTRY}/rancher/hardened-flannel:v0.19.1-build20221011 EOF if [ "${GOARCH}" != "s390x" ]; then @@ -62,8 +62,8 @@ xargs -n1 -t docker image pull --quiet << EOF > build/images-vsphere.txt EOF xargs -n1 -t docker image pull --quiet << EOF > build/images-multus.txt - ${REGISTRY}/rancher/hardened-multus-cni:v3.8-build20211104 - ${REGISTRY}/rancher/hardened-cni-plugins:v1.0.1-build20220223 + ${REGISTRY}/rancher/hardened-multus-cni:v3.8-build20221011 + ${REGISTRY}/rancher/hardened-cni-plugins:v1.0.1-build20221011 ${REGISTRY}/rancher/hardened-sriov-network-operator:v1.1.0-build20220419 ${REGISTRY}/rancher/hardened-sriov-network-config-daemon:v1.1.0-build20220419 ${REGISTRY}/rancher/hardened-sriov-network-device-plugin:v3.4.0-build20220419 diff --git a/scripts/version.sh b/scripts/version.sh index a4b14e14d1..e03d341811 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -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.25.2} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.25.2-rke2r1-build20220921} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.25.3} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.25.3-rke2r1-build20221013} ETCD_VERSION=${ETCD_VERSION:-v3.5.4-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.25.2-build20220930}