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/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/bioplus/deployment.yaml b/02_hetzner/01_prod/bioplus/deployment.yaml new file mode 100644 index 0000000..4c496a2 --- /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.2 + 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 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..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.1 + image: packages.semapp.lan:5000/semapp-wagtail:V1.0.6 imagePullPolicy: Always resources: requests: diff --git a/02_hetzner/01_prod/semcust/deployment.yaml b/02_hetzner/01_prod/semcust/deployment.yaml index 01a5337..422763c 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.1 + 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.1 + image: packages.semapp.lan:5000/semcust_backend:1.3.7 resources: requests: memory: "256Mi" @@ -94,10 +94,14 @@ 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" + BASELINE_KEYCLOAK_CLIENT_ID: "baseline_prod" BASELINE_KEYCLOAK_REALM: "baseline" + + KEYCLOAK_ADMIN_USERNAME: "admin" KEYCLOAK_ADMIN_PASSWORD: "yEu2hr7j8WjYW2wXp3UQq6qN" KEYCLOAK_ADMIN_CLIENT_ID: "admin-cli" 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"