From 91ade9f3189659eef75616864b37fc0214ceffd8 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Thu, 3 Mar 2022 09:53:34 -0500 Subject: [PATCH] Switch pv-recycler container image to debian-base Signed-off-by: Davanum Srinivas --- cluster/gce/gci/configure-helper.sh | 7 ++++++- pkg/volume/plugins.go | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 8fd68c66f5d..4483fbde114 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -3036,7 +3036,7 @@ spec: - name: vol containers: - name: pv-recycler - image: k8s.gcr.io/busybox:1.27 + image: k8s.gcr.io/debian-base:v2.0.0 command: - /bin/sh args: @@ -3046,6 +3046,11 @@ spec: - name: vol mountPath: /scrub EOF + +# fixup the alternate registry if specified +if [[ -n "${KUBE_ADDON_REGISTRY:-}" ]]; then + sed -i -e "s@k8s.gcr.io@${KUBE_ADDON_REGISTRY}@g" "${PV_RECYCLER_OVERRIDE_TEMPLATE}" +fi } function wait-till-apiserver-ready() { diff --git a/pkg/volume/plugins.go b/pkg/volume/plugins.go index d238756b598..56deebbcd13 100644 --- a/pkg/volume/plugins.go +++ b/pkg/volume/plugins.go @@ -1083,7 +1083,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod { Containers: []v1.Container{ { Name: "pv-recycler", - Image: "busybox:1.27", + Image: "k8s.gcr.io/debian-base:v2.0.0", Command: []string{"/bin/sh"}, Args: []string{"-c", "test -e /scrub && rm -rf /scrub/..?* /scrub/.[!.]* /scrub/* && test -z \"$(ls -A /scrub)\" || exit 1"}, VolumeMounts: []v1.VolumeMount{