Merge pull request 'fix ingress cannot read annotation problem' (#120) from feature/nginx-config into master

Reviewed-on: https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps-ops/pulls/120

freeleaps/helm-pkg/frontend/values.alpha.yaml

@@ -39,12 +39,6 @@ frontend:
           name: frontend-service
           port:
             number: 8080
-    tls:
-      exists: false
-      issuerRef:
-        name: freeleaps-alpha-dot-com
-        kind: ClusterIssuer
-      name: freeleaps-alpha.com-cert
     annotations:
         nginx.ingress.kubernetes.io/proxy-read-timeout: '3600'
         nginx.ingress.kubernetes.io/proxy-send-timeout: '3600'
@@ -60,6 +54,12 @@ frontend:
             proxy_set_header Connection "upgrade";
             proxy_cache_bypass $http_upgrade;
           }
+    tls:
+      exists: false
+      issuerRef:
+        name: freeleaps-alpha-dot-com
+        kind: ClusterIssuer
+      name: freeleaps-alpha.com-cert
   configs:
     tz: UTC
     frontendPort: 8080

freeleaps/helm-pkg/frontend/values.prod.yaml

@@ -39,16 +39,10 @@ frontend:
           name: frontend-service
           port:
             number: 8080
-    tls:
-      exists: false
-      issuerRef:
-        name: freeleaps-dot-com
-        kind: ClusterIssuer
-      name: freeleaps.com-cert
     annotations:
       nginx.ingress.kubernetes.io/proxy-read-timeout: '3600'
       nginx.ingress.kubernetes.io/proxy-send-timeout: '3600'
-      nginx.ingress.kubernetes.io/proxy-body-size: "20m"
+      nginx.ingress.kubernetes.io/proxy-body-size: 20m
       nginx.ingress.kubernetes.io/server-snippets: |-
         location / {
           proxy_set_header Upgrade $http_upgrade;
@@ -60,6 +54,12 @@ frontend:
           proxy_set_header Connection "upgrade";
           proxy_cache_bypass $http_upgrade;
         }
+    tls:
+      exists: false
+      issuerRef:
+        name: freeleaps-dot-com
+        kind: ClusterIssuer
+      name: freeleaps.com-cert
   configs:
     tz: UTC
     frontendPort: 8080