K8s - Django - Bump to 5.1 and nginx-exporter to 1.3 (#2868)

* K8s - Gitlab - Add annotations * fix: add ca-certificates * K8s - Django - Bump to 5.1 and nginx-exporter to 1.3 * fix: ensure django-admin is set up
GoogleCloudPlatform · Jan 30, 2025 · dfd7423 · dfd7423
1 parent 14b4b37
commit dfd7423
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/k8s/django/Makefile b/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)
 
 

diff --git a/k8s/django/chart/django/templates/django-statefulset.yaml b/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