From 41942bd288f8021b2b1e2f5c281c2fa234b91e32 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Mon, 9 May 2022 11:16:52 +0200 Subject: [PATCH] Update tags and stuff. --- 02_hetzner/01_prod/semcust/deployment.yaml | 12 ++++++------ .../03_baseline/baseline-demo/deployment.yaml | 9 ++++++--- 02_hetzner/03_baseline/baseline/deployment.yaml | 14 ++++++++++---- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/02_hetzner/01_prod/semcust/deployment.yaml b/02_hetzner/01_prod/semcust/deployment.yaml index a8029fe..b69824f 100644 --- a/02_hetzner/01_prod/semcust/deployment.yaml +++ b/02_hetzner/01_prod/semcust/deployment.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: semcust-frontend - image: packages.semapp.lan:5000/semcust_frontend:1.2.2 + image: packages.semapp.lan:5000/semcust_frontend:1.3.0 resources: requests: memory: "256Mi" @@ -38,7 +38,7 @@ spec: name: nginx-conf imagePullPolicy: Always - name: semcust-backend - image: packages.semapp.lan:5000/semcust_backend:1.2.2 + image: packages.semapp.lan:5000/semcust_backend:1.3.0 resources: requests: memory: "256Mi" @@ -93,13 +93,13 @@ data: EMAIL_HOST_PASSWORD: "uN1zPIqN9@br" # BASELINE NEDDED VARIABLES (this will be need changed then keyclak will be on internet) - BASELINE_KEY: "AESNEwfqJVwaI4aLwyVl7kzTqdmWeQQq9hCpLRGahYI" - BASE_KEYCLOAK_URL: "http://keycloak.semprod.local" + BASELINE_KEY: "AESNEwfqJVwaI4aLwyVl7kzTqdmWeQQq9hCpLRGahYI=" + BASE_KEYCLOAK_URL: "https://kc.semapp.de/" BASELINE_KEYCLOAK_CLIENT_ID: "baseline_prod" - BASELINE_KEYCLOAK_REALM: "baseline_production" + BASELINE_KEYCLOAK_REALM: "baseline" KEYCLOAK_ADMIN_USERNAME: "admin" - KEYCLOAK_ADMIN_PASSWORD: "admin" + KEYCLOAK_ADMIN_PASSWORD: "yEu2hr7j8WjYW2wXp3UQq6qN" KEYCLOAK_ADMIN_CLIENT_ID: "admin-cli" --- diff --git a/02_hetzner/03_baseline/baseline-demo/deployment.yaml b/02_hetzner/03_baseline/baseline-demo/deployment.yaml index 2a6007c..39030f4 100644 --- a/02_hetzner/03_baseline/baseline-demo/deployment.yaml +++ b/02_hetzner/03_baseline/baseline-demo/deployment.yaml @@ -45,7 +45,7 @@ spec: - name: KEYCLOAK_TOKEN_VALIDITY value: "600" - name: KEYCLOAK_URL - value: "http://keycloak.semprod.local/auth/" + value: "https://kc.semapp.de/auth/" imagePullPolicy: Always - name: baseline-backend @@ -85,12 +85,15 @@ data: DB_PORT: "5432" DB_DATABASE: "baseline_demo" DB_USERNAME: "baseline_demo" - DB_PASSWORD: "yZLi2WZ037l9Xcgg" + DB_PASSWORD: "SZH8wYW4RTEtj6jg" APP_NAME: "Baseline" APP_ENV: "production" APP_KEY: "base64:14Vg4rilGKEk34XeqNR7ffg6GhFTzA7/z5T1aqy6JHw=" + APPLICATION_KEY: "0X6UivJQtB1rqMFtBGTTsDcRq2OpTHo1jb8z6tDj2EQ=" + SEMCUST_URL: "https://portal.semapp.de/" + APP_DEBUG: "true" APP_URL: "https://demo-baseline.semapp.de/" @@ -107,7 +110,7 @@ data: THROTTLE_MAX_ATTEMPTS: "80" - KEYCLOAK_URL: "http://keycloak.semprod.local" + KEYCLOAK_URL: "https://kc.semapp.de" KEYCLOAK_PORT: "80" KEYCLOAK_REALM: "baseline_demo" diff --git a/02_hetzner/03_baseline/baseline/deployment.yaml b/02_hetzner/03_baseline/baseline/deployment.yaml index 4b1d13d..c7288d3 100644 --- a/02_hetzner/03_baseline/baseline/deployment.yaml +++ b/02_hetzner/03_baseline/baseline/deployment.yaml @@ -20,7 +20,8 @@ spec: spec: containers: - name: baseline-frontend - image: packages.semapp.lan:5000/baseline_frontend:qa1 + image: packages.semapp.lan:5000/baseline_frontend:1.1.0-baseline + workingDir: /srv/web resources: requests: @@ -45,11 +46,12 @@ spec: - name: KEYCLOAK_TOKEN_VALIDITY value: "600" - name: KEYCLOAK_URL - value: "http://keycloak.semprod.local/auth/" + value: "https://kc.semapp.de/auth/" imagePullPolicy: Always - name: baseline-backend - image: packages.semapp.lan:5000/baseline_backend:qa1 + image: packages.semapp.lan:5000/baseline_backend:1.1.0-baseline + workingDir: /opt/www resources: requests: @@ -90,6 +92,10 @@ data: APP_NAME: "Baseline" APP_ENV: "production" APP_KEY: "base64:14Vg4rilGKEk34XeqNR7ffg6GhFTzA7/z5T1aqy6JHw=" + + APPLICATION_KEY: "0X6UivJQtB1rqMFtBGTTsDcRq2OpTHo1jb8z6tDj2EQ=" + SEMCUST_URL: "https://portal.semapp.de/" + APP_DEBUG: "true" APP_URL: "https://baseline.semapp.de/" @@ -106,7 +112,7 @@ data: THROTTLE_MAX_ATTEMPTS: "80" - KEYCLOAK_URL: "http://keycloak.semprod.local" + KEYCLOAK_URL: "https://kc.semapp.de" KEYCLOAK_PORT: "80" KEYCLOAK_REALM: "baseline_production"