push multi-arch images to the dev registry (#890)

* push multi-arch images to the dev registry

* cleam things up with a array of arches

* missed setting a GOARCH

* put quotes and {} everywhere

* one of these isn't a variable

Author: rmb938

Makefile

@@ -8,6 +8,7 @@ IMG_NAMESPACE?=cloudnativelabs
 GIT_COMMIT=$(shell git describe --tags --dirty)
 GIT_BRANCH?=$(shell git rev-parse --abbrev-ref HEAD)
 IMG_TAG?=$(if $(IMG_TAG_PREFIX),$(IMG_TAG_PREFIX)-)$(if $(ARCH_TAG_PREFIX),$(ARCH_TAG_PREFIX)-)$(GIT_BRANCH)
+MANIFEST_TAG?=$(if $(IMG_TAG_PREFIX),$(IMG_TAG_PREFIX)-)$(GIT_BRANCH)
 RELEASE_TAG?=$(GOARCH)-$(shell build/get-git-tag.sh)
 REGISTRY?=$(if $(IMG_FQDN),$(IMG_FQDN)/$(IMG_NAMESPACE)/$(NAME),$(IMG_NAMESPACE)/$(NAME))
 REGISTRY_DEV?=$(REGISTRY)$(DEV_SUFFIX)
@@ -126,14 +127,21 @@ push: container docker-login ## Pushes a Docker container image to a registry.
 	$(DOCKER) push "$(REGISTRY_DEV):$(IMG_TAG)"
 	@echo Finished kube-router container image push.
 
+push-manifest:
+	@echo Starting kube-router manifest push.
+	./manifest-tool push from-args \
+		--platforms linux/amd64,linux/arm64,linux/arm,linux/s390x,linux/ppc64le \
+		--template "$(REGISTRY_DEV):ARCH-$(MANIFEST_TAG)" \
+		--target "$(REGISTRY_DEV):$(MANIFEST_TAG)"
+
 push-release: push
 	@echo Starting kube-router release container image push.
 	@test -n "$(RELEASE_TAG)"
 	$(DOCKER) tag "$(REGISTRY_DEV):$(IMG_TAG)" "$(REGISTRY):$(RELEASE_TAG)"
 	$(DOCKER) push "$(REGISTRY)"
 	@echo Finished kube-router release container image push.
 
-push-manifest:
+push-manifest-release:
 	@echo Starting kube-router manifest push.
 	./manifest-tool push from-args \
 		--platforms linux/amd64,linux/arm64,linux/arm,linux/s390x,linux/ppc64le \

build/travis-deploy.sh

@@ -2,45 +2,43 @@
 set -o errexit
 set -o pipefail
 
+GOARCHES=(amd64 arm64 arm s390x ppc64le)
+
 # Pull Request image tag format: PR00
 if [ "${TRAVIS_EVENT_TYPE}" = "pull_request" ]; then
-    PR_USER=$(echo "$TRAVIS_PULL_REQUEST_SLUG" | sed -e 's/\/.*//')
-    if [ "$PR_USER" != "cloudnativelabs" ]; then
-      echo "Not building/pushing PR $TRAVIS_PULL_REQUEST since only the cloudnativelabs user can access docker hub credentials"
+    PR_USER=$(echo "${TRAVIS_PULL_REQUEST_SLUG}" | sed -e 's/\/.*//')
+    if [ "${PR_USER}" != "cloudnativelabs" ]; then
+      echo "Not building/pushing PR ${TRAVIS_PULL_REQUEST} since only the cloudnativelabs user can access docker hub credentials"
       exit 0
     fi
-    echo "Building/pushing PR$TRAVIS_PULL_REQUEST from $PR_USER"
-    make push IMG_TAG="PR$TRAVIS_PULL_REQUEST" GOARCH=amd64
-    make clean IMG_TAG="PR$TRAVIS_PULL_REQUEST" GOARCH=amd64
-    make push IMG_TAG="PR$TRAVIS_PULL_REQUEST" GOARCH=arm64
-    make clean IMG_TAG="PR$TRAVIS_PULL_REQUEST" GOARCH=arm64
-    make push IMG_TAG="PR$TRAVIS_PULL_REQUEST" GOARCH=arm
-    make clean IMG_TAG="PR$TRAVIS_PULL_REQUEST" GOARCH=arm
-    make push IMG_TAG="PR$TRAVIS_PULL_REQUEST" GOARCH=s390x
-    make clean IMG_TAG="PR$TRAVIS_PULL_REQUEST" GOARCH=s390x
-    make push IMG_TAG="PR$TRAVIS_PULL_REQUEST" GOARCH=ppc64le
-    make clean IMG_TAG="PR$TRAVIS_PULL_REQUEST" GOARCH=ppc64le
+    echo "Building/pushing PR${TRAVIS_PULL_REQUEST} from ${PR_USER}"
+    for GOARCH in "${GOARCHES[@]}"; do
+      make push IMG_TAG="${GOARCH}-PR${TRAVIS_PULL_REQUEST}" GOARCH="${GOARCH}"
+      make clean IMG_TAG="${GOARCH}-PR${TRAVIS_PULL_REQUEST}" GOARCH="${GOARCH}"
+    done
+    echo "Pushing PR manifest on Travis"
+    make push-manifest MANIFEST_TAG="PR${TRAVIS_PULL_REQUEST}"
     exit 0
 fi
 
 # Release image tag format: v0.0.0 and latest
-if [ -n "$TRAVIS_TAG" ]; then
+if [ -n "${TRAVIS_TAG}" ]; then
     echo "Running Release build on Travis"
-    make push-release RELEASE_TAG="amd64-$TRAVIS_TAG" GOARCH=amd64
-    make clean RELEASE_TAG="amd64-$TRAVIS_TAG" GOARCH=amd64
-    make push-release RELEASE_TAG="arm64-$TRAVIS_TAG" GOARCH=arm64
-    make clean RELEASE_TAG="arm64-$TRAVIS_TAG" GOARCH=arm64
-    make push-release RELEASE_TAG="arm-$TRAVIS_TAG" GOARCH=arm
-    make clean RELEASE_TAG="arm-$TRAVIS_TAG" GOARCH=arm
-    make push-release RELEASE_TAG="s390x-$TRAVIS_TAG" GOARCH=s390x
-    make clean RELEASE_TAG="s390x-$TRAVIS_TAG" GOARCH=s390x
-    make push-release RELEASE_TAG="ppc64le-$TRAVIS_TAG" GOARCH=ppc64le
-    make clean RELEASE_TAG="ppc64le-$TRAVIS_TAG" GOARCH=ppc64le
-    echo "Pushing manifest on Travis"
-    make push-manifest RELEASE_TAG="$TRAVIS_TAG"
+    for GOARCH in "${GOARCHES[@]}"; do
+      make push-release RELEASE_TAG="${GOARCH}-${TRAVIS_TAG}" GOARCH="${GOARCH}"
+      make clean RELEASE_TAG="${GOARCH}-${TRAVIS_TAG}" GOARCH="${GOARCH}"
+    done
+    echo "Pushing release manifest on Travis"
+    make push-manifest-release RELEASE_TAG="${TRAVIS_TAG}"
     exit 0
 fi
 
 # Push image tag format: COMMIT
 echo "Running push build on Travis"
-make push
+for GOARCH in "${GOARCHES[@]}"; do
+  make push GOARCH="${GOARCH}"
+  make clean GOARCH="${GOARCH}"
+done
+echo "Pushing manifest on Travis"
+make push-manifest
+