From 4944619f805eb9b2397aafd5f3824df2d1debf98 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Fri, 23 Apr 2021 10:28:57 +0100 Subject: [PATCH] Simplify the installation of sample-external-issuer Signed-off-by: Richard Wall --- .../addon/sample-external-issuer/BUILD.bazel | 10 -------- devel/addon/sample-external-issuer/install.sh | 23 ++++--------------- 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/devel/addon/sample-external-issuer/BUILD.bazel b/devel/addon/sample-external-issuer/BUILD.bazel index 0c45d5aff..8cf19e75e 100644 --- a/devel/addon/sample-external-issuer/BUILD.bazel +++ b/devel/addon/sample-external-issuer/BUILD.bazel @@ -1,15 +1,5 @@ load("@io_bazel_rules_docker//container:bundle.bzl", "container_bundle") -container_bundle( - name = "bundle", - images = { - # TODO: Move this image to quay.io - # https://github.com/jetstack/cert-manager/issues/3531 - "ghcr.io/wallrj/sample-external-issuer/controller:v0.0.0-30-gf333b9e": "@io_ghcr_wallrj_sample-external-issuer_controller//image", - }, - tags = ["manual"], -) - filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/devel/addon/sample-external-issuer/install.sh b/devel/addon/sample-external-issuer/install.sh index 289af6428..a1988e278 100755 --- a/devel/addon/sample-external-issuer/install.sh +++ b/devel/addon/sample-external-issuer/install.sh @@ -21,26 +21,11 @@ set -o nounset set -o errexit set -o pipefail +SEI_VERSION="v0.1.0" + SCRIPT_ROOT=$(dirname "${BASH_SOURCE}") source "${SCRIPT_ROOT}/../../lib/lib.sh" -SCRIPT_ROOT=$(dirname "${BASH_SOURCE}") -setup_tools +check_tool kubectl -repo_dir="$(mktemp -d)" - -function cleanup { - rm -rf "${repo_dir}" -} - -trap cleanup EXIT - -git clone https://github.com/cert-manager/sample-external-issuer "${repo_dir}" - -# TODO: Move this image to quay.io -# https://github.com/jetstack/cert-manager/issues/3531 -img="ghcr.io/wallrj/sample-external-issuer/controller:v0.0.0-30-gf333b9e" - -require_image "${img}" "//devel/addon/sample-external-issuer:bundle" - -make -C "${repo_dir}" "IMG=${img}" deploy +kubectl apply -f "https://github.com/cert-manager/sample-external-issuer/releases/download/${SEI_VERSION}/install.yaml"