(makefile) Dynamically set GOARCH flag while building binaries (#2871)

The GOARCH flag was hardcoded to "386", which causes the binaries to not
work properly on machines with arm64 arch. This PR dynamically sets the
GOARCH flag to arm64 if the machine arch is arm64, or to 386 for all other
arch.

Signed-off-by: anik120 <[email protected]>

Signed-off-by: anik120 <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: a8edd5c05a1dbeba19b80110b2d4df50ffb96c4c

Author: anik120

pkg/manifests/csv.yaml

@@ -5,7 +5,7 @@ metadata:
   name: packageserver
   namespace: openshift-operator-lifecycle-manager
   labels:
-    olm.version: 0.0.0-5e4c07934c95c017f555df621cf66cf7ff60428b
+    olm.version: 0.0.0-fd79d2301b18b009d8e49ca973d166916302908f
     olm.clusteroperator.name: operator-lifecycle-manager-packageserver
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
@@ -159,7 +159,7 @@ spec:
                                 - packageserver
                         topologyKey: "kubernetes.io/hostname"
   maturity: alpha
-  version: 0.0.0-5e4c07934c95c017f555df621cf66cf7ff60428b
+  version: 0.0.0-fd79d2301b18b009d8e49ca973d166916302908f
   apiservicedefinitions:
     owned:
       - group: packages.operators.coreos.com

staging/operator-lifecycle-manager/Makefile

@@ -29,7 +29,11 @@ GO := GO111MODULE=on GOFLAGS="$(MOD_FLAGS)" go
 GINKGO := $(GO) run github.com/onsi/ginkgo/v2/ginkgo
 BINDATA := $(GO) run github.com/go-bindata/go-bindata/v3/go-bindata
 GIT_COMMIT := $(shell git rev-parse HEAD)
-
+ifeq ($(shell arch), arm64) 
+ARCH := arm64
+else
+ARCH := 386
+endif
 # Phony prerequisite for targets that rely on the go build cache to determine staleness.
 .PHONY: build test clean vendor \
 	coverage coverage-html e2e \
@@ -82,15 +86,15 @@ build-coverage: build_cmd=test -c -covermode=count -coverpkg ./pkg/controller/..
 build-coverage: clean $(CMDS)
 
 build-linux: build_cmd=build
-build-linux: arch_flags=GOOS=linux GOARCH=386
+build-linux: arch_flags=GOOS=linux GOARCH=$(ARCH)
 build-linux: clean $(CMDS)
 
 build-wait: clean bin/wait
 
 bin/wait: FORCE
-	GOOS=linux GOARCH=386 go build $(MOD_FLAGS) -o $@ $(PKG)/test/e2e/wait
+	GOOS=linux GOARCH=$(ARCH) go build $(MOD_FLAGS) -o $@ $(PKG)/test/e2e/wait
 
-build-util-linux: arch_flags=GOOS=linux GOARCH=386
+build-util-linux: arch_flags=GOOS=linux GOARCH=$(ARCH)
 build-util-linux: build-util
 
 build-util: bin/cpb