From b26aaf0327b3b15ea960230f32b645b082513ea8 Mon Sep 17 00:00:00 2001
From: Angular2guy <angular2guy@gmail.com>
Date: Fri, 16 Aug 2024 07:40:07 +0200
Subject: [PATCH] feat: update kafka

---
 .../templates/_helpers.tpl                    | 18 ------
 .../templates/kubTemplate.yaml                | 62 ++-----------------
 helm/angularportfoliomgr/values.yaml          |  7 ---
 3 files changed, 6 insertions(+), 81 deletions(-)

diff --git a/helm/angularportfoliomgr/templates/_helpers.tpl b/helm/angularportfoliomgr/templates/_helpers.tpl
index 114db7a3..faa34f5b 100755
--- a/helm/angularportfoliomgr/templates/_helpers.tpl
+++ b/helm/angularportfoliomgr/templates/_helpers.tpl
@@ -84,21 +84,3 @@ Create envKafka values
   value: {{ $val | quote }}
 {{- end}}
 {{- end }}
-
-{{/*
-Create envZookeeper values
-*/}}
-{{- define "helpers.list-envZookeeper-variables"}}
-{{- $secretName := .Values.secret.nameZookeeper -}}
-{{- range $key, $val := .Values.envZookeeper.secret }}
-- name: {{ $key }}
-  valueFrom:
-    secretKeyRef:
-      name: {{ $secretName }}
-      key: {{ $key }}
-{{- end}}
-{{- range $key, $val := .Values.envZookeeper.normal }}
-- name: {{ $key }}
-  value: {{ $val | quote }}
-{{- end}}
-{{- end }}
\ No newline at end of file
diff --git a/helm/angularportfoliomgr/templates/kubTemplate.yaml b/helm/angularportfoliomgr/templates/kubTemplate.yaml
index d4f3e012..3f986436 100755
--- a/helm/angularportfoliomgr/templates/kubTemplate.yaml
+++ b/helm/angularportfoliomgr/templates/kubTemplate.yaml
@@ -28,16 +28,6 @@ data:
   {{ $key }}: {{ $val | b64enc }}
   {{- end}}
 ---
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ .Values.secret.nameZookeeper }}
-type: Opaque
-data:
-  {{- range $key, $val := .Values.envZookeeper.secret }}
-  {{ $key }}: {{ $val | b64enc }}
-  {{- end}}
----
 kind: PersistentVolume
 apiVersion: v1
 metadata:
@@ -122,51 +112,6 @@ spec:
 ---
 apiVersion: apps/v1
 kind: Deployment
-metadata:
-  name: {{ .Values.zookeeperName }}
-  labels:
-    app: {{ .Values.zookeeperName }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: {{ .Values.zookeeperName }}
-  template:
-    metadata:
-      labels:
-        app: {{ .Values.zookeeperName }}
-    spec:
-      containers:
-      - name: {{ .Values.zookeeperName }}
-        image: "{{ .Values.zookeeperImageName }}:{{ .Values.zookeeperImageVersion }}"
-        resources:
-          limits:
-            memory: "512M"
-            cpu: "0.3"
-          requests:
-            memory: "384M"
-            cpu: "0.1"
-        env:
-          {{- include "helpers.list-envZookeeper-variables" . | indent 10 }}
-        ports:
-        - containerPort: 2181
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Values.zookeeperServiceName }}
-  labels:
-    app: {{ .Values.zookeeperServiceName }}
-spec:
-  ports:
-  - port: 2181
-    protocol: TCP
-  selector:
-    app: {{ .Values.zookeeperName }}
-
----
-apiVersion: apps/v1
-kind: Deployment
 metadata:
   name: {{ .Values.kafkaName }}
   labels:
@@ -208,8 +153,13 @@ metadata:
     app: {{ .Values.kafkaServiceName }}
 spec:
   ports:
-  - port: 9092
+  - name: tcp-client
+    port: 9092
+    protocol: TCP
+  - name: tcp-interbroker
+    port: 9093
     protocol: TCP
+    targetPort: 9093
   selector:
     app: {{ .Values.kafkaName }}    
 ---
diff --git a/helm/angularportfoliomgr/values.yaml b/helm/angularportfoliomgr/values.yaml
index a63e6452..93e3e13b 100755
--- a/helm/angularportfoliomgr/values.yaml
+++ b/helm/angularportfoliomgr/values.yaml
@@ -27,13 +27,6 @@ secret:
   nameApp: app-env-secret
   nameDb: db-env-secret
   nameKafka: kafka-env-secret
-  nameZookeeper: zookeeper-env-secret
-
-envZookeeper:
-  normal: 
-    ALLOW_ANONYMOUS_LOGIN: yes
-  secret:
-   ZOOKEEPER_TICK_TIME: "2000"
     
 envKafka:
   normal: