Merge branch 'master' into miani-k8s-drupal-20250113

GoogleCloudPlatform · Jan 14, 2025 · 89ee38f · 89ee38f
2 parents 36faf83 + b76d1c6
commit 89ee38f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/k8s/django/Makefile b/k8s/django/Makefile
@@ -7,6 +7,7 @@ CHART_NAME := django
 APP_ID ?= $(CHART_NAME)
 
 TRACK ?= 5.0
+SERVICE_NAME := services/b0af85ce-23df-43aa-9f54-b6e81eeb27d1.cloudpartnerservices.goog
 UWSGI_EXPORTER_TRACK ?= 1.1
 NGINX_TRACK ?= 1.25
 EXPORTER_TAG ?= 0.11

diff --git a/k8s/django/apptest/tester/Dockerfile b/k8s/django/apptest/tester/Dockerfile
@@ -1,15 +1,14 @@
-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 \
     gettext \
     jq \
     uuid-runtime \
-    wget \
     curl \
     && 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