From f998b999f0b878a4caf490f2033d9ee0da4a99d2 Mon Sep 17 00:00:00 2001 From: Armando Miani Date: Mon, 13 Jan 2025 13:59:56 +0100 Subject: [PATCH 1/3] K8s - Jaeger Operator - Add annotations --- k8s/jaeger-operator/Makefile | 1 + k8s/jaeger-operator/apptest/tester/Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/k8s/jaeger-operator/Makefile b/k8s/jaeger-operator/Makefile index 534864ad9c..f5d39ec590 100644 --- a/k8s/jaeger-operator/Makefile +++ b/k8s/jaeger-operator/Makefile @@ -11,6 +11,7 @@ APP_ID ?= $(CHART_NAME) SOURCE_REGISTRY ?= marketplace.gcr.io/google TRACK ?= 1.45 +SERVICE_NAME := services/434ff7ab-fb9b-46c5-b76c-1d6088d5dc8b.cloudpartnerservices.goog IMAGE_MAIN ?= $(SOURCE_REGISTRY)/jaeger-operator1:$(TRACK) diff --git a/k8s/jaeger-operator/apptest/tester/Dockerfile b/k8s/jaeger-operator/apptest/tester/Dockerfile index 9db27415a1..5528b21a14 100644 --- a/k8s/jaeger-operator/apptest/tester/Dockerfile +++ b/k8s/jaeger-operator/apptest/tester/Dockerfile @@ -1,11 +1,11 @@ -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 jq \ && rm -rf /var/lib/apt/lists/* RUN mkdir -p /opt/kubectl/1.26 \ - && wget -q -O /opt/kubectl/1.26/kubectl \ + && curl -L -o /opt/kubectl/1.26/kubectl \ https://storage.googleapis.com/kubernetes-release/release/v1.26.1/bin/linux/amd64/kubectl \ && chmod 755 /opt/kubectl/1.26/kubectl \ && ln -s /opt/kubectl/1.26/kubectl /usr/bin/kubectl From e31fca40a8579b0179a40160ec4ed89ca7ff45b3 Mon Sep 17 00:00:00 2001 From: Armando Miani Date: Fri, 17 Jan 2025 15:16:30 +0100 Subject: [PATCH 2/3] fix: replace netcat --- k8s/jaeger-operator/apptest/tester/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/jaeger-operator/apptest/tester/Dockerfile b/k8s/jaeger-operator/apptest/tester/Dockerfile index 5528b21a14..1e0194f8da 100644 --- a/k8s/jaeger-operator/apptest/tester/Dockerfile +++ b/k8s/jaeger-operator/apptest/tester/Dockerfile @@ -1,7 +1,7 @@ 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/* RUN mkdir -p /opt/kubectl/1.26 \ From 1b6720a9c7bb500c0b902fdd89d8c5aa8eebc3f9 Mon Sep 17 00:00:00 2001 From: Armando Miani Date: Fri, 17 Jan 2025 15:29:41 +0100 Subject: [PATCH 3/3] fix: add ca-certificates --- k8s/jaeger-operator/apptest/tester/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/jaeger-operator/apptest/tester/Dockerfile b/k8s/jaeger-operator/apptest/tester/Dockerfile index 1e0194f8da..eaf1073b70 100644 --- a/k8s/jaeger-operator/apptest/tester/Dockerfile +++ b/k8s/jaeger-operator/apptest/tester/Dockerfile @@ -1,7 +1,7 @@ FROM gcr.io/cloud-marketplace-tools/testrunner:0.1.8 RUN apt-get update && apt-get install -y --no-install-recommends \ - curl dnsutils netcat-traditional jq \ + ca-certificates curl dnsutils netcat-traditional jq \ && rm -rf /var/lib/apt/lists/* RUN mkdir -p /opt/kubectl/1.26 \