From 3e4a38a8c9cdae16e5a2596eafb17ccd6775c6c9 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Fri, 13 May 2022 07:31:47 +0200 Subject: [PATCH 1/5] Add bioplus deployment production. --- 02_hetzner/01_prod/bioplus/deployment.yaml | 129 +++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 02_hetzner/01_prod/bioplus/deployment.yaml diff --git a/02_hetzner/01_prod/bioplus/deployment.yaml b/02_hetzner/01_prod/bioplus/deployment.yaml new file mode 100644 index 0000000..f1fa070 --- /dev/null +++ b/02_hetzner/01_prod/bioplus/deployment.yaml @@ -0,0 +1,129 @@ +# Deployment description +apiVersion: apps/v1 +kind: Deployment +metadata: + name: bioplus-deployment + namespace: prod-environment + labels: + app: bioplus-prod +spec: + strategy: + type: Recreate + replicas: 1 + selector: + matchLabels: + app: bioplus-prod + template: + metadata: + labels: + app: bioplus-prod + spec: + securityContext: + runAsUser: 1000 + runAsGroup: 1000 + fsGroup: 1000 + containers: + - name: bioplus + image: packages.semapp.lan:5000/bioplus_backend:V1.0.0 + imagePullPolicy: Always + resources: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "256Mi" + cpu: "4" + ports: + - containerPort: 8000 + name: bioplus-http + protocol: TCP + envFrom: + - configMapRef: + name: bioplus-prod-config-prod + volumeMounts: + - mountPath: bioplus_wagtail/media/. + name: bioplus-pv-prod + volumes: + - name: bioplus-pv-prod + persistentVolumeClaim: + claimName: bioplus-pvc-prod +--- +apiVersion: v1 +kind: ConfigMap +metadata: + namespace: prod-environment + name: bioplus-prod-config-prod + labels: + app: bioplus-prod +data: + DJANGO_DB_ENGINE: "django.db.backends.postgresql_psycopg2" + DJANGO_DB_NAME: "bioplus-wagtail" + DJANGO_DB_USER: "bioplus-wagtail" + DJANGO_DB_PASSWORD: "jNeF7PfvrDG1bJLNCibb" + DJANGO_DB_HOST: "psql.semprod.local" + DJANGO_DB_PORT: "5432" + +--- +# Persistent Volume Claim description +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: bioplus-pvc-prod + namespace: prod-environment + labels: + app: bioplus-prod +spec: + storageClassName: longhorn + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 1Gi +--- +# semapp Service +apiVersion: v1 +kind: Service +metadata: + name: bioplus + namespace: prod-environment +spec: + selector: + app: bioplus-prod + ports: + - name: bioplus-http + port: 8000 + targetPort: bioplus-http + type: NodePort +--- + +# Ingress description +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: bioplus-prod-ingress + namespace: prod-environment + annotations: + kubernetes.io/ingress.class: "traefik" +spec: + rules: + - host: bioplus.k8s.semprod.local + http: + paths: + - backend: + service: + name: bioplus + port: + number: 8000 + path: / + pathType: ImplementationSpecific + + - host: bioplus.semapp.de + http: + paths: + - backend: + service: + name: bioplus + port: + number: 8000 + path: / + pathType: ImplementationSpecific \ No newline at end of file From 95a69271ffeeb866d7d304da60e792f98a09ca48 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Fri, 13 May 2022 07:33:12 +0200 Subject: [PATCH 2/5] Update semapp-hompage, efc and customer portal versions. --- .../02_qa/semapp-wagtail/deployment.yaml | 2 +- 02_hetzner/01_prod/efc/deployment.yaml | 4 ++-- .../01_prod/semapp-wagtail/deployment.yaml | 2 +- 02_hetzner/01_prod/semcust/deployment.yaml | 23 +++++++++++-------- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/01_onsite/02_qa/semapp-wagtail/deployment.yaml b/01_onsite/02_qa/semapp-wagtail/deployment.yaml index 1fb72c3..5b3def8 100644 --- a/01_onsite/02_qa/semapp-wagtail/deployment.yaml +++ b/01_onsite/02_qa/semapp-wagtail/deployment.yaml @@ -24,7 +24,7 @@ spec: fsGroup: 1000 containers: - name: semapp - image: packages.semapp.lan:5000/semapp-wagtail:$IMAGE_TAG + image: packages.semapp.lan:5000/semapp-wagtail:V1.0.3 imagePullPolicy: Always resources: requests: diff --git a/02_hetzner/01_prod/efc/deployment.yaml b/02_hetzner/01_prod/efc/deployment.yaml index 75930b0..cc653bd 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:1.0.8-rc1 + image: packages.semapp.lan:5000/efc-admin_frontend:1.0.9-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:1.0.8-rc1 + image: packages.semapp.lan:5000/efc-admin_backend:1.0.9-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 d5878d8..76a88c5 100644 --- a/02_hetzner/01_prod/semapp-wagtail/deployment.yaml +++ b/02_hetzner/01_prod/semapp-wagtail/deployment.yaml @@ -24,7 +24,7 @@ spec: fsGroup: 1000 containers: - name: semapp - image: packages.semapp.lan:5000/semapp-wagtail:V1.0.1 + image: packages.semapp.lan:5000/semapp-wagtail:V1.0.3 imagePullPolicy: Always resources: requests: diff --git a/02_hetzner/01_prod/semcust/deployment.yaml b/02_hetzner/01_prod/semcust/deployment.yaml index 01a5337..831bcb8 100644 --- a/02_hetzner/01_prod/semcust/deployment.yaml +++ b/02_hetzner/01_prod/semcust/deployment.yaml @@ -3,7 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: semcust-deployment - namespace: prod-environment + namespace: baseline-environment labels: app: semcust-prod spec: @@ -20,7 +20,7 @@ spec: spec: containers: - name: semcust-frontend - image: packages.semapp.lan:5000/semcust_frontend:1.3.1 + image: packages.semapp.lan:5000/semcust_frontend:1.3.4 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.1 + image: packages.semapp.lan:5000/semcust_backend:1.3.4 resources: requests: memory: "256Mi" @@ -63,7 +63,7 @@ spec: apiVersion: v1 kind: ConfigMap metadata: - namespace: prod-environment + namespace: baseline-environment name: semcust-prod-config labels: app: semcust-prod @@ -94,10 +94,15 @@ data: # BASELINE NEDDED VARIABLES (this will be need changed then keyclak will be on internet) BASELINE_KEY: "AESNEwfqJVwaI4aLwyVl7kzTqdmWeQQq9hCpLRGahYI=" - BASE_KEYCLOAK_URL: "https://kc.semapp.de/" + + BASE_KEYCLOAK_URL: "http://kc.k8s.semprod.local/" + PROXY_KEYCLOAK_URL: "https://kc.semapp.de/" + BASELINE_KEYCLOAK_CLIENT_ID: "baseline_prod" BASELINE_KEYCLOAK_REALM: "baseline" + + KEYCLOAK_ADMIN_USERNAME: "admin" KEYCLOAK_ADMIN_PASSWORD: "yEu2hr7j8WjYW2wXp3UQq6qN" KEYCLOAK_ADMIN_CLIENT_ID: "admin-cli" @@ -106,7 +111,7 @@ data: apiVersion: v1 kind: ConfigMap metadata: - namespace: prod-environment + namespace: baseline-environment name: semcust-nginx-conf data: default.conf: | @@ -257,7 +262,7 @@ apiVersion: v1 kind: Service metadata: name: semcust-frontend-prod - namespace: prod-environment + namespace: baseline-environment spec: selector: app: semcust-prod @@ -273,7 +278,7 @@ apiVersion: v1 kind: Service metadata: name: semcust-backend-prod - namespace: prod-environment + namespace: baseline-environment spec: selector: app: semcust-prod @@ -289,7 +294,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: semcust-prod-ingress - namespace: prod-environment + namespace: baseline-environment annotations: kubernetes.io/ingress.class: "traefik" spec: From b21ef1ebb1140c5bd68f8342c01c425b0a170996 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Mon, 16 May 2022 09:30:22 +0200 Subject: [PATCH 3/5] Move semacust back to prod env and update version. --- 02_hetzner/01_prod/semcust/deployment.yaml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/02_hetzner/01_prod/semcust/deployment.yaml b/02_hetzner/01_prod/semcust/deployment.yaml index 831bcb8..422763c 100644 --- a/02_hetzner/01_prod/semcust/deployment.yaml +++ b/02_hetzner/01_prod/semcust/deployment.yaml @@ -3,7 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: semcust-deployment - namespace: baseline-environment + namespace: prod-environment labels: app: semcust-prod spec: @@ -20,7 +20,7 @@ spec: spec: containers: - name: semcust-frontend - image: packages.semapp.lan:5000/semcust_frontend:1.3.4 + image: packages.semapp.lan:5000/semcust_frontend:1.3.7 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.4 + image: packages.semapp.lan:5000/semcust_backend:1.3.7 resources: requests: memory: "256Mi" @@ -63,7 +63,7 @@ spec: apiVersion: v1 kind: ConfigMap metadata: - namespace: baseline-environment + namespace: prod-environment name: semcust-prod-config labels: app: semcust-prod @@ -95,8 +95,7 @@ data: # BASELINE NEDDED VARIABLES (this will be need changed then keyclak will be on internet) BASELINE_KEY: "AESNEwfqJVwaI4aLwyVl7kzTqdmWeQQq9hCpLRGahYI=" - BASE_KEYCLOAK_URL: "http://kc.k8s.semprod.local/" - PROXY_KEYCLOAK_URL: "https://kc.semapp.de/" + BASE_KEYCLOAK_URL: "http://kc.k8s.semprod.local" BASELINE_KEYCLOAK_CLIENT_ID: "baseline_prod" BASELINE_KEYCLOAK_REALM: "baseline" @@ -111,7 +110,7 @@ data: apiVersion: v1 kind: ConfigMap metadata: - namespace: baseline-environment + namespace: prod-environment name: semcust-nginx-conf data: default.conf: | @@ -262,7 +261,7 @@ apiVersion: v1 kind: Service metadata: name: semcust-frontend-prod - namespace: baseline-environment + namespace: prod-environment spec: selector: app: semcust-prod @@ -278,7 +277,7 @@ apiVersion: v1 kind: Service metadata: name: semcust-backend-prod - namespace: baseline-environment + namespace: prod-environment spec: selector: app: semcust-prod @@ -294,7 +293,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: semcust-prod-ingress - namespace: baseline-environment + namespace: prod-environment annotations: kubernetes.io/ingress.class: "traefik" spec: From faa3687f15e9e2b20de0cafb7218c2f7ec01093a Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Mon, 16 May 2022 21:40:15 +0200 Subject: [PATCH 4/5] Update semapp homepage version and bioplus. --- 01_onsite/01_dev/shubbkoarnsru/deployment.yaml | 4 ++-- 02_hetzner/01_prod/bioplus/deployment.yaml | 2 +- 02_hetzner/01_prod/semapp-wagtail/deployment.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/01_onsite/01_dev/shubbkoarnsru/deployment.yaml b/01_onsite/01_dev/shubbkoarnsru/deployment.yaml index 00b88f7..0e84405 100644 --- a/01_onsite/01_dev/shubbkoarnsru/deployment.yaml +++ b/01_onsite/01_dev/shubbkoarnsru/deployment.yaml @@ -41,7 +41,7 @@ spec: - configMapRef: name: skr-dev-config-dev volumeMounts: - - mountPath: /app/media/ + - mountPath: schubbkoarnsru_wagtail/media/. name: skr-pv-dev volumes: - name: skr-pv-dev @@ -57,7 +57,7 @@ metadata: app: skr-dev data: DJANGO_DB_ENGINE: "django.db.backends.postgresql_psycopg2" - DJANGO_DB_NAME: "schubbkoarnsruh" + DJANGO_DB_NAME: "schubbkoarnsruh_dev" DJANGO_DB_USER: "schubbkoarnsruh" DJANGO_DB_PASSWORD: "schubbkoarnsruh" DJANGO_DB_HOST: "postgres-lb" diff --git a/02_hetzner/01_prod/bioplus/deployment.yaml b/02_hetzner/01_prod/bioplus/deployment.yaml index f1fa070..2a75977 100644 --- a/02_hetzner/01_prod/bioplus/deployment.yaml +++ b/02_hetzner/01_prod/bioplus/deployment.yaml @@ -24,7 +24,7 @@ spec: fsGroup: 1000 containers: - name: bioplus - image: packages.semapp.lan:5000/bioplus_backend:V1.0.0 + image: packages.semapp.lan:5000/bioplus_backend:V1.0.1 imagePullPolicy: Always resources: requests: diff --git a/02_hetzner/01_prod/semapp-wagtail/deployment.yaml b/02_hetzner/01_prod/semapp-wagtail/deployment.yaml index 76a88c5..3feaa11 100644 --- a/02_hetzner/01_prod/semapp-wagtail/deployment.yaml +++ b/02_hetzner/01_prod/semapp-wagtail/deployment.yaml @@ -24,7 +24,7 @@ spec: fsGroup: 1000 containers: - name: semapp - image: packages.semapp.lan:5000/semapp-wagtail:V1.0.3 + image: packages.semapp.lan:5000/semapp-wagtail:V1.0.5 imagePullPolicy: Always resources: requests: From 7057c131b416e7e5fd4f8373734acd9b206c6534 Mon Sep 17 00:00:00 2001 From: Antun Franjin Date: Thu, 19 May 2022 10:02:17 +0200 Subject: [PATCH 5/5] Add versions. --- 02_hetzner/01_prod/bioplus/deployment.yaml | 2 +- 02_hetzner/01_prod/semapp-wagtail/deployment.yaml | 2 +- 02_hetzner/01_prod/shubbkoarnsru/deployment.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/02_hetzner/01_prod/bioplus/deployment.yaml b/02_hetzner/01_prod/bioplus/deployment.yaml index 2a75977..4c496a2 100644 --- a/02_hetzner/01_prod/bioplus/deployment.yaml +++ b/02_hetzner/01_prod/bioplus/deployment.yaml @@ -24,7 +24,7 @@ spec: fsGroup: 1000 containers: - name: bioplus - image: packages.semapp.lan:5000/bioplus_backend:V1.0.1 + image: packages.semapp.lan:5000/bioplus_backend:V1.0.2 imagePullPolicy: Always resources: requests: diff --git a/02_hetzner/01_prod/semapp-wagtail/deployment.yaml b/02_hetzner/01_prod/semapp-wagtail/deployment.yaml index 3feaa11..39bd2e2 100644 --- a/02_hetzner/01_prod/semapp-wagtail/deployment.yaml +++ b/02_hetzner/01_prod/semapp-wagtail/deployment.yaml @@ -24,7 +24,7 @@ spec: fsGroup: 1000 containers: - name: semapp - image: packages.semapp.lan:5000/semapp-wagtail:V1.0.5 + image: packages.semapp.lan:5000/semapp-wagtail:V1.0.6 imagePullPolicy: Always resources: requests: diff --git a/02_hetzner/01_prod/shubbkoarnsru/deployment.yaml b/02_hetzner/01_prod/shubbkoarnsru/deployment.yaml index 4cdb246..c4b99fb 100644 --- a/02_hetzner/01_prod/shubbkoarnsru/deployment.yaml +++ b/02_hetzner/01_prod/shubbkoarnsru/deployment.yaml @@ -24,7 +24,7 @@ spec: fsGroup: 1000 containers: - name: schubbkoarnsru - image: packages.semapp.lan:5000/schubbkoarnsru:$IMAGE_TAG + image: packages.semapp.lan:5000/schubbkoarnsru:v1.0.13 imagePullPolicy: Always resources: @@ -58,7 +58,7 @@ metadata: app: skr-prod data: DJANGO_DB_ENGINE: "django.db.backends.postgresql_psycopg2" - DJANGO_DB_NAME: "schubbkoarnsruh" + DJANGO_DB_NAME: "schubbkoarnsruh_prod" DJANGO_DB_USER: "schubbkoarnsruh" DJANGO_DB_PASSWORD: "rHeVZxhSBc6UPsnF" DJANGO_DB_HOST: "psql.semprod.local"