Fix Docker architecture tag set by bazel

Signed-off-by: Maartje Eyskens <maartje@eyskens.me>

WORKSPACE

@@ -59,7 +59,7 @@ http_archive(
 git_repository(
     name = "io_bazel_rules_docker",
     remote = "https://github.com/bazelbuild/rules_docker.git",
-    commit = "80ea3aae060077e5fe0cdef1a5c570d4b7622100",
+    commit = "f1557ebc5381e2a662314e21585aa8080e9508be",
     shallow_since = "1561646721 -0700",
 )
 

build/container.bzl

@@ -61,6 +61,10 @@ def multi_arch_container(
             go_platform_constraint(os = "linux", arch = arch): base.format(ARCH = arch)
             for arch in architectures
         }),
+        architecture = select({
+            go_platform_constraint(os = "linux", arch = arch): arch
+            for arch in architectures
+        }),
         stamp = stamp,
         tags = tags,
         user = user,
@@ -82,6 +86,10 @@ def multi_arch_container(
         stamp = stamp,
         tags = tags,
         user = user,
+        architecture = select({
+            go_platform_constraint(os = "linux", arch = arch): arch
+            for arch in architectures
+        }),
         visibility = ["//visibility:public"],
     )
 

devel/addon/ingressnginx/BUILD.bazel

@@ -3,7 +3,7 @@ load("@io_bazel_rules_docker//container:bundle.bzl", "container_bundle")
 container_bundle(
     name = "bundle",
     images = {
-        "quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1": "@io_kubernetes_ingress-nginx//image",
+        "quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.33.0": "@io_kubernetes_ingress-nginx//image",
         "k8s.gcr.io/defaultbackend-amd64:bazel": "@io_gcr_k8s_defaultbackend//image",
     },
     tags = ["manual"],

devel/addon/ingressnginx/install.sh

@@ -34,7 +34,7 @@ SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
 # Require helm available on PATH
 check_tool kubectl
 check_tool helm
-require_image "quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1" "//devel/addon/ingressnginx:bundle"
+require_image "quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.33.0" "//devel/addon/ingressnginx:bundle"
 require_image "k8s.gcr.io/defaultbackend-amd64:bazel" "//devel/addon/ingressnginx:bundle"
 
 # Ensure the pebble namespace exists
@@ -50,7 +50,7 @@ helm upgrade \
     --wait \
     --version 1.23.0 \
     --namespace "${NAMESPACE}" \
-    --set controller.image.tag=0.26.1 \
+    --set controller.image.tag=0.33.0 \
     --set controller.image.pullPolicy=Never \
     --set defaultBackend.image.tag=bazel \
     --set defaultBackend.image.pullPolicy=Never \

test/e2e/images.bzl

@@ -39,7 +39,7 @@ def install():
         name = "io_kubernetes_ingress-nginx",
         registry = "quay.io",
         repository = "kubernetes-ingress-controller/nginx-ingress-controller",
-        tag = "0.26.1",
+        tag = "0.33.0",
         # For some reason, the suggested sha256 returns an error when fetched from
         # quay.io by digest.
         # digest = "sha256:f7f08fdbbeddaf3179829c662da360a3feac1ecf8c4b1305949fffd8c8f59879",