caa: Remove old build logic

Nothing should be calling the `image-with-arch` make target anymore
now that the process is unified, so remove it and the code that only it
called to simplify and remove duplication.

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

Author: stevenhorsman

src/cloud-api-adaptor/Makefile

@@ -112,10 +112,6 @@ clean: ## Remove binaries.
 image: .git-commit ## Build and push docker image to $registry
 	COMMIT=$(COMMIT) VERSION=$(VERSION) YQ_VERSION=$(YQ_VERSION) hack/build.sh -i
 
-.PHONY: image-with-arch
-image-with-arch: .git-commit ## Build the per arch image
-	COMMIT=$(COMMIT) VERSION=$(VERSION) YQ_VERSION=$(YQ_VERSION) hack/build.sh -a
-
 ##@ Deployment
 
 .PHONY: deploy

src/cloud-api-adaptor/hack/build.sh

@@ -22,7 +22,6 @@ release_tags=${RELEASE_TAGS:-"${commit}"}
 
 supported_arches=${ARCHES:-"linux/amd64"}
 
-arch_file_prefix="${script_dir}/../tags-architectures-"
 arch_prefix="linux/"
 
 # Get a list of comma-separated tags (e.g. latest,5d0da3dc9764-dev), return
@@ -36,8 +35,8 @@ function get_tag_string() {
 
 	# if we are building fora single arch, then also append this to the tag
 	if [[ -n "${arch:-}" ]] && [[ "${arch:-}" != *,* ]];then
-		# strip the `linux/` from the docker buildx platform format
-		arch_suffix="-${arch#"linux/"}"
+		# strip the `linux/` from the docker buildx platform format in the tag
+		arch_suffix="-${arch#${arch_prefix}}"
 	fi
 
 	for tag in ${tags/,/ };do
@@ -72,54 +71,9 @@ function build_caa_payload_image() {
 	popd
 }
 
-function get_arch_specific_tag_string() {
-	local tags="$1"
-	local arch="$2"
-	local tag_string=""
-
-	for tag in ${tags/,/ };do
-		tag_string+=" -t ${registry}/${name}:${tag}-${arch}"
-	done
-
-	echo "$tag_string"
-}
-
-# accept one arch as --platform
-function build_caa_payload_arch_specific() {
-	pushd "${script_dir}/../../"
-
-	arch=${supported_arches#"$arch_prefix"}
-
-	echo "arch="$arch >> "$arch_file_prefix$arch"
-
-	local tag_string
-	local build_type=dev
-
-	tag_string="$(get_arch_specific_tag_string "$dev_tags" "${arch}")"
-	if [[ "$release_build" == "true" ]]; then
-		tag_string="$(get_arch_specific_tag_string "$release_tags" "${arch}")"
-		build_type=release
-	fi
-
-	docker buildx build --platform "${supported_arches}" \
-		--build-arg RELEASE_BUILD="${release_build}" \
-		--build-arg BUILD_TYPE="${build_type}" \
-		--build-arg VERSION="${version}" \
-		--build-arg COMMIT="${commit}" \
-		--build-arg YQ_VERSION="${YQ_VERSION}" \
-		-f cloud-api-adaptor/Dockerfile \
-		${tag_string} \
-		--push \
-		.
-	popd
-}
-
 # Get the options
-while getopts ":ai" option; do
+while getopts ":i" option; do
     case $option in
-        a) # image arch specific
-            build_caa_payload_arch_specific
-            exit;;
         i) # image
             build_caa_payload_image
             exit;;