Merge pull request #1370 from borg-land/fix-typo-with-arm

Add the arm64 image to the manifest create command

Author: k8s-ci-robot

CHANGELOG/README.md

@@ -1,5 +1,8 @@
 # CHANGELOGs
 
+- [CHANGELOG v1.11.0](./CHANGELOG-1.11.md)
+- [CHANGELOG v1.10.0](./CHANGELOG-1.10.md)
+- [CHANGELOG v1.9.0](./CHANGELOG-1.9.md)
 - [CHANGELOG v1.8.0](./CHANGELOG-1.8.md)
 - [CHANGELOG v1.7.0](./CHANGELOG-1.7.md)
 - [CHANGELOG v1.6.0](./CHANGELOG-1.6.md)

Makefile

@@ -61,7 +61,7 @@ build-and-push-windows-container-ltsc2019: require-GCE_PD_CSI_STAGING_IMAGE init
 		--build-arg STAGINGVERSION=$(STAGINGVERSION) --push .
 
 build-and-push-multi-arch: build-and-push-container-linux-amd64 build-and-push-container-linux-arm64 build-and-push-windows-container-ltsc2019
-	$(DOCKER) manifest create --amend $(STAGINGIMAGE):$(STAGINGVERSION) $(STAGINGIMAGE):$(STAGINGVERSION)_linux_amd64 $(STAGINGIMAGE):$(STAGINGVERSION)_ltsc2019
+	$(DOCKER) manifest create --amend $(STAGINGIMAGE):$(STAGINGVERSION) $(STAGINGIMAGE):$(STAGINGVERSION)_linux_amd64 $(STAGINGIMAGE):$(STAGINGVERSION)_linux_arm64 $(STAGINGIMAGE):$(STAGINGVERSION)_ltsc2019
 	STAGINGIMAGE="$(STAGINGIMAGE)" STAGINGVERSION="$(STAGINGVERSION)" WINDOWS_IMAGE_TAGS="$(WINDOWS_IMAGE_TAGS)" WINDOWS_BASE_IMAGES="$(WINDOWS_BASE_IMAGES)" ./manifest_osversion.sh
 	$(DOCKER) manifest push -p $(STAGINGIMAGE):$(STAGINGVERSION)