Merge branch 'develop'

lsdopen · Sep 27, 2024 · 1f83047 · 1f83047
2 parents 1bc4819 + a9b7a5b
commit 1f83047
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/charts/strimzi/Chart.yaml b/charts/strimzi/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: lsdmesp-strimzi
-version: "1.0.4"
-appVersion: "1.0.4"
+version: "1.0.5"
+appVersion: "1.0.5"
 description: 'LSDMESP Strimzi: LSD Event Streaming Platform based on Strimzi'
 keywords:
   - lsdmesp

diff --git a/charts/strimzi/templates/080.cp.ksql.ingress.yaml b/charts/strimzi/templates/080.cp.ksql.ingress.yaml
@@ -28,6 +28,8 @@ spec:
   tls:
   - hosts:
     - {{ .Values.lsdmesp.confluent.ksqldb.ingress.url }}
+    {{- if .Values.lsdmesp.confluent.ksqldb.ingress.tls.useCustomCert }}
     secretName: {{ .Values.lsdmesp.confluent.ksqldb.ingress.tls.secretName }}
+    {{- end }}
 ---
 {{- end }}
diff --git a/charts/strimzi/templates/080.cp.schema.registry.ingress.yaml b/charts/strimzi/templates/080.cp.schema.registry.ingress.yaml
@@ -28,6 +28,8 @@ spec:
   tls:
   - hosts:
     - {{ .Values.lsdmesp.confluent.schemaRegistry.ingress.url }}
+    {{- if .Values.lsdmesp.confluent.schemaRegistry.ingress.tls.useCustomCert }}
     secretName: {{ .Values.lsdmesp.confluent.schemaRegistry.ingress.tls.secretName }}
+    {{- end }}
 ---
 {{- end }}
diff --git a/charts/strimzi/values.yaml b/charts/strimzi/values.yaml
@@ -111,15 +111,19 @@ lsdmesp:
       ingress:
         url: *anchorconfluentKsqldbURL
         ingressClassName: "nginx"
-        annotations: {}
+        annotations:
+          nginx.ingress.kubernetes.io/backend-protocol: HTTPS
         tls:
+          useCustomCert: false
           secretName: ksqldb-tls
     schemaRegistry:
       ingress:
         url: *anchorconfluentSchemaRegistryURL
         ingressClassName: "nginx"
-        annotations: {}
+        annotations:
+          nginx.ingress.kubernetes.io/backend-protocol: HTTPS
         tls:
+          useCustomCert: false
           secretName: schemaregistry-tls
 
   armyKnife:
@@ -517,6 +521,8 @@ kafka-ui:
         secretName: lsdmesp-tls
   ingress:
     annotations:
+      nginx.ingress.kubernetes.io/ssl-redirect: "true"
+      nginx.ingress.kubernetes.io/backend-protocol: HTTP
       nginx.ingress.kubernetes.io/auth-type: basic
       nginx.ingress.kubernetes.io/auth-secret: lsdmesp-guis-basic-auth
       nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required'