Set annotation nginx.ingress.kubernetes.io/ssl-redirect in accordan…

…ce with USE_TLS variable
EOEPCA · Sep 28, 2023 · ef21ed6 · ef21ed6
1 parent 1e36a5b
commit ef21ed6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/deploy/cluster/minio.sh b/deploy/cluster/minio.sh
@@ -26,7 +26,7 @@ ingress:
   ingressClassName: nginx
   annotations:
     cert-manager.io/cluster-issuer: "${TLS_CLUSTER_ISSUER}"
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/ssl-redirect: "${USE_TLS}"
     nginx.ingress.kubernetes.io/proxy-body-size: "0"
     nginx.ingress.kubernetes.io/proxy-read-timeout: '600'
   path: /
@@ -42,7 +42,7 @@ consoleIngress:
   ingressClassName: nginx
   annotations:
     cert-manager.io/cluster-issuer: "${TLS_CLUSTER_ISSUER}"
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/ssl-redirect: "${USE_TLS}"
     nginx.ingress.kubernetes.io/proxy-body-size: "0"
     nginx.ingress.kubernetes.io/proxy-read-timeout: '600'
   path: /

diff --git a/deploy/eoepca/ades.sh b/deploy/eoepca/ades.sh
@@ -59,8 +59,8 @@ ingress:
   enabled: ${OPEN_INGRESS}
   annotations:
     kubernetes.io/ingress.class: nginx
-    ingress.kubernetes.io/ssl-redirect: "false"
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+    ingress.kubernetes.io/ssl-redirect: "${USE_TLS}"
+    nginx.ingress.kubernetes.io/ssl-redirect: "${USE_TLS}"
     cert-manager.io/cluster-issuer: ${TLS_CLUSTER_ISSUER}
   hosts:
     - host: ${name}.${domain}

diff --git a/deploy/eoepca/dummy-service.sh b/deploy/eoepca/dummy-service.sh
@@ -28,8 +28,8 @@ ingress:
   enabled: ${OPEN_INGRESS}
   annotations:
     kubernetes.io/ingress.class: nginx
-    ingress.kubernetes.io/ssl-redirect: "false"
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+    ingress.kubernetes.io/ssl-redirect: "${USE_TLS}"
+    nginx.ingress.kubernetes.io/ssl-redirect: "${USE_TLS}"
     cert-manager.io/cluster-issuer: ${TLS_CLUSTER_ISSUER}
   hosts:
     - host: ${name}.${domain}

diff --git a/deploy/eoepca/login-service.sh b/deploy/eoepca/login-service.sh
@@ -67,8 +67,8 @@ nginx:
     enabled: true
     annotations:
       # kubernetes.io/ingress.class: nginx
-      # ingress.kubernetes.io/ssl-redirect: "false"
-      # nginx.ingress.kubernetes.io/ssl-redirect: "false"
+      # ingress.kubernetes.io/ssl-redirect: "${USE_TLS}"
+      # nginx.ingress.kubernetes.io/ssl-redirect: "${USE_TLS}"
       cert-manager.io/cluster-issuer: ${TLS_CLUSTER_ISSUER}
     path: /
     hosts: