From b15857b88b26ee1d8d0eccf9e5e7c508abb95a48 Mon Sep 17 00:00:00 2001
From: Armando Miani <armadom@google.com>
Date: Mon, 20 Jan 2025 10:01:35 +0100
Subject: [PATCH 1/3] K8s - Kafka - Add annotations (#2852)

* K8s - Kafka - Add annotations

* fix: replace netcat

* fix: upgrade jre
---
 k8s/kafka/Makefile                  | 1 +
 k8s/kafka/apptest/tester/Dockerfile | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/k8s/kafka/Makefile b/k8s/kafka/Makefile
index 272a605f7a..02ca063b35 100644
--- a/k8s/kafka/Makefile
+++ b/k8s/kafka/Makefile
@@ -8,6 +8,7 @@ APP_ID ?= $(CHART_NAME)
 WAIT_FOR_READY_TIMEOUT := 600
 
 TRACK ?= 3.7
+SERVICE_NAME := services/de661158-ff88-479d-bcf3-206917bed7f6.cloudpartnerservices.goog
 KAFKA_EXPORTER_TAG ?= 1.8
 ZK_TAG ?= 3.8
 METRICS_EXPORTER_TAG ?= v0.11.1-gke.1
diff --git a/k8s/kafka/apptest/tester/Dockerfile b/k8s/kafka/apptest/tester/Dockerfile
index d47dab0e20..e52f860656 100644
--- a/k8s/kafka/apptest/tester/Dockerfile
+++ b/k8s/kafka/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
 
 ARG KUBECTL_VERSION=1.12.0
 ARG KAFKA_VERSION=2.8.0
@@ -13,11 +13,11 @@ RUN set -eu \
     uuid-runtime \
     wget \
     curl \
-    openjdk-11-jre \
-    netcat
+    openjdk-17-jre \
+    netcat-traditional
 
 RUN set -eu \
-    && wget -q -O /bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl \
+    && curl -L -o /bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl \
     && chmod 755 /bin/kubectl \
     && curl -sSL https://archive.apache.org/dist/kafka/${KAFKA_VERSION}/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz -o "/opt/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz" \
     && tar -xzf /opt/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz -C /opt \

From 6439d579a4840951036be987ae2863344fb5682c Mon Sep 17 00:00:00 2001
From: Armando Miani <armadom@google.com>
Date: Mon, 20 Jan 2025 19:22:36 +0100
Subject: [PATCH 2/3] K8s - Prometheus Operator - Add annotations (#2858)

* K8s - Prometheus Operator - Add annotations

* nit: typo
---
 k8s/prometheus-operator/Makefile                  | 1 +
 k8s/prometheus-operator/apptest/tester/Dockerfile | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/k8s/prometheus-operator/Makefile b/k8s/prometheus-operator/Makefile
index 337c329ddc..6abb8c0ea1 100644
--- a/k8s/prometheus-operator/Makefile
+++ b/k8s/prometheus-operator/Makefile
@@ -9,6 +9,7 @@ APP_ID ?= $(CHART_NAME)
 SOURCE_REGISTRY ?= marketplace.gcr.io/google
 
 TRACK ?= 0.77
+SERVICE_NAME := services/6eff155d-707c-4095-be15-020e9da70f54.cloudpartnerservices.goog
 
 IMAGE_MAIN ?= $(SOURCE_REGISTRY)/prometheus-operator0:$(TRACK)
 
diff --git a/k8s/prometheus-operator/apptest/tester/Dockerfile b/k8s/prometheus-operator/apptest/tester/Dockerfile
index a99be3e304..a154d609d3 100644
--- a/k8s/prometheus-operator/apptest/tester/Dockerfile
+++ b/k8s/prometheus-operator/apptest/tester/Dockerfile
@@ -1,7 +1,7 @@
-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 dnsutils netcat jq \
+    curl dnsutils netcat-traditional jq \
     && rm -rf /var/lib/apt/lists/*
 
 COPY tests/basic-suite.yaml /tests/basic-suite.yaml

From b96b1956d1efe62f3981d079e06be7945823e7fd Mon Sep 17 00:00:00 2001
From: Armando Miani <armadom@google.com>
Date: Mon, 20 Jan 2025 19:50:24 +0100
Subject: [PATCH 3/3] K8s - RabbitMQ - Add annotations (#2859)

* K8s - RabbitMQ - Add annotations

* fix: add wget
---
 k8s/rabbitmq/Makefile                  | 1 +
 k8s/rabbitmq/apptest/tester/Dockerfile | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/k8s/rabbitmq/Makefile b/k8s/rabbitmq/Makefile
index 978d154a1a..5cd3a21fd7 100644
--- a/k8s/rabbitmq/Makefile
+++ b/k8s/rabbitmq/Makefile
@@ -7,6 +7,7 @@ CHART_NAME := rabbitmq
 APP_ID ?= $(CHART_NAME)
 
 TRACK ?= 3.13
+SERVICE_NAME := services/95b23cea-d381-42ec-8459-27ede8f4fd5a.cloudpartnerservices.goog
 
 METRICS_EXPORTER_TAG ?= v0.9.0
 
diff --git a/k8s/rabbitmq/apptest/tester/Dockerfile b/k8s/rabbitmq/apptest/tester/Dockerfile
index 544579fae3..db4058db1c 100644
--- a/k8s/rabbitmq/apptest/tester/Dockerfile
+++ b/k8s/rabbitmq/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 \
     ca-certificates \
@@ -8,7 +8,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