Merge pull request kubernetes-sigs#38 from openshift-cherrypick-robot…

…/cherry-pick-37-to-release-4.13 [release-4.13] OCPBUGS-10483: UPSTREAM: <carry>: Fix GOARCH in OpenShift build
dobsonj · Mar 22, 2023 · a1f1e05 · a1f1e05
2 parents b3befc9 + 7884943
commit a1f1e05
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 16 deletions.
diff --git a/Dockerfile.openshift b/Dockerfile.openshift
@@ -1,7 +1,7 @@
 FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.13 AS builder
 WORKDIR /go/src/github.com/kubernetes-sigs/aws-efs-csi-driver
 COPY . .
-RUN make
+RUN make bin/aws-efs-csi-driver
 
 # Use a base image with aws-efs-utils installed
 FROM registry.ci.openshift.org/ocp/4.13:aws-efs-utils-base

diff --git a/Makefile b/Makefile
@@ -57,7 +57,9 @@ word-hyphen = $(word $2,$(subst -, ,$1))
 .PHONY: linux/$(ARCH) bin/aws-efs-csi-driver
 linux/$(ARCH): bin/aws-efs-csi-driver
 bin/aws-efs-csi-driver: | bin
-	CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) go build -mod=vendor -ldflags ${LDFLAGS} -o bin/aws-efs-csi-driver ./cmd/
+# OpenShift: <carry>: do not overwrite GOARCH, use the one provided by the builder.
+	@echo GOARCH:${GOARCH}
+	CGO_ENABLED=0 GOOS=linux go build -mod=vendor -ldflags ${LDFLAGS} -o bin/aws-efs-csi-driver ./cmd/
 
 .PHONY: all
 all: all-image-docker

diff --git a/go.mod b/go.mod
@@ -117,7 +117,7 @@ replace (
 	k8s.io/kubelet => k8s.io/kubelet v0.22.3
 	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.3
 	k8s.io/metrics => k8s.io/metrics v0.22.3
-	k8s.io/mount-utils => k8s.io/mount-utils v0.22.4-rc.0
+	k8s.io/mount-utils => k8s.io/mount-utils v0.23.0
 	k8s.io/node-api => k8s.io/node-api v0.18.10
 	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.3
 	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.3

diff --git a/go.sum b/go.sum
@@ -1277,6 +1277,7 @@ k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
+k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
 k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-aggregator v0.22.3/go.mod h1:TIpLq1HvR/S4y75i3y+4q9ik3ZvgyaDz72CBfDS0A6E=
@@ -1293,13 +1294,14 @@ k8s.io/kubernetes v1.22.3 h1:/eFfR5S2Vxn0t9kcLVAZXQFloKMkklWQIf5e0hFbzlA=
 k8s.io/kubernetes v1.22.3/go.mod h1:Snea7fgIObGgHmLbUJ3OgjGEr5bjj16iEdp5oHS6eS8=
 k8s.io/legacy-cloud-providers v0.22.3/go.mod h1:eEOOaRtP2PuCVkjZvuTPa6ZgyPpzJkCVqpE3YtuArLQ=
 k8s.io/metrics v0.22.3/go.mod h1:HbLFLRKtXzoC/6tHLQAlO9AeOBXZp2eB6SsgkbujoNI=
-k8s.io/mount-utils v0.22.4-rc.0 h1:EtaGNvn29ysqPyJB07rGbyerN3rI2kVW2M+vlovdDRM=
-k8s.io/mount-utils v0.22.4-rc.0/go.mod h1:dHl6c2P60T5LHUnZxVslyly9EDCMzvhtISO5aY+Z4sk=
+k8s.io/mount-utils v0.23.0 h1:8sGMlbbQOA268SidZVoL7wOgEcbByoa6+bvFZCywhbg=
+k8s.io/mount-utils v0.23.0/go.mod h1:9pFhzVjxle1osJUo++9MFDat9HPkQUOoHCn+eExZ3Ew=
 k8s.io/pod-security-admission v0.22.3/go.mod h1:xtkf/UhVWICokQLSDvD+8plfGkTQW4VTJvnixVWCeWk=
 k8s.io/sample-apiserver v0.22.3/go.mod h1:HuEOdD/pT5R7gKNr2REb62uabZaJuFZyY3wUd86nFCA=
 k8s.io/system-validators v1.5.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q=
 k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e h1:W1yba+Bpkwb5BatGKZALQ1yylhwnuD6CkYmrTibyLDM=
 k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=

diff --git a/vendor/k8s.io/mount-utils/mount_helper_unix.go b/vendor/k8s.io/mount-utils/mount_helper_unix.go
diff --git a/vendor/k8s.io/mount-utils/mount_helper_windows.go b/vendor/k8s.io/mount-utils/mount_helper_windows.go
diff --git a/vendor/k8s.io/mount-utils/mount_linux.go b/vendor/k8s.io/mount-utils/mount_linux.go
diff --git a/vendor/k8s.io/mount-utils/mount_unsupported.go b/vendor/k8s.io/mount-utils/mount_unsupported.go
diff --git a/vendor/k8s.io/mount-utils/mount_windows.go b/vendor/k8s.io/mount-utils/mount_windows.go
diff --git a/vendor/k8s.io/mount-utils/resizefs_linux.go b/vendor/k8s.io/mount-utils/resizefs_linux.go
diff --git a/vendor/k8s.io/mount-utils/resizefs_unsupported.go b/vendor/k8s.io/mount-utils/resizefs_unsupported.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1014,7 +1014,7 @@ k8s.io/kubernetes/test/e2e/storage/testsuites
 k8s.io/kubernetes/test/e2e/storage/utils
 k8s.io/kubernetes/test/utils
 k8s.io/kubernetes/test/utils/image
-# k8s.io/mount-utils v0.22.3 => k8s.io/mount-utils v0.22.4-rc.0
+# k8s.io/mount-utils v0.22.3 => k8s.io/mount-utils v0.23.0
 ## explicit; go 1.16
 k8s.io/mount-utils
 # k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e
@@ -1068,7 +1068,7 @@ sigs.k8s.io/yaml
 # k8s.io/kubelet => k8s.io/kubelet v0.22.3
 # k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.3
 # k8s.io/metrics => k8s.io/metrics v0.22.3
-# k8s.io/mount-utils => k8s.io/mount-utils v0.22.4-rc.0
+# k8s.io/mount-utils => k8s.io/mount-utils v0.23.0
 # k8s.io/node-api => k8s.io/node-api v0.18.10
 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.3
 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.3