From dbb9500d67a17cedfccaea52e3b080a3be572eca Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Thu, 12 May 2022 03:12:14 +0200 Subject: [PATCH] Upodate version baseline and semcust. --- 02_hetzner/01_prod/efc/deployment.yaml | 4 +-- .../01_prod/semapp-wagtail/deployment.yaml | 2 +- 02_hetzner/01_prod/semcust/deployment.yaml | 4 +-- .../03_baseline/baseline/deployment.yaml | 29 ++++--------------- 4 files changed, 10 insertions(+), 29 deletions(-) diff --git a/02_hetzner/01_prod/efc/deployment.yaml b/02_hetzner/01_prod/efc/deployment.yaml index 72398ad..75930b0 100644 --- a/02_hetzner/01_prod/efc/deployment.yaml +++ b/02_hetzner/01_prod/efc/deployment.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: efc-frontend - image: packages.semapp.lan:5000/efc-admin_frontend:prod + image: packages.semapp.lan:5000/efc-admin_frontend:1.0.8-rc1 resources: requests: memory: "256Mi" @@ -41,7 +41,7 @@ spec: - configMapRef: name: efc-prod-config - name: efc-backend - image: packages.semapp.lan:5000/efc-admin_backend:prod + image: packages.semapp.lan:5000/efc-admin_backend:1.0.8-rc1 resources: requests: memory: "256Mi" diff --git a/02_hetzner/01_prod/semapp-wagtail/deployment.yaml b/02_hetzner/01_prod/semapp-wagtail/deployment.yaml index 68f7116..d5878d8 100644 --- a/02_hetzner/01_prod/semapp-wagtail/deployment.yaml +++ b/02_hetzner/01_prod/semapp-wagtail/deployment.yaml @@ -41,7 +41,7 @@ spec: - configMapRef: name: semapp-prod-config volumeMounts: - - mountPath: /app/media/ + - mountPath: semapp_wagtail/media/. name: semapp-pv-prod volumes: - name: semapp-pv-prod diff --git a/02_hetzner/01_prod/semcust/deployment.yaml b/02_hetzner/01_prod/semcust/deployment.yaml index b69824f..01a5337 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.3.0 + image: packages.semapp.lan:5000/semcust_frontend:1.3.1 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.3.0 + image: packages.semapp.lan:5000/semcust_backend:1.3.1 resources: requests: memory: "256Mi" diff --git a/02_hetzner/03_baseline/baseline/deployment.yaml b/02_hetzner/03_baseline/baseline/deployment.yaml index c7288d3..1929603 100644 --- a/02_hetzner/03_baseline/baseline/deployment.yaml +++ b/02_hetzner/03_baseline/baseline/deployment.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: baseline-frontend - image: packages.semapp.lan:5000/baseline_frontend:1.1.0-baseline + image: packages.semapp.lan:5000/baseline_frontend:1.1.1-baseline workingDir: /srv/web resources: @@ -50,7 +50,7 @@ spec: imagePullPolicy: Always - name: baseline-backend - image: packages.semapp.lan:5000/baseline_backend:1.1.0-baseline + image: packages.semapp.lan:5000/baseline_backend:1.1.1-baseline workingDir: /opt/www resources: @@ -112,9 +112,9 @@ data: THROTTLE_MAX_ATTEMPTS: "80" - KEYCLOAK_URL: "https://kc.semapp.de" - KEYCLOAK_PORT: "80" - KEYCLOAK_REALM: "baseline_production" + KEYCLOAK_URL: "http://kc.k8s.semprod.local" + KEYCLOAK_PORT: "8080" + KEYCLOAK_REALM: "baseline" REDIRECT_URL: "https://baseline.semapp.de/" @@ -199,25 +199,6 @@ spec: type: NodePort --- -# Ingress description -apiVersion: networking.k8s.io/v1beta1 -kind: Ingress -metadata: - name: baseline-prod-ingress - namespace: baseline-environment - annotations: - kubernetes.io/ingress.class: "traefik" -spec: - rules: - - host: baseline.k8s.semprod.local - http: - paths: - - path: / - backend: - serviceName: baseline-frontend-prod - servicePort: 8000 - - # Ingress description apiVersion: networking.k8s.io/v1 kind: Ingress