From a253e3fb7d327a5cb1b029d4cc40211fdf21f1a1 Mon Sep 17 00:00:00 2001 From: Saladgg Date: Thu, 8 Feb 2024 08:59:25 +0300 Subject: [PATCH] chore: update variables consumed in the app (#77) --- cloudbuild.yaml | 14 +++++++------- deploy/templates/03_django/01_confimap_job.yml | 1 - tox.ini | 1 - 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index b2936da..2802e3f 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -1,5 +1,5 @@ steps: - # Build the container image + # Build the container image. - id: "build image" name: "gcr.io/cloud-builders/docker" args: @@ -10,7 +10,7 @@ steps: ".", ] - # Push the container image to Container Registry + # Push the container image to Container Registry. - id: "push image" name: "gcr.io/cloud-builders/docker" args: @@ -19,7 +19,7 @@ steps: "${_IMAGE_NAME}:$COMMIT_SHA" ] - # Apply the latest migrations + # Apply the latest migrations. - id: "apply migrations" name: "gcr.io/google-appengine/exec-wrapper" args: @@ -71,7 +71,7 @@ steps: "--", "python", "/app/manage.py", "compress" ] - # Get credentials for the cluster + # Get credentials for the cluster. - id: "get credentials for the cluster" name: "gcr.io/cloud-builders/kubectl" env: @@ -113,11 +113,11 @@ steps: - --set - secret_manager.file_name=${_SETTINGS_NAME} - --set - - django.env.django_settings_module=${_K8TS_DJANGO_SETTINGS_MODULE} + - django.env.django_settings_module=${_DJANGO_SETTINGS_MODULE} - --set - - django.env.postgres_host=${_K8TS_PG_HOST} + - django.env.postgres_host=${_PG_BOUNCER_HOST} - --set - - django.env.postgres_port=${_K8TS_PG_PORT} + - django.env.postgres_port=${_PG_BOUNCER_PORT} - --set - ingress.networking.domain=${_DOMAIN_NAME} - --set diff --git a/deploy/templates/03_django/01_confimap_job.yml b/deploy/templates/03_django/01_confimap_job.yml index ccd2b08..197e41b 100644 --- a/deploy/templates/03_django/01_confimap_job.yml +++ b/deploy/templates/03_django/01_confimap_job.yml @@ -86,7 +86,6 @@ spec: --from-literal=POSTGRES_PORT="${K8TS_POSTGRES_PORT}" \ --from-literal=POSTGRES_PASSWORD="$POSTGRES_PASSWORD" \ --from-literal=POSTGRES_USER="$POSTGRES_USER" \ - --from-literal=PUB_SUB_TOPIC="$PUB_SUB_TOPIC" \ --from-literal=SENTRY_DSN="$SENTRY_DSN" \ --from-literal=SENTRY_ENVIRONMENT="$SENTRY_ENVIRONMENT" \ --from-literal=USE_DOCKER="$USE_DOCKER" \ diff --git a/tox.ini b/tox.ini index 0fea5e7..acc629a 100644 --- a/tox.ini +++ b/tox.ini @@ -34,7 +34,6 @@ passenv = POSTGRES_PASSWORD POSTGRES_PORT POSTGRES_USER - PUB_SUB_TOPIC TEST_POSTGRES_DB TEST_POSTGRES_HOST TEST_POSTGRES_PASSWORD