From b5c711854b09a3fcd1ac02f3afdfe2171a42463f Mon Sep 17 00:00:00 2001
From: "Langhammer, Jens" <jens.langhammer@haufe-lexware.com>
Date: Mon, 22 Jul 2019 17:17:53 +0200
Subject: [PATCH] deploy: fix static deployment and static container

---
 Dockerfile.static                              | 2 +-
 helm/passbook/templates/ingress.yaml           | 2 +-
 helm/passbook/templates/static-deployment.yaml | 7 +++----
 helm/passbook/templates/worker-deployment.yaml | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Dockerfile.static b/Dockerfile.static
index e7a0409fb..376d20ff9 100644
--- a/Dockerfile.static
+++ b/Dockerfile.static
@@ -10,5 +10,5 @@ RUN ./manage.py collectstatic --no-input
 
 FROM nginx:latest
 
-COPY --from=static-build /app/static /static/_/static/
+COPY --from=static-build /app/static /static/static/
 COPY ./passbook/core/nginx.conf /etc/nginx/nginx.conf
diff --git a/helm/passbook/templates/ingress.yaml b/helm/passbook/templates/ingress.yaml
index 09da3bec8..bfd9e9758 100644
--- a/helm/passbook/templates/ingress.yaml
+++ b/helm/passbook/templates/ingress.yaml
@@ -35,7 +35,7 @@ spec:
               servicePort: http
           - path: /static/
             backend:
-              serviceName: {{ $fullname }}-static
+              serviceName: {{ $fullName }}-static
               servicePort: http
   {{- end }}
   {{- range .Values.ingress.app_gw_hosts }}
diff --git a/helm/passbook/templates/static-deployment.yaml b/helm/passbook/templates/static-deployment.yaml
index 723485ccd..7f88e5e13 100644
--- a/helm/passbook/templates/static-deployment.yaml
+++ b/helm/passbook/templates/static-deployment.yaml
@@ -24,9 +24,6 @@ spec:
         field.cattle.io/workloadMetrics: '[{"path":"/metrics","port":9113,"schema":"HTTP"}]'
     spec:
       containers:
-        - name: {{ .Chart.Name }}-static-prometheus
-          image: nginx/nginx-prometheus-exporter:0.4.1
-          imagePullPolicy: IfNotPresent
         - name: {{ .Chart.Name }}-static
           image: "docker.beryju.org/passbook/static:{{ .Values.image.tag }}"
           imagePullPolicy: IfNotPresent
@@ -53,4 +50,6 @@ spec:
             limits:
               cpu: 20m
               memory: 20M
-
+        - name: {{ .Chart.Name }}-static-prometheus
+          image: nginx/nginx-prometheus-exporter:0.4.1
+          imagePullPolicy: IfNotPresent
diff --git a/helm/passbook/templates/worker-deployment.yaml b/helm/passbook/templates/worker-deployment.yaml
index dce29feed..649031d11 100644
--- a/helm/passbook/templates/worker-deployment.yaml
+++ b/helm/passbook/templates/worker-deployment.yaml
@@ -42,7 +42,7 @@ spec:
           resources:
             requests:
               cpu: 150m
-              memory: 400M
+              memory: 300M
             limits:
               cpu: 300m
-              memory: 600M
+              memory: 500M