Re-add arm support and fix target arch for non-amd64 platforms

Signed-off-by: Brad Davidson <[email protected]>

Author: brandond

.github/workflows/pull-request.yaml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         os: [linux]
-        arch: [amd64, arm64]
+        arch: [amd64, arm64, arm]
     steps:
       - name: Add Git
         run: apk add -U git

.github/workflows/release.yaml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         os: [linux]
-        arch: [amd64, arm64]
+        arch: [amd64, arm64, arm]
     steps:
       - name: Add Git
         run: apk add -U git
@@ -138,4 +138,4 @@ jobs:
           tags: rancher/system-upgrade-controller:${{ env.TAG }}
           file: package/Dockerfile
           target: controller
-          platforms: linux/amd64, linux/arm64
+          platforms: linux/amd64, linux/arm64, linux/arm

Dockerfile.dapper

@@ -17,7 +17,7 @@ RUN if [ "${ARCH:-$(go env GOARCH)}" = "amd64" ]; then \
     chmod +x /usr/local/bin/docker-compose; \
     fi
 RUN mkdir -p /usr/local/lib/docker/cli-plugins; \
-    curl -o /usr/local/lib/docker/cli-plugins/docker-buildx -fsSL "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-${ARCH}"; \
+    curl -o /usr/local/lib/docker/cli-plugins/docker-buildx -fsSL "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-amd64"; \
     chmod +x /usr/local/lib/docker/cli-plugins/docker-buildx
 ENV DAPPER_ENV REPO TAG DRONE_TAG
 ENV DAPPER_SOURCE /go/src/github.com/rancher/system-upgrade-controller/

scripts/build-controller

@@ -9,4 +9,4 @@ mkdir -p bin
 [ "$(uname)" != "Darwin" ] && LINKFLAGS="-extldflags -static -s"
 echo "Building $PKG ..."
 VERSIONFLAGS="-X ${PKG}/pkg/version.Version=${VERSION} -X ${PKG}/pkg/version.GitCommit=${COMMIT:0:8}"
-CGO_ENABLED=0 go build -ldflags "$VERSIONFLAGS $LINKFLAGS" -o bin/system-upgrade-controller
+CGO_ENABLED=0 GOARCH=$ARCH go build -ldflags "$VERSIONFLAGS $LINKFLAGS" -o bin/system-upgrade-controller

scripts/build-e2e-tests

@@ -9,4 +9,4 @@ mkdir -p bin
 [ "$(uname)" != "Darwin" ] && LINKFLAGS="-extldflags -static -s"
 echo "Building $PKG/e2e ..."
 VERSIONFLAGS="-X ${PKG}/pkg/version.Version=${VERSION} -X ${PKG}/pkg/version.GitCommit=${COMMIT:0:8}"
-CGO_ENABLED=0 go test -c -ldflags "$VERSIONFLAGS $LINKFLAGS" -o bin/system-upgrade-controller.test ./e2e/suite/...
+CGO_ENABLED=0 GOARCH=$ARCH go test -c -ldflags "$VERSIONFLAGS $LINKFLAGS" -o bin/system-upgrade-controller.test ./e2e/suite/...

scripts/package-controller

@@ -6,7 +6,7 @@ source $(dirname $0)/version
 cd $(dirname $0)/..
 
 docker buildx build \
-  --build-arg TARGETARCH=${ARCH} \
+  --platform linux/${ARCH} \
   --build-arg REPO=${REPO} \
   --build-arg TAG=${TAG} \
   --build-arg VERSION=${VERSION} \

scripts/package-e2e-tests

@@ -5,8 +5,12 @@ source $(dirname $0)/version
 
 cd $(dirname $0)/..
 
+if [ "$ARCH" != "amd64" ]; then
+  exit 0
+fi
+
 docker buildx build \
-  --build-arg TARGETARCH=${ARCH} \
+  --platform linux/${ARCH} \
   --build-arg REPO=${REPO} \
   --build-arg TAG=${TAG} \
   --build-arg VERSION=${VERSION} \
@@ -24,11 +28,9 @@ docker image save --output ./dist/artifacts/system-upgrade-controller-e2e-tests-
 echo ${REPO}/system-upgrade-controller:${TAG}-e2e-tests >> ./dist/images.txt
 echo Built ${REPO}/system-upgrade-controller:${TAG}-e2e-tests
 
-if [ "$ARCH" = "amd64" ]; then
-  sonobuoy gen plugin \
-    --format=junit \
-    --image ${REPO}/system-upgrade-controller:${VERSION}-e2e-tests \
-    --name system-upgrade-controller \
-    --type job \
-  > ./dist/artifacts/system-upgrade-controller-e2e-tests.yaml
-fi
+sonobuoy gen plugin \
+  --format=junit \
+  --image ${REPO}/system-upgrade-controller:${VERSION}-e2e-tests \
+  --name system-upgrade-controller \
+  --type job \
+> ./dist/artifacts/system-upgrade-controller-e2e-tests.yaml

scripts/validate

@@ -3,10 +3,10 @@ set -e
 
 cd $(dirname $0)/..
 
-echo Running validation
-
 PACKAGES="$(go list ./...)"
 
+file bin/*
+
 if ! command -v golangci-lint; then
     echo Skipping validation: no golangci-lint available
     exit