From 318e8f7f35a5b2b38ec8f19841ea37801c1820dc Mon Sep 17 00:00:00 2001
From: Antun Franjin <antun.franjin@semapp.de>
Date: Tue, 25 Jan 2022 01:17:08 +0100
Subject: [PATCH 1/3] Add storage path to nginx proxy pas to rm backend.

- The /storage/ path is call view to get media from minio storage so we
need to proxy pass path to backend.
---
 01_onsite/02_qa/rm/deployment.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/01_onsite/02_qa/rm/deployment.yaml b/01_onsite/02_qa/rm/deployment.yaml
index 2114820..8d860a3 100644
--- a/01_onsite/02_qa/rm/deployment.yaml
+++ b/01_onsite/02_qa/rm/deployment.yaml
@@ -137,7 +137,7 @@ data:
     minio_endpoint = minio-api-dev.semapp.lan
     minio_use_https = False
     minio_media_bucket = rm-qa
-    minio_access_key =  rm-qa
+    minio_access_key = rm-qa
     minio_secret_key = rm-qa123456!
     minio_auto_create_bucket = True
 ---
@@ -181,8 +181,12 @@ data:
     }
 
     location /storage {
-      # TODO: still needed when we use minio?
-      alias /srv/media;
+      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;
     }
 
     location /static {

From ccafbbfc00d78a19bd9cbe4687cc4b1d7da08f6c Mon Sep 17 00:00:00 2001
From: Antun Franjin <antun.franjin@semapp.de>
Date: Tue, 25 Jan 2022 02:15:32 +0100
Subject: [PATCH 2/3] Add nginx proxy pass to production deployment.

- New version 0.0.7 preparing for realise.
- Refactor ingress to v1
---
 02_hetzner/01_prod/rm/deployment.yaml | 36 +++++++++++++++++----------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/02_hetzner/01_prod/rm/deployment.yaml b/02_hetzner/01_prod/rm/deployment.yaml
index 26582d1..6e05792 100644
--- a/02_hetzner/01_prod/rm/deployment.yaml
+++ b/02_hetzner/01_prod/rm/deployment.yaml
@@ -24,7 +24,7 @@ spec:
       #   fsGroup: 1000
       containers:
         - name: rm-backend
-          image: packages.semapp.lan:5000/rm-backend:0.0.6
+          image: packages.semapp.lan:5000/rm-backend:0.0.7
           resources:
             requests:
               memory: "256Mi"
@@ -45,7 +45,7 @@ spec:
               value: "development"
           imagePullPolicy: Always
         - name: rm-frontend
-          image: packages.semapp.lan:5000/rm-frontend:0.0.1
+          image: packages.semapp.lan:5000/rm-frontend:0.0.7
           resources:
             requests:
               memory: "256Mi"
@@ -181,8 +181,12 @@ data:
     }
 
     location /storage {
-      # TODO: still needed when we use minio?
-      alias /srv/media;
+      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;
     }
 
     location /static {
@@ -231,7 +235,7 @@ spec:
 --- 
 
   # Ingress description
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: rm-qa-ingress
@@ -243,14 +247,20 @@ spec:
   - host: rm.k8s.semprod.local
     http:
       paths:
-      - path: /
-        backend:
-          serviceName: rm-frontend-srv
-          servicePort: 80
+      - backend:
+          service:
+            name: rm-frontend-srv
+            port:
+              number: 80
+        path: /
+        pathType: ImplementationSpecific
   - host: intrm.semapp.de
     http:
       paths:
-      - path: /
-        backend:
-          serviceName: rm-frontend-srv
-          servicePort: 80
\ No newline at end of file
+      - backend:
+          service:
+            name: rm-frontend-srv
+            port:
+              number: 80
+        path: /
+        pathType: ImplementationSpecific
\ No newline at end of file

From 710f192e203bef3adb02bfc064d3b9f213a1af9a Mon Sep 17 00:00:00 2001
From: Antun Franjin <antun.franjin@semapp.de>
Date: Tue, 25 Jan 2022 02:18:49 +0100
Subject: [PATCH 3/3] Add nginx proxy pass to dev deployment.

- Add 0.0.7 version.
---
 01_onsite/01_dev/rm/deployment.yaml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/01_onsite/01_dev/rm/deployment.yaml b/01_onsite/01_dev/rm/deployment.yaml
index ec2262a..2f9a7e9 100644
--- a/01_onsite/01_dev/rm/deployment.yaml
+++ b/01_onsite/01_dev/rm/deployment.yaml
@@ -24,7 +24,7 @@ spec:
       #   fsGroup: 1000
       containers:
         - name: rm-backend
-          image: packages.semapp.lan:5000/rm-backend:0.0.6
+          image: packages.semapp.lan:5000/rm-backend:0.0.7
           resources:
             requests:
               memory: "256Mi"
@@ -42,7 +42,7 @@ spec:
             name: flexrm-conf
           imagePullPolicy: Always
         - name: rm-frontend
-          image: packages.semapp.lan:5000/rm-frontend:0.0.1
+          image: packages.semapp.lan:5000/rm-frontend:0.0.7
           resources:
             requests:
               memory: "256Mi"
@@ -180,8 +180,12 @@ data:
     }
 
     location /storage {
-      # TODO: still needed when we use minio?
-      alias /srv/media;
+      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;
     }
 
     location /static {