From e9754e9713a85f785fbfca80f9f887eb190c75da Mon Sep 17 00:00:00 2001 From: Matthew Cary Date: Mon, 20 Sep 2021 09:45:30 -0700 Subject: [PATCH 1/3] Update buster version to 1.9.0 Change-Id: Idca831bdba70f38b61386707a121f6fa09a076e6 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2e6062ec5..71cc18bc5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,12 +24,12 @@ ADD . . RUN GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GCE_PD_CSI_STAGING_VERSION=$STAGINGVERSION make gce-pd-driver # MAD HACKS: Build a version first so we can take the scsi_id bin and put it somewhere else in our real build -FROM k8s.gcr.io/build-image/debian-base:buster-v1.6.0 as mad-hack +FROM k8s.gcr.io/build-image/debian-base:buster-v1.9.0 as mad-hack RUN ln -s /bin/rm /usr/sbin/rm \ && clean-install udev # Start from Kubernetes Debian base -FROM k8s.gcr.io/build-image/debian-base:buster-v1.6.0 +FROM k8s.gcr.io/build-image/debian-base:buster-v1.9.0 COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver # Install necessary dependencies RUN ln -s /bin/rm /usr/sbin/rm \ From 85f0cfa9d127728d2cae283986a795a9ccecf5b5 Mon Sep 17 00:00:00 2001 From: Matthew Cary Date: Mon, 20 Sep 2021 09:51:39 -0700 Subject: [PATCH 2/3] Update gofmt Change-Id: I79ebf1187f179591d8457a9501a8bd35a3c4c529 --- pkg/gce-pd-csi-driver/utils_linux.go | 1 + pkg/gce-pd-csi-driver/utils_windows.go | 1 + pkg/mount-manager/safe-mounter-v1_windows.go | 1 + pkg/mount-manager/safe-mounter-v1beta_windows.go | 1 + pkg/mount-manager/safe-mounter_linux.go | 1 + pkg/mount-manager/safe-mounter_windows.go | 1 + pkg/mount-manager/statter_windows.go | 2 ++ pkg/resizefs/resizefs_linux.go | 1 + pkg/resizefs/resizefs_windows.go | 1 + 9 files changed, 10 insertions(+) diff --git a/pkg/gce-pd-csi-driver/utils_linux.go b/pkg/gce-pd-csi-driver/utils_linux.go index a56a21957..35d24701b 100644 --- a/pkg/gce-pd-csi-driver/utils_linux.go +++ b/pkg/gce-pd-csi-driver/utils_linux.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows /* diff --git a/pkg/gce-pd-csi-driver/utils_windows.go b/pkg/gce-pd-csi-driver/utils_windows.go index 64ace7ce8..4e775649a 100644 --- a/pkg/gce-pd-csi-driver/utils_windows.go +++ b/pkg/gce-pd-csi-driver/utils_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows /* diff --git a/pkg/mount-manager/safe-mounter-v1_windows.go b/pkg/mount-manager/safe-mounter-v1_windows.go index 03c97bc48..2568a8631 100644 --- a/pkg/mount-manager/safe-mounter-v1_windows.go +++ b/pkg/mount-manager/safe-mounter-v1_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows /* diff --git a/pkg/mount-manager/safe-mounter-v1beta_windows.go b/pkg/mount-manager/safe-mounter-v1beta_windows.go index b96db39ff..04b8a4386 100644 --- a/pkg/mount-manager/safe-mounter-v1beta_windows.go +++ b/pkg/mount-manager/safe-mounter-v1beta_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows /* diff --git a/pkg/mount-manager/safe-mounter_linux.go b/pkg/mount-manager/safe-mounter_linux.go index b807458d7..98d32f789 100644 --- a/pkg/mount-manager/safe-mounter_linux.go +++ b/pkg/mount-manager/safe-mounter_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux /* diff --git a/pkg/mount-manager/safe-mounter_windows.go b/pkg/mount-manager/safe-mounter_windows.go index fb95b0c05..ac31a794b 100644 --- a/pkg/mount-manager/safe-mounter_windows.go +++ b/pkg/mount-manager/safe-mounter_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows /* diff --git a/pkg/mount-manager/statter_windows.go b/pkg/mount-manager/statter_windows.go index 78dfbc3ef..ce2e055ef 100644 --- a/pkg/mount-manager/statter_windows.go +++ b/pkg/mount-manager/statter_windows.go @@ -1,4 +1,6 @@ +//go:build windows // +build windows + /* Copyright 2019 The Kubernetes Authors. diff --git a/pkg/resizefs/resizefs_linux.go b/pkg/resizefs/resizefs_linux.go index 7f23a89f7..e8c695571 100644 --- a/pkg/resizefs/resizefs_linux.go +++ b/pkg/resizefs/resizefs_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux /* diff --git a/pkg/resizefs/resizefs_windows.go b/pkg/resizefs/resizefs_windows.go index 8065db0a6..38b7ab667 100644 --- a/pkg/resizefs/resizefs_windows.go +++ b/pkg/resizefs/resizefs_windows.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows /* From a6aa91a70749a34152d135b5e6da681cca3fff13 Mon Sep 17 00:00:00 2001 From: Matthew Cary Date: Mon, 20 Sep 2021 11:33:55 -0700 Subject: [PATCH 3/3] Robust handling of /usr/sbin/rm in Dockerfile Change-Id: I4569ed4b3739332e745f85e681559857979a4f3a --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 71cc18bc5..06e6475c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,14 +25,14 @@ RUN GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GCE_PD_CSI_STAGING_VERSION=$ # MAD HACKS: Build a version first so we can take the scsi_id bin and put it somewhere else in our real build FROM k8s.gcr.io/build-image/debian-base:buster-v1.9.0 as mad-hack -RUN ln -s /bin/rm /usr/sbin/rm \ +RUN ln -fs /bin/rm /usr/sbin/rm \ && clean-install udev # Start from Kubernetes Debian base FROM k8s.gcr.io/build-image/debian-base:buster-v1.9.0 COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver # Install necessary dependencies -RUN ln -s /bin/rm /usr/sbin/rm \ +RUN ln -fs /bin/rm /usr/sbin/rm \ && clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs COPY --from=mad-hack /lib/udev/scsi_id /lib/udev_containerized/scsi_id