Merge branch 'develop'

lsdopen · Sep 26, 2024 · 80f2526 · 80f2526
2 parents 4dd701a + fe4f20d
commit 80f2526
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 12 deletions.
diff --git a/charts/confluent/uninstall.sh b/charts/confluent/uninstall.sh
@@ -9,11 +9,14 @@ function patchFinalizers() {
   kubectl patch kafkarestclasses.platform.confluent.io default -p '{"metadata":{"finalizers":null}}' --type=merge
   kubectl patch kafka.platform.confluent.io/kafka -p '{"metadata":{"finalizers":null}}' --type=merge
   kubectl patch kraftcontroller kraftcontroller -p '{"metadata":{"finalizers":null}}' --type=merge
-  kubectl get secret | awk '{print $1}' | grep -v NAME | xargs -i kubectl patch secret {} -p '{"metadata":{"finalizers":null}}' --type=merge
-  kubectl get cfrb | awk '{print $1}' | grep -v NAME | xargs -i kubectl patch cfrb {} -p '{"metadata":{"finalizers":null}}' --type=merge
+  kubectl get secret | awk '{print $1}' | grep -v NAME | xargs -I {} kubectl patch secret {} -p '{"metadata":{"finalizers":null}}' --type=merge
+  kubectl get cfrb | awk '{print $1}' | grep -v NAME | xargs -I {} kubectl patch cfrb {} -p '{"metadata":{"finalizers":null}}' --type=merge
 }
 
 patchFinalizers
 helm uninstall lsdmesp-confluent
 sleep 5
 patchFinalizers
+
+kubectl get pvc | awk '{print $1}' | grep -v NAME | xargs -I {} kubectl delete pvc {}
+kubectl get pv | awk '{print $1}' | grep -v NAME | xargs -I {} kubectl delete pv {}
diff --git a/charts/strimzi/templates/010.strimzi.kafka.yaml b/charts/strimzi/templates/010.strimzi.kafka.yaml
@@ -162,6 +162,27 @@ spec:
         tls: true
         authentication:
           type: tls
+      {{- if $kafka.ingress.enabled }}
+      - name: external
+        port: 9094
+        type: ingress
+        tls: true
+        authentication:
+          type: tls
+        configuration:
+          class: {{ $kafka.ingress.ingressClassName }}
+          bootstrap:
+            host: bootstrap.{{ $kafka.externalDomain }}
+          brokerCertChainAndKey:
+            certificate: tls.crt
+            key: tls.key
+            secretName: {{ $kafka.ingress.tls.secretName }}
+          brokers:
+      {{- range $i := until ($kafka.replicas | int) }}
+            - broker: {{ $i }}
+              host: broker{{ $i }}.{{ $kafka.externalDomain }}
+      {{- end }}
+      {{- else -}}
       - name: external
         port: 9094
         type: nodeport
@@ -185,6 +206,7 @@ spec:
           - broker: 2
             advertisedHost: broker2.{{ $kafka.externalDomain }}
             nodePort: 32002
+      {{- end }}
     readinessProbe:
       initialDelaySeconds: 15
       timeoutSeconds: 5

diff --git a/charts/strimzi/templates/080.cp.ksql.ingress.yaml b/charts/strimzi/templates/080.cp.ksql.ingress.yaml
@@ -4,12 +4,10 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
+{{- with .Values.lsdmesp.confluent.ksqldb.ingress.annotations }}
   annotations:
-    meta.helm.sh/release-name: {{ .Release.Name }}
-    meta.helm.sh/release-namespace: {{ .Release.Namespace }}
-    {{- with .Values.lsdmesp.confluent.ksqldb.ingress.annotations }}
-    {{ toYaml . | indent 4 }}
-    {{- end }}
+{{ toYaml . | indent 4 }}
+{{- end }}
   labels:
     app: cp-ksql-server
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"

diff --git a/charts/strimzi/templates/080.cp.schema.registry.ingress.yaml b/charts/strimzi/templates/080.cp.schema.registry.ingress.yaml
@@ -4,12 +4,10 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
+{{- with .Values.lsdmesp.confluent.schemaRegistry.ingress.annotations }}
   annotations:
-    meta.helm.sh/release-name: {{ .Release.Name }}
-    meta.helm.sh/release-namespace: {{ .Release.Namespace }}
-    {{- with .Values.lsdmesp.confluent.schemaRegistry.ingress.annotations }}
-    {{ toYaml . | indent 4 }}
-    {{- end }}
+{{ toYaml . | indent 4 }}
+{{- end }}
   labels:
     app: cp-ksql-server
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"

diff --git a/charts/strimzi/values.yaml b/charts/strimzi/values.yaml
@@ -63,6 +63,12 @@ lsdmesp:
           memory: 3Gi
       # number of pod replicas
       replicas: 3
+      ingress:
+        enabled: false
+        ingressClassName: "nginx"
+        annotations: {}
+        tls:
+          secretName: kafka-tls
 
     topicOperator:
       # pod resource limits and request