From 28f7be2203fcd65db6ccaa62f89b31eff90b0fcd Mon Sep 17 00:00:00 2001
From: James Munnelly <james@munnelly.eu>
Date: Tue, 17 Mar 2020 10:04:28 +0000
Subject: [PATCH] Fix building images during tests

Signed-off-by: James Munnelly <james@munnelly.eu>
---
 BUILD.bazel                         | 8 ++++----
 build/container.bzl                 | 8 ++++----
 devel/addon/certmanager/BUILD.bazel | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index e18ea8c4a..e2959fad3 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -25,10 +25,10 @@ genrule(
 container_bundle(
     name = "images",
     images = {
-        "{STABLE_DOCKER_REGISTRY}/cert-manager-controller:{STABLE_DOCKER_TAG}": "//build:controller",
-        "{STABLE_DOCKER_REGISTRY}/cert-manager-acmesolver:{STABLE_DOCKER_TAG}": "//build:acmesolver",
-        "{STABLE_DOCKER_REGISTRY}/cert-manager-webhook:{STABLE_DOCKER_TAG}": "//build:webhook",
-        "{STABLE_DOCKER_REGISTRY}/cert-manager-cainjector:{STABLE_DOCKER_TAG}": "//build:cainjector",
+        "{STABLE_DOCKER_REGISTRY}/cert-manager-controller:{STABLE_DOCKER_TAG}": "//build:controller.image",
+        "{STABLE_DOCKER_REGISTRY}/cert-manager-acmesolver:{STABLE_DOCKER_TAG}": "//build:acmesolver.image",
+        "{STABLE_DOCKER_REGISTRY}/cert-manager-webhook:{STABLE_DOCKER_TAG}": "//build:webhook.image",
+        "{STABLE_DOCKER_REGISTRY}/cert-manager-cainjector:{STABLE_DOCKER_TAG}": "//build:cainjector.image",
     },
     tags = ["manual"],
 )
diff --git a/build/container.bzl b/build/container.bzl
index 4bd0fb8a8..5b62ce533 100644
--- a/build/container.bzl
+++ b/build/container.bzl
@@ -66,18 +66,18 @@ def multi_arch_container(
     )
 
     container_image(
-        name = "%s-internal" % name,
+        name = "%s.image" % name,
         base = ":%s-internal-notimestamp" % name,
         stamp = stamp,
         tags = tags,
-        visibility = ["//visibility:private"],
+        visibility = ["//visibility:public"],
     )
 
     for arch in architectures:
         container_bundle(
             name = "%s-%s" % (name, arch),
             images = {
-                docker_tag.format(ARCH = arch): ":%s-internal" % name
+                docker_tag.format(ARCH = arch): ":%s.image" % name
                 for docker_tag in docker_tags
             },
             tags = tags,
@@ -107,7 +107,7 @@ def multi_arch_container(
         multi_arch_container_push(
             name = name,
             architectures = architectures,
-            docker_tags_images = {docker_push_tag: ":%s-internal" % name for docker_push_tag in docker_push_tags},
+            docker_tags_images = {docker_push_tag: ":%s.image" % name for docker_push_tag in docker_push_tags},
             tags = tags,
         )
 
diff --git a/devel/addon/certmanager/BUILD.bazel b/devel/addon/certmanager/BUILD.bazel
index 43f08ceba..a732d441a 100644
--- a/devel/addon/certmanager/BUILD.bazel
+++ b/devel/addon/certmanager/BUILD.bazel
@@ -3,10 +3,10 @@ load("@io_bazel_rules_docker//container:bundle.bzl", "container_bundle")
 container_bundle(
     name = "bundle",
     images = {
-        "{STABLE_DOCKER_REGISTRY}/cert-manager-controller:{STABLE_DOCKER_TAG}": "//build:controller",
-        "{STABLE_DOCKER_REGISTRY}/cert-manager-acmesolver:{STABLE_DOCKER_TAG}": "//build:acmesolver",
-        "{STABLE_DOCKER_REGISTRY}/cert-manager-webhook:{STABLE_DOCKER_TAG}": "//build:webhook",
-        "{STABLE_DOCKER_REGISTRY}/cert-manager-cainjector:{STABLE_DOCKER_TAG}": "//build:cainjector",
+        "{STABLE_DOCKER_REGISTRY}/cert-manager-controller:{STABLE_DOCKER_TAG}": "//build:controller.image",
+        "{STABLE_DOCKER_REGISTRY}/cert-manager-acmesolver:{STABLE_DOCKER_TAG}": "//build:acmesolver.image",
+        "{STABLE_DOCKER_REGISTRY}/cert-manager-webhook:{STABLE_DOCKER_TAG}": "//build:webhook.image",
+        "{STABLE_DOCKER_REGISTRY}/cert-manager-cainjector:{STABLE_DOCKER_TAG}": "//build:cainjector.image",
     },
     tags = ["manual"],
 )