mirror of https://github.com/k3s-io/k3s
Merge pull request #53958 from dixudx/fix_pv_recycle_multiarch
Automatic merge from submit-queue (batch tested with PRs 53958, 53947). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix PV Recycle issue when running on multi-arch **What this PR does / why we need it**: Currently PV Recycle uses image `gcr.io/google_containers/busybox`, which is an amd64 image, not applied for multi-arch , to start pod `"pv-recycler"`. For other non-x86 platforms, like `ppc64le` and `arm64`, the pod cannot get started due to the busybox image. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #53942 **Special notes for your reviewer**: /cc @gyliu513 @mkumatag /assign @saad-ali @jsafrane **Release note**: ```release-note fix PV Recycle failed on non-amd64 platfrom ```pull/6/head
commit
1e356871a4
|
@ -711,7 +711,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod {
|
|||
Containers: []v1.Container{
|
||||
{
|
||||
Name: "pv-recycler",
|
||||
Image: "gcr.io/google_containers/busybox",
|
||||
Image: "busybox:latest",
|
||||
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{
|
||||
|
|
Loading…
Reference in New Issue