From 6e902d34855e223a1d1d213155c157261708f9db Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Wed, 27 Apr 2022 10:01:34 +0200 Subject: [PATCH 1/5] Add and move basleine production to new basline_enviroment with keycloak. --- .../03_baseline/baseline-demo/deployment.yaml | 226 ++++++++++++++++++ .../baseline/deployment.yaml | 54 ++++- .../03_baseline/keycloak/deployment.yaml | 90 +++++++ 3 files changed, 359 insertions(+), 11 deletions(-) create mode 100644 02_hetzner/03_baseline/baseline-demo/deployment.yaml rename 02_hetzner/{01_prod => 03_baseline}/baseline/deployment.yaml (80%) create mode 100644 02_hetzner/03_baseline/keycloak/deployment.yaml diff --git a/02_hetzner/03_baseline/baseline-demo/deployment.yaml b/02_hetzner/03_baseline/baseline-demo/deployment.yaml new file mode 100644 index 0000000..9fa3d62 --- /dev/null +++ b/02_hetzner/03_baseline/baseline-demo/deployment.yaml @@ -0,0 +1,226 @@ +# Deployment description +apiVersion: apps/v1 +kind: Deployment +metadata: + name: baseline-deployment + namespace: baseline-environment + labels: + app: baseline-demo +spec: + strategy: + type: Recreate + replicas: 1 + selector: + matchLabels: + app: baseline-demo + template: + metadata: + labels: + app: baseline-demo + spec: + containers: + - name: baseline-frontend + image: packages.semapp.lan:5000/baseline_frontend:qa1 + workingDir: /srv/web + resources: + requests: + memory: "256Mi" + cpu: "100m" + limits: + memory: "512Mi" + cpu: "4" + ports: + - containerPort: 8000 + name: baseline-http + protocol: TCP + volumeMounts: + - mountPath: /etc/nginx/conf.d + readOnly: true + name: baseline-demo-frontend-conf + env: + - name: KEYCLOAK_REALM + value: "baseline_demo" + - name: KEYCLOAK_CLIENT + value: "baseline_demo" + - name: KEYCLOAK_TOKEN_VALIDITY + value: "600" + - name: KEYCLOAK_URL + value: "http://keycloak.semprod.local/auth/" + imagePullPolicy: Always + + - name: baseline-backend + image: packages.semapp.lan:5000/baseline_backend:qa1 + workingDir: /opt/www + resources: + requests: + memory: "256Mi" + cpu: "100m" + limits: + memory: "512Mi" + cpu: "4" + ports: + - containerPort: 5000 + name: bl-bck-http + protocol: TCP + imagePullPolicy: Always + envFrom: + - configMapRef: + name: baseline-demo-backend-conf + volumes: + - name: baseline-demo-frontend-conf + configMap: + name: baseline-demo-frontend-conf + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + namespace: baseline-environment + name: baseline-demo-backend-conf + labels: + app: baseline-demo +data: + DB_CONNECTION: "pgsql" + DB_HOST: "psql.semprod.local" + DB_PORT: "5432" + DB_DATABASE: "baseline_demo" + DB_USERNAME: "baseline_demo" + DB_PASSWORD: "yZLi2WZ037l9Xcgg" + + APP_NAME: "Baseline" + APP_ENV: "production" + APP_KEY: "base64:14Vg4rilGKEk34XeqNR7ffg6GhFTzA7/z5T1aqy6JHw=" + + APP_DEBUG: "true" + APP_URL: "https://demo-baseline.semapp.de/" + + LOG_CHANNEL: "stack" + BROADCAST_DRIVER: "log" + CACHE_DRIVER: "file" + QUEUE_CONNECTION: "sync" + SESSION_DRIVER: "cookie" + SESSION_LIFETIME: "120" + + + SANCTUM_STATEFUL_DOMAINS: "demo-baseline.semapp.de" + SESSION_DOMAIN: "demo-baseline.semapp.de" + + THROTTLE_MAX_ATTEMPTS: "80" + + KEYCLOAK_URL: "http://keycloak.semprod.local" + KEYCLOAK_PORT: "80" + KEYCLOAK_REALM: "baseline_demo" + + REDIRECT_URL: "https://demo-baseline.semapp.de/" + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + namespace: baseline-environment + name: baseline-demo-frontend-conf +data: + default.conf: | + upstream backend { + server baseline-backend-demo:5000; + } + + server { + listen 8000; + + access_log /var/log/nginx/access.log; + charset utf-8; + client_max_body_size 1G; + + location / { + root /srv/web; + add_header X-Frame-Options "SAMEORIGIN"; + index index.html index.htm; + try_files $uri $uri /index.html =404; + } + + location ~ ^/api { + proxy_pass http://backend; + proxy_redirect off; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + proxy_read_timeout 300s; + proxy_send_timeout 300s; + send_timeout 300s; + } + + error_page 404 =200 /index.html; + + add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0'; + + expires off; + open_file_cache off; + sendfile off; + } + +--- +# EFC Service +apiVersion: v1 +kind: Service +metadata: + name: baseline-frontend-demo + namespace: basline-environment +spec: + selector: + app: baseline-demo + ports: + - name: baseline-http + port: 8000 + targetPort: baseline-http + type: NodePort + +--- +# EFC backend +apiVersion: v1 +kind: Service +metadata: + name: baseline-backend-demo + namespace: baseline-environment +spec: + selector: + app: baseline-demo + ports: + - name: bl-bck-http + port: 5000 + targetPort: bl-bck-http + type: NodePort +--- + +# Ingress description +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: baseline-demo-ingress + namespace: baseline-environment + annotations: + kubernetes.io/ingress.class: "traefik" +spec: + rules: + - host: baseline-demo.k8s.semprod.local + http: + paths: + - backend: + service: + name: baseline-frontend-demo + port: + number: 8000 + path: / + pathType: ImplementationSpecific + - host: demo-baseline.semapp.de + http: + paths: + - backend: + service: + name: baseline-frontend-demo + port: + number: 8000 + path: / + pathType: ImplementationSpecific \ No newline at end of file diff --git a/02_hetzner/01_prod/baseline/deployment.yaml b/02_hetzner/03_baseline/baseline/deployment.yaml similarity index 80% rename from 02_hetzner/01_prod/baseline/deployment.yaml rename to 02_hetzner/03_baseline/baseline/deployment.yaml index 64a3205..6a6df70 100644 --- a/02_hetzner/01_prod/baseline/deployment.yaml +++ b/02_hetzner/03_baseline/baseline/deployment.yaml @@ -3,7 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: baseline-deployment - namespace: prod-environment + namespace: baseline-environment labels: app: baseline-prod spec: @@ -75,7 +75,7 @@ spec: apiVersion: v1 kind: ConfigMap metadata: - namespace: prod-environment + namespace: baseline-environment name: baseline-prod-backend-conf labels: app: baseline-prod @@ -91,7 +91,7 @@ data: APP_ENV: "production" APP_KEY: "base64:14Vg4rilGKEk34XeqNR7ffg6GhFTzA7/z5T1aqy6JHw=" APP_DEBUG: "true" - APP_URL: "http://baseline.k8s.semprod.local/" + APP_URL: "https://baseline.semapp.de/" LOG_CHANNEL: "stack" BROADCAST_DRIVER: "log" @@ -101,8 +101,8 @@ data: SESSION_LIFETIME: "120" - SANCTUM_STATEFUL_DOMAINS: "baseline.k8s.semprod.local" - SESSION_DOMAIN: "baseline.k8s.semprod.local" + SANCTUM_STATEFUL_DOMAINS: "baseline.semapp.de" + SESSION_DOMAIN: "baseline.semapp.de" THROTTLE_MAX_ATTEMPTS: "80" @@ -110,13 +110,13 @@ data: KEYCLOAK_PORT: "80" KEYCLOAK_REALM: "baseline_production" - REDIRECT_URL: "http://baseline.k8s.semprod.local/" + REDIRECT_URL: "https://baseline.semapp.de/" --- apiVersion: v1 kind: ConfigMap metadata: - namespace: prod-environment + namespace: baseline-environment name: baseline-prod-frontend-conf data: default.conf: | @@ -166,7 +166,7 @@ apiVersion: v1 kind: Service metadata: name: baseline-frontend-prod - namespace: prod-environment + namespace: baseline-environment spec: selector: app: baseline-prod @@ -182,7 +182,7 @@ apiVersion: v1 kind: Service metadata: name: baseline-backend-prod - namespace: prod-environment + namespace: baseline-environment spec: selector: app: baseline-prod @@ -198,7 +198,7 @@ apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: baseline-prod-ingress - namespace: prod-environment + namespace: baseline-environment annotations: kubernetes.io/ingress.class: "traefik" spec: @@ -209,4 +209,36 @@ spec: - path: / backend: serviceName: baseline-frontend-prod - servicePort: 8000 \ No newline at end of file + servicePort: 8000 + + +# Ingress description +apiVersion: networking.k8s.io/v1 +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: + - backend: + service: + name: baseline-frontend-prod + port: + number: 8000 + path: / + pathType: ImplementationSpecific + - host: baseline.semapp.de + http: + paths: + - backend: + service: + name: baseline-frontend-prod + port: + number: 8000 + path: / + pathType: ImplementationSpecific \ No newline at end of file diff --git a/02_hetzner/03_baseline/keycloak/deployment.yaml b/02_hetzner/03_baseline/keycloak/deployment.yaml new file mode 100644 index 0000000..d719c66 --- /dev/null +++ b/02_hetzner/03_baseline/keycloak/deployment.yaml @@ -0,0 +1,90 @@ +--- + apiVersion: "apps/v1" + kind: "Deployment" + metadata: + name: "keycloak" + namespace: "baseline-environment" + spec: + selector: + matchLabels: + app: "keycloak" + replicas: 1 + template: + metadata: + labels: + app: "keycloak" + spec: + containers: + - name: "keycloak-prod" + image: "jboss/keycloak" + resources: + requests: + memory: "512Mi" + cpu: "100m" + limits: + memory: "1Gi" + cpu: "4" + imagePullPolicy: "Always" + env: + - name: "KEYCLOAK_USER" + value: "admin" + - name: "KEYCLOAK_PASSWORD" + value: "admin" + - name: DB_VENDOR + value: postgres + - name: DB_ADDR + value: psql.semprod.local + - name: DB_DATABASE + value: keycloak_db + - name: DB_USER + value: keycloak + - name: DB_PASSWORD + value: e7ov7xx45qr1erk9 + ports: + - name: keycloak-http + containerPort: 8080 +--- +apiVersion: v1 +kind: Service +metadata: + name: keycloak-srv + namespace: baseline-environment +spec: + selector: + app: keycloak + ports: + - name: keycloak-http + port: 8080 + targetPort: keycloak-http + type: NodePort + +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: keycloak-ingress + namespace: baseline-environment + annotations: + kubernetes.io/ingress.class: "traefik" +spec: + rules: + - host: keycloak.k8s.semprod.local + http: + paths: + - backend: + service: + name: keycloak-srv + port: + number: 8080 + path: / + pathType: ImplementationSpecific + - host: keycloak.semprod.local + http: + paths: + - backend: + service: + name: keycloak-srv + port: + number: 8080 + path: / + pathType: ImplementationSpecific \ No newline at end of file From 44c033c044b2849c0e9f9d01c54486074fec9432 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Fri, 29 Apr 2022 15:42:55 +0200 Subject: [PATCH 2/5] Refactor keycloak deployment. --- 02_hetzner/03_baseline/keycloak/deployment.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/02_hetzner/03_baseline/keycloak/deployment.yaml b/02_hetzner/03_baseline/keycloak/deployment.yaml index d719c66..24867a8 100644 --- a/02_hetzner/03_baseline/keycloak/deployment.yaml +++ b/02_hetzner/03_baseline/keycloak/deployment.yaml @@ -29,7 +29,7 @@ - name: "KEYCLOAK_USER" value: "admin" - name: "KEYCLOAK_PASSWORD" - value: "admin" + value: "yEu2hr7j8WjYW2wXp3UQq6qN" - name: DB_VENDOR value: postgres - name: DB_ADDR @@ -40,6 +40,8 @@ value: keycloak - name: DB_PASSWORD value: e7ov7xx45qr1erk9 + - name: KEYCLOAK_FRONTEND_URL + value: https://kc.semapp.de/auth/ ports: - name: keycloak-http containerPort: 8080 @@ -47,7 +49,7 @@ apiVersion: v1 kind: Service metadata: - name: keycloak-srv + name: kc-srv namespace: baseline-environment spec: selector: @@ -68,22 +70,22 @@ metadata: kubernetes.io/ingress.class: "traefik" spec: rules: - - host: keycloak.k8s.semprod.local + - host: kc.k8s.semprod.local http: paths: - backend: service: - name: keycloak-srv + name: kc-srv port: number: 8080 path: / pathType: ImplementationSpecific - - host: keycloak.semprod.local + - host: kc.semapp.de http: paths: - backend: service: - name: keycloak-srv + name: kc-srv port: number: 8080 path: / From e4dae88a87122706d5deedac26b9c4ef8e0dc76b Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Mon, 2 May 2022 13:42:08 +0200 Subject: [PATCH 3/5] Add new deployment names. --- 02_hetzner/03_baseline/baseline-demo/deployment.yaml | 2 +- 02_hetzner/03_baseline/baseline/deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/02_hetzner/03_baseline/baseline-demo/deployment.yaml b/02_hetzner/03_baseline/baseline-demo/deployment.yaml index 9fa3d62..2a6007c 100644 --- a/02_hetzner/03_baseline/baseline-demo/deployment.yaml +++ b/02_hetzner/03_baseline/baseline-demo/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: baseline-deployment + name: baseline-demo-deployment namespace: baseline-environment labels: app: baseline-demo diff --git a/02_hetzner/03_baseline/baseline/deployment.yaml b/02_hetzner/03_baseline/baseline/deployment.yaml index 6a6df70..4b1d13d 100644 --- a/02_hetzner/03_baseline/baseline/deployment.yaml +++ b/02_hetzner/03_baseline/baseline/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: baseline-deployment + name: baseline-prod-deployment namespace: baseline-environment labels: app: baseline-prod From 41942bd288f8021b2b1e2f5c281c2fa234b91e32 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Mon, 9 May 2022 11:16:52 +0200 Subject: [PATCH 4/5] 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" From dbb9500d67a17cedfccaea52e3b080a3be572eca Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Thu, 12 May 2022 03:12:14 +0200 Subject: [PATCH 5/5] 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