Set proper architecture label for arm64 container images

Adding arm64 in the select to set properly label the architecture of the container images pushed by Kubevirt. Signed-off-by: Howard Zhang <[email protected]>
dominikholler · Apr 13, 2021 · afb517c · afb517c
1 parent 80f032b
commit afb517c
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 0 deletions.
diff --git a/cmd/example-cloudinit-hook-sidecar/BUILD.bazel b/cmd/example-cloudinit-hook-sidecar/BUILD.bazel
@@ -31,6 +31,7 @@ container_image(
     name = "example-cloudinit-hook-sidecar-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = select({

diff --git a/cmd/example-hook-sidecar/BUILD.bazel b/cmd/example-hook-sidecar/BUILD.bazel
@@ -33,6 +33,7 @@ container_image(
     name = "example-hook-sidecar-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = select({

diff --git a/cmd/subresource-access-test/BUILD.bazel b/cmd/subresource-access-test/BUILD.bazel
@@ -27,6 +27,7 @@ container_image(
     name = "subresource-access-test-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = "//:passwd-image",

diff --git a/cmd/virt-api/BUILD.bazel b/cmd/virt-api/BUILD.bazel
@@ -41,6 +41,7 @@ container_image(
     name = "virt-api-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = ":version-container",

diff --git a/cmd/virt-controller/BUILD.bazel b/cmd/virt-controller/BUILD.bazel
@@ -39,6 +39,7 @@ container_image(
     name = "virt-controller-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = ":version-container",

diff --git a/cmd/virt-handler/BUILD.bazel b/cmd/virt-handler/BUILD.bazel
@@ -149,6 +149,7 @@ container_image(
     name = "virt-handler-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = ":version-container",

diff --git a/cmd/virt-launcher/BUILD.bazel b/cmd/virt-launcher/BUILD.bazel
@@ -138,6 +138,7 @@ container_image(
     name = "virt-launcher-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = ":version-container",

diff --git a/cmd/virt-operator/BUILD.bazel b/cmd/virt-operator/BUILD.bazel
@@ -36,6 +36,7 @@ container_image(
     name = "virt-operator-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = ":version-container",

diff --git a/containerimages/BUILD.bazel b/containerimages/BUILD.bazel
@@ -17,6 +17,7 @@ container_image(
     name = "alpine-container-disk-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     tars = [":alpine-image-tar"],
@@ -39,6 +40,7 @@ container_image(
     name = "cirros-container-disk-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     tars = [":cirros-image-tar"],
@@ -62,6 +64,7 @@ container_image(
     name = "cirros-custom-container-disk-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     tars = [":cirros-custom-image-tar"],
@@ -84,6 +87,7 @@ container_image(
     name = "fedora-cloud-container-disk-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     tars = [":fedora-cloud-image-tar"],
@@ -104,6 +108,11 @@ pkg_tar(
 
 container_image(
     name = "microlivecd-container-disk-image",
+    architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
+        "//conditions:default": "amd64",
+    }),
     tars = [":microlivecd-image-tar"],
     visibility = ["//visibility:public"],
 )
@@ -120,6 +129,7 @@ container_image(
     name = "virtio-container-disk-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     tars = [":virtio-image-tar"],
@@ -130,6 +140,7 @@ container_image(
     name = "fedora-sriov-lane-container-disk-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = select({
@@ -144,6 +155,8 @@ container_image(
 container_image(
     name = "fedora-with-test-tooling",
     architecture = select({
+        "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = select({

diff --git a/images/cdi-http-import-server/BUILD.bazel b/images/cdi-http-import-server/BUILD.bazel
@@ -85,6 +85,7 @@ container_image(
     name = "cdi-http-import-server-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = "//images:kubevirt-testing-base",

diff --git a/images/disks-images-provider/BUILD.bazel b/images/disks-images-provider/BUILD.bazel
@@ -92,6 +92,7 @@ container_image(
     name = "disks-images-provider-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = "//images:kubevirt-testing-base",

diff --git a/images/nfs-server/BUILD.bazel b/images/nfs-server/BUILD.bazel
@@ -7,6 +7,7 @@ container_image(
     name = "nfs-server-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = select({

diff --git a/images/vm-killer/BUILD.bazel b/images/vm-killer/BUILD.bazel
@@ -7,6 +7,7 @@ container_image(
     name = "vm-killer-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = "//images:kubevirt-testing-base",

diff --git a/images/winrmcli/BUILD.bazel b/images/winrmcli/BUILD.bazel
@@ -11,6 +11,7 @@ container_image(
     name = "winrmcli-image",
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = select({

diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel
@@ -83,6 +83,7 @@ container_image(
     testonly = True,
     architecture = select({
         "@io_bazel_rules_go//go/platform:linux_ppc64le": "ppc64le",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
         "//conditions:default": "amd64",
     }),
     base = select({