From fc7ce1ef3556a1df3c7e602aa3856e121817c380 Mon Sep 17 00:00:00 2001 From: Armando Miani Date: Mon, 13 Jan 2025 13:54:02 +0100 Subject: [PATCH 1/3] K8s - Gitlab - Add annotations --- k8s/gitlab/Makefile | 1 + k8s/gitlab/apptest/tester/Dockerfile | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/k8s/gitlab/Makefile b/k8s/gitlab/Makefile index a68185bfa0..c7270e0572 100644 --- a/k8s/gitlab/Makefile +++ b/k8s/gitlab/Makefile @@ -9,6 +9,7 @@ APP_ID ?= $(CHART_NAME) VERIFY_WAIT_TIMEOUT = 1800 TRACK ?= 17.5 +SERVICE_NAME := services/9f0fe022-a66a-4133-8099-f0ca7c61a2db.cloudpartnerservices.goog POSTGRESQL_TAG ?= latest POSTGRESQL_EXPORTER_TAG ?= latest REDIS_TAG ?= 7.2 diff --git a/k8s/gitlab/apptest/tester/Dockerfile b/k8s/gitlab/apptest/tester/Dockerfile index ebcc57b5f0..592900ac86 100644 --- a/k8s/gitlab/apptest/tester/Dockerfile +++ b/k8s/gitlab/apptest/tester/Dockerfile @@ -1,13 +1,12 @@ -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 \ postgresql-client \ - wget \ curl \ redis-server \ && rm -rf /var/lib/apt/lists/* -RUN wget -q -O /bin/kubectl \ +RUN curl -L -o /bin/kubectl \ https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/amd64/kubectl \ && chmod 755 /bin/kubectl From 3f547781ab013f2f53d043bd19b497d715b1ad83 Mon Sep 17 00:00:00 2001 From: Armando Miani Date: Mon, 13 Jan 2025 14:01:41 +0100 Subject: [PATCH 2/3] K8s - Jenkins - Add annotations --- k8s/jenkins/Makefile | 1 + k8s/jenkins/apptest/tester/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/k8s/jenkins/Makefile b/k8s/jenkins/Makefile index cc432db2be..248fb381de 100644 --- a/k8s/jenkins/Makefile +++ b/k8s/jenkins/Makefile @@ -8,6 +8,7 @@ APP_ID ?= $(CHART_NAME) VERIFY_WAIT_TIMEOUT = 1800 TRACK ?= 2 +SERVICE_NAME := services/db9fe615-e7a9-4387-abe6-4126d6cec552.cloudpartnerservices.goog METRICS_EXPORTER_TAG ?= v0.5.1 SOURCE_REGISTRY ?= marketplace.gcr.io/google diff --git a/k8s/jenkins/apptest/tester/Dockerfile b/k8s/jenkins/apptest/tester/Dockerfile index 2fc6cb831f..4e6b76193e 100644 --- a/k8s/jenkins/apptest/tester/Dockerfile +++ b/k8s/jenkins/apptest/tester/Dockerfile @@ -1,4 +1,4 @@ -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 \ @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ wget \ && rm -rf /var/lib/apt/lists/* -RUN wget -q -O /bin/kubectl \ +RUN curl -L -o /bin/kubectl \ https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/amd64/kubectl \ && chmod 755 /bin/kubectl From 4f4c197c111690656164f7391b8453106050748f Mon Sep 17 00:00:00 2001 From: Armando Miani Date: Tue, 28 Jan 2025 13:14:29 +0100 Subject: [PATCH 3/3] fix: add ca-certificates --- k8s/gitlab/apptest/tester/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/k8s/gitlab/apptest/tester/Dockerfile b/k8s/gitlab/apptest/tester/Dockerfile index 592900ac86..09b2edaedb 100644 --- a/k8s/gitlab/apptest/tester/Dockerfile +++ b/k8s/gitlab/apptest/tester/Dockerfile @@ -2,6 +2,7 @@ FROM gcr.io/cloud-marketplace-tools/testrunner:0.1.8 RUN apt-get update && apt-get install -y --no-install-recommends \ postgresql-client \ + ca-certificates \ curl \ redis-server \ && rm -rf /var/lib/apt/lists/*