From dde4c5ee68b0f51c245d23ba7fd33dbb867ec0f2 Mon Sep 17 00:00:00 2001
From: Ilya Kreymer <ikreymer@gmail.com>
Date: Sat, 15 Oct 2022 13:44:46 -0700
Subject: [PATCH] k8s chart: ingress: use separate ingress for authsign to
 allow ssl-redirect true on main ingress mongo: local: disable readiness check
 for now due to issues with eval command (for now)

---
 chart/templates/ingress.yaml | 16 +++++++++++++++-
 chart/templates/mongo.yaml   | 13 +++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml
index 0ee6b573..b2c92226 100644
--- a/chart/templates/ingress.yaml
+++ b/chart/templates/ingress.yaml
@@ -8,7 +8,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   annotations:
     kubernetes.io/ingress.class: "nginx"
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
     nginx.ingress.kubernetes.io/rewrite-target: /$1
     nginx.ingress.kubernetes.io/enable-cors: "true"
     nginx.ingress.kubernetes.io/cors-allow-origin: "*"
@@ -58,6 +58,20 @@ spec:
               number: 80
 
 {{ if .Values.signer.host }}
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: ingress-authsign
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+    nginx.ingress.kubernetes.io/rewrite-target: /$1
+    nginx.ingress.kubernetes.io/upstream-vhost: "{{ .Values.signer.host }}"
+
+spec:
+  rules:
   - host: {{ .Values.signer.host }}
     http:
       paths:
diff --git a/chart/templates/mongo.yaml b/chart/templates/mongo.yaml
index 4cfa0078..fc7816dd 100644
--- a/chart/templates/mongo.yaml
+++ b/chart/templates/mongo.yaml
@@ -101,12 +101,13 @@ spec:
               cpu: {{ .Values.mongo_requests_cpu }}
               memory: {{ .Values.mongo_requests_memory }}
 
-          readinessProbe:
-            exec:
-              command:
-                - mongo
-                - --eval
-                - db.adminCommand('ping')
+          # disable for now, issue pending: https://github.com/bitnami/charts/issues/10264
+          #readinessProbe:
+          #  exec:
+          #    command:
+          #      - mongo
+          #      - --eval
+          #      - db.adminCommand('ping')
 
 ---
 apiVersion: v1