Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

K8s - Django - BUMP to track 5.1 #2784

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

K8s - Django - BUMP to track 5.1 #2784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
366d1e6
K8s - Django - BUMP to track 5.1
AdrianManiek Oct 30, 2024
612d5dc
Merge branch 'master' into manikowski-k8s-django-28102024
AdrianManiek Oct 30, 2024
fb2011e
Merge branch 'master' into manikowski-k8s-django-28102024
AdrianManiek Nov 7, 2024
80e4373
Merge branch 'master' into manikowski-k8s-django-28102024
AdrianManiek Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions k8s/django/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions k8s/django/chart/django/templates/django-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion k8s/django/deployer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Loading