github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108490 from dims/switch-pv-recycler-container-image-to-debian-base

Browse Source 
Switch pv-recycler container image to debian-base
This commit is contained in:
Kubernetes Prow Robot 2022-03-03 16:01:07 -08:00 committed by GitHub
commit 6eca8cc472
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/gce/gci/configure-helper.sh
View File

@ -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() {

2
pkg/volume/plugins.go
View File

@ -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{