Merge branch 'master' into miani-k8s-airflow-20250110

.github/CODEOWNERS

@@ -4,8 +4,3 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence.
 *                   @GoogleCloudPlatform/ccm-saap-team
-
-
-/docker/ @GoogleCloudPlatform/c2d-contributors
-/k8s/**/Makefile @GoogleCloudPlatform/c2d-contributors
-/vm/chef/cookbooks/**/attributes/default.rb @GoogleCloudPlatform/c2d-contributors

k8s/django/Makefile

@@ -6,11 +6,11 @@ include ../images.Makefile
 CHART_NAME := django
 APP_ID ?= $(CHART_NAME)
 
-TRACK ?= 5.0
+TRACK ?= 5.1
 SERVICE_NAME := services/b0af85ce-23df-43aa-9f54-b6e81eeb27d1.cloudpartnerservices.goog
 UWSGI_EXPORTER_TRACK ?= 1.1
 NGINX_TRACK ?= 1.25
-EXPORTER_TAG ?= 0.11
+EXPORTER_TAG ?= 1.3
 METRICS_EXPORTER_TAG ?= v0.5.1
 NFS_TRACK ?= 1.3
 POSTGRESQL_TRACK ?= latest
@@ -20,11 +20,11 @@ SOURCE_REGISTRY ?= marketplace.gcr.io/google
 IMAGE_DJANGO ?= $(SOURCE_REGISTRY)/django5:$(TRACK)
 IMAGE_UWSGI_EXPORTER ?= $(SOURCE_REGISTRY)/uwsgi-exporter1:$(UWSGI_EXPORTER_TRACK)
 IMAGE_NGINX ?= $(SOURCE_REGISTRY)/nginx1:$(NGINX_TRACK)
-IMAGE_NGINX_EXPORTER = $(SOURCE_REGISTRY)/nginx-exporter0:$(EXPORTER_TAG)
+IMAGE_NGINX_EXPORTER = $(SOURCE_REGISTRY)/nginx-exporter1:$(EXPORTER_TAG)
 IMAGE_POSTGRESQL ?= $(SOURCE_REGISTRY)/postgresql13:$(POSTGRESQL_TRACK)
 IMAGE_POSTGRESQL_EXPORTER = $(SOURCE_REGISTRY)/postgresql-exporter0:$(POSTGRESQL_EXPORTER_TRACK)
 IMAGE_NFS ?= $(SOURCE_REGISTRY)/nfs-server1:$(NFS_TRACK)
-IMAGE_DEBIAN ?= $(SOURCE_REGISTRY)/c2d-debian11:latest
+IMAGE_DEBIAN ?= $(SOURCE_REGISTRY)/debian12:latest
 IMAGE_PROMETHEUS_TO_SD ?= k8s.gcr.io/prometheus-to-sd:$(METRICS_EXPORTER_TAG)
 
 

k8s/django/chart/django/templates/django-statefulset.yaml

@@ -38,6 +38,36 @@ spec:
               key: db-password
         - name: PGHOST
           value: "{{ .Release.Name }}-postgresql-svc"
+      - name: ensure-django
+        image: "{{ .Values.django.image.repo }}:{{ .Values.django.image.tag }}"
+        command:
+          - /bin/bash
+          - -c
+          - |
+            echo "Checking if django-admin is set up..."
+
+            # Prevent errors
+            set +e
+            admin_path="$(which django-admin)"
+            set -e
+
+            if [[ -z "${admin_path}" ]]; then
+              echo "- django-admin not set up. Installing it..."
+              python3 -m venv /sites/venv
+              pip install "Django==${C2D_RELEASE}" \
+                mysqlclient \
+                psycopg2 \
+                uwsgi
+            else
+              echo "- django-admin is present at ${admin_path}."
+            fi
+            echo "django-admin version:"
+            django-admin --version
+        volumeMounts:
+        - name: django-data
+          mountPath: /sites
+        securityContext:
+          runAsUser: 0
       containers:
       - image: "{{ .Values.django.image.repo }}:{{ .Values.django.image.tag }}"
         name: django

k8s/falco/Makefile

@@ -9,7 +9,7 @@ APP_ID ?= $(CHART_NAME)
 TRACK ?= 0.36
 SERVICE_NAME := services/76e37ab7-1ffc-47ce-9e31-0b3791bb75b0.cloudpartnerservices.goog
 
-EXPORTER_TAG ?= 0.7
+EXPORTER_TAG ?= 0.8
 METRICS_EXPORTER_TAG ?= v0.11.1-gke.1
 
 VERIFY_WAIT_TIMEOUT = 1800

k8s/jaeger-operator/Makefile

@@ -10,7 +10,7 @@ APP_ID ?= $(CHART_NAME)
 
 SOURCE_REGISTRY ?= marketplace.gcr.io/google
 
-TRACK ?= 1.45
+TRACK ?= 1.53
 SERVICE_NAME := services/434ff7ab-fb9b-46c5-b76c-1d6088d5dc8b.cloudpartnerservices.goog
 
 IMAGE_MAIN ?= $(SOURCE_REGISTRY)/jaeger-operator1:$(TRACK)

k8s/jaeger-operator/apptest/tester/tests/basic-suite.yaml

@@ -61,16 +61,6 @@ actions:
     expect:
       exitCode:
         equals: 0
-- name: Trying to find previous request from Jaeger query service
-  bashTest:
-    script: |
-      sleep 10; \
-      curl --retry 3 --retry-connrefused --retry-max-time 60 \
-        "example-query.${NAMESPACE}.svc.cluster.local:16686/api/traces?service=jaeger-query&tags=%7B%22http.url%22%3A%22%2Fapi%2Fservices%3Ffoo%3Dbar%22%7D" \
-        | jq .data[0] | grep "api/services?foo=bar"
-    expect:
-      exitCode:
-        equals: 0
 - name: Delete test Jaeger
   bashTest:
     script: |

k8s/jenkins/Makefile

@@ -7,7 +7,8 @@ CHART_NAME := jenkins
 APP_ID ?= $(CHART_NAME)
 VERIFY_WAIT_TIMEOUT = 1800
 
-TRACK ?= 2
+TRACK ?= 2.494
+SERVICE_NAME := services/db9fe615-e7a9-4387-abe6-4126d6cec552.cloudpartnerservices.goog
 METRICS_EXPORTER_TAG ?= v0.5.1
 
 SOURCE_REGISTRY ?= marketplace.gcr.io/google

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