From a5c7ac64aaa66493655dd0cd4683760e9703206f Mon Sep 17 00:00:00 2001 From: h2testname/h2 <148738644+stazottest0@users.noreply.github.com> Date: Tue, 19 Nov 2024 17:28:19 +0530 Subject: [PATCH 1/3] Update Makefile --- k8s/django/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/k8s/django/Makefile b/k8s/django/Makefile index 6c89c16b3e..da919ef090 100644 --- 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 UWSGI_EXPORTER_TRACK ?= 1.1 -NGINX_TRACK ?= 1.25 +NGINX_TRACK ?= 1.26 EXPORTER_TAG ?= 0.11 -METRICS_EXPORTER_TAG ?= v0.5.1 +METRICS_EXPORTER_TAG ?= v0.11.1-gke.1 NFS_TRACK ?= 1.3 POSTGRESQL_TRACK ?= latest POSTGRESQL_EXPORTER_TRACK ?= 0.13 @@ -20,11 +20,11 @@ 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_POSTGRESQL ?= $(SOURCE_REGISTRY)/postgresql13:$(POSTGRESQL_TRACK) +IMAGE_POSTGRESQL ?= $(SOURCE_REGISTRY)/postgresql16:$(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_PROMETHEUS_TO_SD ?= k8s.gcr.io/prometheus-to-sd:$(METRICS_EXPORTER_TAG) +IMAGE_DEBIAN ?= $(SOURCE_REGISTRY)/debian12:latest +IMAGE_PROMETHEUS_TO_SD ?= gke.gcr.io/prometheus-to-sd:$(METRICS_EXPORTER_TAG) # Main image From f2d010931bf4c6a8ca5edfdab200c0df1372e24e Mon Sep 17 00:00:00 2001 From: h2testname/h2 <148738644+stazottest0@users.noreply.github.com> Date: Tue, 19 Nov 2024 17:29:09 +0530 Subject: [PATCH 2/3] Update django-statefulset.yaml --- k8s/django/chart/django/templates/django-statefulset.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/k8s/django/chart/django/templates/django-statefulset.yaml b/k8s/django/chart/django/templates/django-statefulset.yaml index cbb7cc64ed..891fd2c33e 100644 --- a/k8s/django/chart/django/templates/django-statefulset.yaml +++ b/k8s/django/chart/django/templates/django-statefulset.yaml @@ -49,6 +49,8 @@ spec: value: "8080" - name: C2D_DJANGO_ALLOWED_HOSTS value: "'.localhost', '127.0.0.1', '[::1]', '{{ .Release.Name }}-django-svc', '{{ .Release.Name }}-nginx-svc'" + - name: C2D_DJANGO_MODE + value: "http" - name: C2D_DJANGO_DB_TYPE value: "postgresql" - name: C2D_DJANGO_DB_NAME From ca1720089ce80c003d61cde0518ad30b12a21491 Mon Sep 17 00:00:00 2001 From: h2testname/h2 <148738644+stazottest0@users.noreply.github.com> Date: Tue, 19 Nov 2024 17:29:33 +0530 Subject: [PATCH 3/3] Update Dockerfile --- k8s/django/deployer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/django/deployer/Dockerfile b/k8s/django/deployer/Dockerfile index 4538267157..3c07b8650f 100644 --- a/k8s/django/deployer/Dockerfile +++ b/k8s/django/deployer/Dockerfile @@ -1,6 +1,6 @@ ARG MARKETPLACE_TOOLS_TAG -FROM marketplace.gcr.io/google/c2d-debian11 AS build +FROM marketplace.gcr.io/google/debian12 AS build ARG CHART_NAME