Merge branch 'bugfix/RM-minio-storage-nginx-reverse' into 'master'

bugfix/RM-minio-storage-nginx

See merge request devops/k8s-deployments!55

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 {

01_onsite/02_qa/rm/deployment.yaml

@@ -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 {

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
+      - backend:
+          service:
+            name: rm-frontend-srv
+            port:
+              number: 80
+        path: /
+        pathType: ImplementationSpecific