From d0cc5649c91a4b6721a9b725971a6d96030d88fc Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Mon, 2 Oct 2023 17:18:36 -0700 Subject: [PATCH 1/2] mirrored pause update Signed-off-by: Brian Downs --- developer-docs/updating_rke2_charts.md | 2 +- pkg/images/images.go | 2 +- scripts/build-windows-binary | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/developer-docs/updating_rke2_charts.md b/developer-docs/updating_rke2_charts.md index 8c18d4d4a7..a5b1c001e9 100644 --- a/developer-docs/updating_rke2_charts.md +++ b/developer-docs/updating_rke2_charts.md @@ -80,7 +80,7 @@ xargs -n1 -t docker image pull --quiet << EOF >> build/images-core.txt ${REGISTRY}/rancher/hardened-etcd:${ETCD_VERSION}-build20220413 ${REGISTRY}/rancher/hardened-k8s-metrics-server:v0.5.0-build20210915 ${REGISTRY}/rancher/klipper-helm:v0.6.1-build20210616 - ${REGISTRY}/rancher/pause:${PAUSE_VERSION} + ${REGISTRY}/rancher/mirrored-pause:${PAUSE_VERSION} ${REGISTRY}/rancher/mirrored-jettech-kube-webhook-certgen:v1.5.1 ${REGISTRY}/rancher/nginx-ingress-controller:nginx-0.47.0-hardened1 ${REGISTRY}/rancher/rke2-cloud-provider:${CCM_VERSION} diff --git a/pkg/images/images.go b/pkg/images/images.go index 9359ddcf06..8c236a7359 100644 --- a/pkg/images/images.go +++ b/pkg/images/images.go @@ -29,7 +29,7 @@ var ( DefaultRegistry = name.DefaultRegistry DefaultEtcdImage = "rancher/hardened-etcd" DefaultKubernetesImage = "rancher/hardened-kubernetes" - DefaultPauseImage = "rancher/pause" + DefaultPauseImage = "rancher/mirrored-pause" DefaultRuntimeImage = "rancher/rke2-runtime" DefaultCloudControllerManagerImage = "rancher/rke2-cloud-provider" ) diff --git a/scripts/build-windows-binary b/scripts/build-windows-binary index 4d7e8c2bc3..bcffc1e9a7 100755 --- a/scripts/build-windows-binary +++ b/scripts/build-windows-binary @@ -32,7 +32,7 @@ VERSION_FLAGS=" -X ${RKE2_PKG}/pkg/images.DefaultRegistry=${REGISTRY} -X ${RKE2_PKG}/pkg/images.DefaultEtcdImage=rancher/hardened-etcd:${ETCD_VERSION}-build20230802 -X ${RKE2_PKG}/pkg/images.DefaultKubernetesImage=${REPO}/hardened-kubernetes:${KUBERNETES_IMAGE_TAG} - -X ${RKE2_PKG}/pkg/images.DefaultPauseImage=rancher/pause:${PAUSE_VERSION} + -X ${RKE2_PKG}/pkg/images.DefaultPauseImage=rancher/mirrored-pause:${PAUSE_VERSION} -X ${RKE2_PKG}/pkg/images.DefaultRuntimeImage=${REPO}/${PROG}-runtime:${DOCKERIZED_VERSION}-${GOOS}-${GOARCH} " From 3306ab3806571e9ff76fab3360f3e330abc25e5f Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Tue, 3 Oct 2023 08:45:49 -0700 Subject: [PATCH 2/2] appease codespell Signed-off-by: Brian Downs --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index e1b9febb2f..6002a9f0d8 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -108,7 +108,7 @@ EOF # SELinux is Enforcing by default. # To set SELinux as Disabled on a VM that has already been provisioned: # SELINUX=Disabled vagrant up --provision-with=selinux - # To set SELinux as Permissive on a VM that has already been provsioned + # To set SELinux as Permissive on a VM that has already been provisioned # SELINUX=Permissive vagrant up --provision-with=selinux config.vm.provision "selinux", type: "shell", run: "once" do |sh| sh.upload_path = "/tmp/vagrant-selinux"