From be7a4ffa0b8436c33443f4f12d872fb238f3ec82 Mon Sep 17 00:00:00 2001 From: Armando Miani Date: Sat, 11 Jan 2025 11:59:15 +0100 Subject: [PATCH] K8s - Cert-Manager - Add annotations (#2839) * K8s - Cert-Manager - Add annotations * fix: replace netcat * fix: kubectl download --- k8s/cert-manager/Makefile | 1 + k8s/cert-manager/apptest/tester/Dockerfile | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/k8s/cert-manager/Makefile b/k8s/cert-manager/Makefile index 1edd13c217..f36ebc8e99 100644 --- a/k8s/cert-manager/Makefile +++ b/k8s/cert-manager/Makefile @@ -11,6 +11,7 @@ APP_ID ?= $(CHART_NAME) SOURCE_REGISTRY ?= marketplace.gcr.io/google TRACK ?= 1.15 +SERVICE_NAME := services/a87fa03a-4d8e-473d-afe8-02efc04aa9f2.cloudpartnerservices.goog METRICS_EXPORTER_TAG ?= v0.5.1 IMAGE_MAIN ?= $(SOURCE_REGISTRY)/cert-manager1:$(TRACK) diff --git a/k8s/cert-manager/apptest/tester/Dockerfile b/k8s/cert-manager/apptest/tester/Dockerfile index af44680195..d977348e24 100644 --- a/k8s/cert-manager/apptest/tester/Dockerfile +++ b/k8s/cert-manager/apptest/tester/Dockerfile @@ -1,12 +1,13 @@ -FROM gcr.io/cloud-marketplace-tools/testrunner:0.1.5 +FROM gcr.io/cloud-marketplace-tools/testrunner:0.1.8 RUN apt-get update && apt-get install -y --no-install-recommends \ - curl wget dnsutils netcat jq \ + curl dnsutils netcat-traditional jq \ && rm -rf /var/lib/apt/lists/* RUN mkdir -p /opt/kubectl/1.21 \ - && wget -q -O /opt/kubectl/1.21/kubectl \ + && curl -L -k -o kubectl \ https://storage.googleapis.com/kubernetes-release/release/v1.21.6/bin/linux/amd64/kubectl \ + && mv kubectl /opt/kubectl/1.21/kubectl \ && chmod 755 /opt/kubectl/1.21/kubectl \ && ln -s /opt/kubectl/1.21/kubectl /usr/bin/kubectl