From b54ec267d589a25dddcc5b21c7c663f44c7342d7 Mon Sep 17 00:00:00 2001
From: Domagoj Zecevic <domagoj.zecevic@semapp.de>
Date: Tue, 28 Dec 2021 14:53:33 +0100
Subject: [PATCH 1/2] add trialytix-esculape

---
 .../trialytix-demo/deployment.yaml            |   4 +-
 .../trialytix-esculape/deployment.yaml        | 189 ++++++++++++++++++
 2 files changed, 191 insertions(+), 2 deletions(-)
 create mode 100644 02_hetzner/02_trialytix/trialytix-esculape/deployment.yaml

diff --git a/02_hetzner/02_trialytix/trialytix-demo/deployment.yaml b/02_hetzner/02_trialytix/trialytix-demo/deployment.yaml
index a2bea22..d364ee7 100644
--- a/02_hetzner/02_trialytix/trialytix-demo/deployment.yaml
+++ b/02_hetzner/02_trialytix/trialytix-demo/deployment.yaml
@@ -18,7 +18,7 @@ spec:
       containers:
       # Backend container
       - name: trialytix-backend
-        image: packages.semapp.lan:5000/trialytix_backend:develop
+        image: packages.semapp.lan:5000/trialytix_backend:1.6.1-rc1
         resources:
           requests:
             memory: "256Mi"
@@ -36,7 +36,7 @@ spec:
         imagePullPolicy: Always
       # Frontend container
       - name: trialytix-frontend
-        image: packages.semapp.lan:5000/trialytix_frontend:develop
+        image: packages.semapp.lan:5000/trialytix_frontend:1.6.1-rc1
         resources:
           requests:
             memory: "256Mi"
diff --git a/02_hetzner/02_trialytix/trialytix-esculape/deployment.yaml b/02_hetzner/02_trialytix/trialytix-esculape/deployment.yaml
new file mode 100644
index 0000000..ffaffb9
--- /dev/null
+++ b/02_hetzner/02_trialytix/trialytix-esculape/deployment.yaml
@@ -0,0 +1,189 @@
+# Deployment description
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: trialytix-esculape
+  namespace: trialytix-environment
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: trialytix-esculape
+  template:
+    metadata:
+      labels:
+        app: trialytix-esculape
+    spec:
+      containers:
+      # Backend container
+      - name: trialytix-backend
+        image: packages.semapp.lan:5000/trialytix_backend:1.6.1-rc1
+        resources:
+          requests:
+            memory: "256Mi"
+            cpu: "100m"
+          limits:
+            memory: "512Mi"
+            cpu: "4"
+        ports:
+          - containerPort: 5100
+            name: trialytix-back
+            protocol: TCP
+        envFrom:
+          - configMapRef:
+              name: trialytix-config-backend-prod
+        imagePullPolicy: Always
+      # Frontend container
+      - name: trialytix-frontend
+        image: packages.semapp.lan:5000/trialytix_frontend:1.6.1-rc1
+        resources:
+          requests:
+            memory: "256Mi"
+            cpu: "100m"
+          limits:
+            memory: "512Mi"
+            cpu: "4"
+        ports:
+          - containerPort: 8100
+            name: trialytix-front
+            protocol: TCP
+        volumeMounts:
+          - mountPath: /etc/nginx/conf.d
+            readOnly: true
+            name: nginx-trialytix-esculape-conf
+        envFrom:
+          - configMapRef:
+              name: trialytix-config-backend-prod
+        imagePullPolicy: Always
+      volumes:
+        - name: nginx-trialytix-esculape-conf
+          configMap:
+            name: nginx-trialytix-esculape-conf
+
+# Env Configuration
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: trialytix-environment
+  name: trialytix-config-backend-prod
+  labels:
+    app: trialytix-esculape
+data:
+  DJANGO_DB_ENGINE: 'django.db.backends.postgresql'
+  DJANGO_DB_NAME: 'trialytix-esculape'
+  DJANGO_DB_USER: 'trialytix-esculape'
+  DJANGO_DB_PASSWORD: 'Zb<BEg8)ndH_Fv`;N-'
+  DJANGO_DB_HOST: 'psql.semprod.local'
+  DJANGO_DB_PORT: '5432'
+  ALLOWED_HOSTS: '["*"]'
+  FRONTEND_URL: 'http://esculape.trialytix.io'
+  API_URL: 'http://esculape.trialytix.io'
+  FRONTEND_PORT: '8100'
+  BACKEND_PORT: '5100'
+
+# Nginx configuration
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: trialytix-environment
+  name: nginx-trialytix-esculape-conf
+data:
+  default.conf: | 
+    upstream backend {
+      server backend-trialytix-esculape:5100;
+    }
+
+    server {
+      listen 8100;
+
+      access_log /var/log/nginx/access.log;
+      charset utf-8;
+      client_max_body_size 1G;
+
+      location / {
+        root /srv/trialytix;
+        index index.html index.htm;
+        try_files $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;
+    }
+
+# Trialytix service
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: backend-trialytix-esculape
+  namespace: trialytix-environment
+spec:
+  selector:
+    app: trialytix-esculape
+  ports:
+    - name: trialytix-back
+      port: 5100
+      targetPort: trialytix-back
+  type: NodePort
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: frontend-trialytix-esculape
+  namespace: trialytix-environment
+spec:
+  selector:
+    app: trialytix-esculape
+  ports:
+    - name: trialytix-front
+      port: 8100
+      targetPort: trialytix-front
+  type: NodePort
+
+# Ingress description
+---
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  name: trialytix-esculape-ingress
+  namespace: trialytix-environment
+  annotations:
+    kubernetes.io/ingress.class: "traefik"
+spec:
+  rules:
+  - host: trialytix-esculape.k8s.semprod.local
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: frontend-trialytix-esculape
+          serv:qicePort: 8100
+  - host: esculape.trialytix.io
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: frontend-trialytix-esculape
+          servicePort: 8100
\ No newline at end of file

From 19ce312af2014d204dbc38bf8d881f62c846d11a Mon Sep 17 00:00:00 2001
From: Domagoj Zecevic <domagoj.zecevic@semapp.de>
Date: Mon, 10 Jan 2022 14:37:05 +0100
Subject: [PATCH 2/2] typo correct and ingress to v1

---
 .../trialytix-esculape/deployment.yaml        | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/02_hetzner/02_trialytix/trialytix-esculape/deployment.yaml b/02_hetzner/02_trialytix/trialytix-esculape/deployment.yaml
index ffaffb9..4857d7c 100644
--- a/02_hetzner/02_trialytix/trialytix-esculape/deployment.yaml
+++ b/02_hetzner/02_trialytix/trialytix-esculape/deployment.yaml
@@ -164,7 +164,7 @@ spec:
 
 # Ingress description
 ---
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: trialytix-esculape-ingress
@@ -176,14 +176,20 @@ spec:
   - host: trialytix-esculape.k8s.semprod.local
     http:
       paths:
-      - path: /
-        backend:
-          serviceName: frontend-trialytix-esculape
-          serv:qicePort: 8100
+      - backend:
+          service:
+            name: frontend-trialytix-esculape
+            port:
+              number: 8100
+        path: /
+        pathType: ImplementationSpecific
   - host: esculape.trialytix.io
     http:
       paths:
-      - path: /
-        backend:
-          serviceName: frontend-trialytix-esculape
-          servicePort: 8100
\ No newline at end of file
+      - backend:
+          service:
+            name: frontend-trialytix-esculape
+            port:
+              number: 8100
+        path: /
+        pathType: ImplementationSpecific
\ No newline at end of file