fix: support annotations

lsdopen · Apr 25, 2024 · 6b471cf · 6b471cf
1 parent 2377fac
commit 6b471cf
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 21 deletions.
diff --git a/charts/confluent/Chart.yaml b/charts/confluent/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: lsdmesp-confluent
-version: "0.5.3"
-appVersion: "0.5.3"
+version: "0.5.4"
+appVersion: "0.5.4"
 description: 'LSDMESP CFK: LSD Event Streaming Platform with Confluent Operator'
 keywords:
   - lsdmesp

diff --git a/charts/confluent/templates/011.kafka-ingress.yaml b/charts/confluent/templates/011.kafka-ingress.yaml
@@ -5,6 +5,10 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ .Release.Name }}-kafka
+{{- with $kafka.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
   ingressClassName: {{ $kafka.ingress.ingressClassName }}
   rules:
@@ -18,36 +22,23 @@ spec:
                   number: 9092
             path: /
             pathType: ImplementationSpecific
-  tls:
-    - hosts:
-        - kafka.{{ $kafka.ingress.baseDomain }}
-      secretName: {{ $kafka.ingress.tls.secretName }}
 {{- range $i := until ($kafka.replicas | int) }}
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ $.Release.Name }}-kafka-broker-{{ $i }}
-{{- with $kafka.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-  ingressClassName: {{ $kafka.ingress.ingressClassName }}
-  rules:
     - host: kafka-broker-{{ $i }}.{{ $kafka.ingress.baseDomain }}
       http:
         paths:
           - backend:
               service:
-                name: kafka
+                name: kafka-{{ $i }}-internal
                 port:
                   number: 9092
             path: /
             pathType: ImplementationSpecific
+{{- end }}
   tls:
     - hosts:
+        - kafka.{{ $kafka.ingress.baseDomain }}
+{{- range $i := until ($kafka.replicas | int) }}
         - kafka-broker-{{ $i }}.{{ $kafka.ingress.baseDomain }}
-      secretName: {{ $kafka.ingress.tls.secretName }}-{{ $i }}
-{{- end -}}
+{{- end }}
+      secretName: {{ $kafka.ingress.tls.secretName }}
 {{- end -}}
diff --git a/charts/confluent/templates/020.schemaregistry-ingress.yaml b/charts/confluent/templates/020.schemaregistry-ingress.yaml
@@ -5,6 +5,10 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ .Release.Name }}-schemaregistry
+{{- with $schemaregistry.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
   ingressClassName: {{ $schemaregistry.ingress.ingressClassName }}
   rules:

diff --git a/charts/confluent/templates/030.connect-ingress.yaml b/charts/confluent/templates/030.connect-ingress.yaml
@@ -5,6 +5,10 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ .Release.Name }}-connect
+{{- with $connect.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
   ingressClassName: {{ $connect.ingress.ingressClassName }}
   rules:

diff --git a/charts/confluent/templates/031.ksqldb-ingress.yaml b/charts/confluent/templates/031.ksqldb-ingress.yaml
@@ -5,6 +5,10 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ .Release.Name }}-ksqldb
+{{- with $ksqldb.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
   ingressClassName: {{ $ksqldb.ingress.ingressClassName }}
   rules:

diff --git a/charts/confluent/templates/050.controlcenter-ingress.yaml b/charts/confluent/templates/050.controlcenter-ingress.yaml
@@ -5,6 +5,10 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ .Release.Name }}-controlcenter
+{{- with $controlcenter.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
   ingressClassName: {{ $controlcenter.ingress.ingressClassName }}
   rules: