From 58c2a2a4efb0ff1de5ac0706c4d9c9b8cab11b04 Mon Sep 17 00:00:00 2001 From: Armando Miani Date: Tue, 14 Jan 2025 23:26:30 +0100 Subject: [PATCH 1/2] K8s - Superset - Add annotations --- k8s/superset/Makefile | 1 + k8s/superset/apptest/tester/Dockerfile | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/k8s/superset/Makefile b/k8s/superset/Makefile index 359c2d35f5..4297aed83f 100644 --- a/k8s/superset/Makefile +++ b/k8s/superset/Makefile @@ -7,6 +7,7 @@ CHART_NAME := superset APP_ID ?= $(CHART_NAME) TRACK ?= 4.0 +SERVICE_NAME := services/e6580ff4-fda7-4750-b7a4-aeec14eecc6a.cloudpartnerservices.goog METRICS_EXPORTER_TAG ?= v0.11.1-gke.1 REDIS_EXPORTER_TAG ?= 1.63 diff --git a/k8s/superset/apptest/tester/Dockerfile b/k8s/superset/apptest/tester/Dockerfile index 22ee9cd9aa..194608e0cf 100644 --- a/k8s/superset/apptest/tester/Dockerfile +++ b/k8s/superset/apptest/tester/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2022 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,14 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -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 \ - redis-tools curl wget dnsutils netcat jq \ + redis-tools ca-certificates 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 -o /opt/kubectl/1.21/kubectl \ https://storage.googleapis.com/kubernetes-release/release/v1.21.6/bin/linux/amd64/kubectl \ && chmod 755 /opt/kubectl/1.21/kubectl \ && ln -s /opt/kubectl/1.21/kubectl /usr/bin/kubectl From 8d8dd9927a2916c152988bb8815f708f13c09949 Mon Sep 17 00:00:00 2001 From: Armando Miani Date: Mon, 20 Jan 2025 19:19:47 +0100 Subject: [PATCH 2/2] fix: add wget --- k8s/superset/apptest/tester/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/superset/apptest/tester/Dockerfile b/k8s/superset/apptest/tester/Dockerfile index 194608e0cf..5425e02013 100644 --- a/k8s/superset/apptest/tester/Dockerfile +++ b/k8s/superset/apptest/tester/Dockerfile @@ -15,7 +15,7 @@ FROM gcr.io/cloud-marketplace-tools/testrunner:0.1.8 RUN apt-get update && apt-get install -y --no-install-recommends \ - redis-tools ca-certificates curl dnsutils netcat-traditional jq \ + redis-tools ca-certificates curl wget dnsutils netcat-traditional jq \ && rm -rf /var/lib/apt/lists/* RUN mkdir -p /opt/kubectl/1.21 \