Add multi-arch and automatic Go version build support (#391)

Extends #358

Description of changes:
Adds support for `GOARCH` in the controller image Dockerfile and relevant scripts. Updates the Dockerfile to use the Go version specified in `go.mod` file (upgraded to 1.19).

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Author: RedbackThomson

Dockerfile

@@ -1,22 +1,28 @@
-# Base image to use for the final stage
+# Base image to use at runtime
 ARG base_image=public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2021-12-01-1638322424
+
+# Golang image to use for compiling the manager
+ARG builder_image=public.ecr.aws/docker/library/golang
+
+# Version of Golang 
+ARG golang_version
+
 # Build the manager binary
-# TODO(vijtrip2) move this builder image to public.ecr.aws/eks-distro-build-tooling/builder-base, when builder-base
-# supports golang 1.17
-FROM public.ecr.aws/bitnami/golang:1.17 as builder
+FROM $builder_image:$golang_version as builder
 
 ARG service_alias
 # The tuple of controller image version information
 ARG service_controller_git_version
 ARG service_controller_git_commit
 ARG build_date
+ARG go_arch=amd64
 # The directory within the builder container into which we will copy our
 # service controller code.
 ARG work_dir=/github.com/aws-controllers-k8s/$service_alias-controller
 WORKDIR $work_dir
 ENV GOPROXY=https://proxy.golang.org|direct
 ENV GO111MODULE=on
-ENV GOARCH=amd64
+ENV GOARCH=$go_arch
 ENV GOOS=linux
 ENV CGO_ENABLED=0
 ENV VERSION_PKG=github.com/aws-controllers-k8s/$service_alias-controller/pkg/version

Dockerfile.local

@@ -1,22 +1,28 @@
 # Base image to use at runtime
 ARG base_image=public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nonroot:2021-12-01-1638322424
+
+# Golang image to use for compiling the manager
+ARG builder_image=public.ecr.aws/docker/library/golang
+
+# Version of Golang 
+ARG golang_version
+
 # Build the manager binary
-# TODO(vijtrip2) move this builder image to public.ecr.aws/eks-distro-build-tooling/builder-base, when builder-base
-# supports golang 1.17
-FROM public.ecr.aws/bitnami/golang:1.17 as builder
+FROM $builder_image:$golang_version as builder
 
 ARG service_alias
 # The tuple of controller image version information
 ARG service_controller_git_version
 ARG service_controller_git_commit
 ARG build_date
+ARG go_arch=amd64
 # The directory within the builder container into which we will copy our
 # service controller code.
 ARG work_dir=/github.com/aws-controllers-k8s/$service_alias-controller
 WORKDIR $work_dir
 ENV GOPROXY=https://proxy.golang.org|direct
 ENV GO111MODULE=on
-ENV GOARCH=amd64
+ENV GOARCH=$go_arch
 ENV GOOS=linux
 ENV CGO_ENABLED=0
 ENV VERSION_PKG=github.com/aws-controllers-k8s/$service_alias-controller/pkg/version

go.local.mod

@@ -1,6 +1,6 @@
 module github.com/aws-controllers-k8s/code-generator
 
-go 1.17
+go 1.19
 
 replace github.com/aws-controllers-k8s/runtime => ../runtime
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/aws-controllers-k8s/code-generator
 
-go 1.17
+go 1.19
 
 require (
 	github.com/aws-controllers-k8s/pkg v0.0.0-20230111194700-e8a36ef99b23

scripts/build-controller-image.sh

@@ -12,6 +12,17 @@ LOCAL_MODULES=${LOCAL_MODULES:-"false"}
 BUILD_DATE=$(date +%Y-%m-%dT%H:%M)
 QUIET=${QUIET:-"false"}
 
+HARDWARE_PLATFORM=${HARDWARE_PLATFORM:-$(uname -i)}
+GOARCH=${GOARCH:-""}
+if [ "$HARDWARE_PLATFORM" = "aarch64" ]; then
+  GOARCH="arm64"
+elif [ "$HARDWARE_PLATFORM" = "x86_64" ]; then
+  GOARCH="amd64"
+else
+  echo "HARDWARE_PLATFORM is not supported: $HARDWARE_PLATFORM. Defaulting to amd64"
+  GOARCH="amd64"
+fi
+
 export DOCKER_BUILDKIT=${DOCKER_BUILDKIT:-1}
 
 source "$SCRIPTS_DIR/lib/common.sh"
@@ -60,10 +71,8 @@ if [[ ! -d $SERVICE_CONTROLLER_SOURCE_PATH ]]; then
 fi
 
 pushd "$SERVICE_CONTROLLER_SOURCE_PATH" 1>/dev/null
-
-SERVICE_CONTROLLER_GIT_VERSION=$(git describe --tags --always --dirty || echo "unknown")
-SERVICE_CONTROLLER_GIT_COMMIT=$(git rev-parse HEAD)
-
+  SERVICE_CONTROLLER_GIT_VERSION=$(git describe --tags --always --dirty || echo "unknown")
+  SERVICE_CONTROLLER_GIT_COMMIT=$(git rev-parse HEAD)
 popd 1>/dev/null
 
 DEFAULT_AWS_SERVICE_DOCKER_IMG="aws-controllers-k8s:$AWS_SERVICE-$SERVICE_CONTROLLER_GIT_VERSION"
@@ -79,6 +88,11 @@ if ! is_public_ecr_logged_in; then
   aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws
 fi
 
+pushd "$ROOT_DIR" 1>/dev/null
+  # Get the golang version from the code-generator
+  GOLANG_VERSION=${GOLANG_VERSION:-"$(go list -f {{.GoVersion}} -m)"}
+popd 1>/dev/null
+
 # if local build
 # then use Dockerfile which allows references to local modules from service controller
 DOCKER_BUILD_CONTEXT="$ACK_DIR"
@@ -94,6 +108,8 @@ if ! docker build \
   --build-arg service_controller_git_version="$SERVICE_CONTROLLER_GIT_VERSION" \
   --build-arg service_controller_git_commit="$SERVICE_CONTROLLER_GIT_COMMIT" \
   --build-arg build_date="$BUILD_DATE" \
+  --build-arg golang_version="${GOLANG_VERSION}" \
+  --build-arg go_arch="$GOARCH" \
   "${DOCKER_BUILD_CONTEXT}"; then
   exit 2
 fi