[POLICY] Add kafka support in policy charts

Added kafka support in all policy charts. Dmaap option is removed

Issue-ID: POLICY-4941
Change-Id: I015d303c11c04a64d815fe2f054919eca2252250
Signed-off-by: rameshiyer27 <ramesh.murugan.iyer@est.tech>

4 files changed, 3 insertions, 27 deletions

diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
index 96cb265567..35e42c589d 100644
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
@@ -75,40 +75,28 @@ runtime:
         useHttps: false
         fetchTimeout: 15000
         topic: {{ .Values.global.kafkaTopics.acRuntimeTopic.name }}
-        {{ if .Values.global.useStrimziKafka }}
         topicCommInfrastructure: kafka
         servers:
-          - {{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
+          - {{ include "common.release" . }}-{{ .Values.global.kafkaBootstrap }}
         additionalProps:
           group.id: {{ (first .Values.kafkaUser.acls).name }}
           allow.auto.create.topics: false
           security.protocol: SASL_PLAINTEXT
           sasl.mechanism: {{ .Values.kafkaUser.authenticationType | upper }}
           sasl.jaas.config: ${SASL_JAAS_CONFIG}
-        {{ else }}
-        topicCommInfrastructure: dmaap
-        servers:
-          - ${topicServer:message-router}
-        {{ end }}
     topicSinks:
       -
         useHttps: false
         fetchTimeout: 15000
         topic: {{ .Values.global.kafkaTopics.acRuntimeTopic.name }}
-        {{ if .Values.global.useStrimziKafka }}
         topicCommInfrastructure: kafka
         servers:
-          - {{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
+          - {{ include "common.release" . }}-{{ .Values.global.kafkaBootstrap }}
         additionalProps:
           client.id: {{ (first .Values.kafkaUser.acls).name }}-client-id
           security.protocol: SASL_PLAINTEXT
           sasl.mechanism: {{ .Values.kafkaUser.authenticationType | upper }}
           sasl.jaas.config: ${SASL_JAAS_CONFIG}
-        {{ else }}
-        topicCommInfrastructure: dmaap
-        servers:
-          - ${topicServer:message-router}
-        {{ end }}
   acmParameters:
     toscaElementName: {{ .Values.customNaming.toscaElementName }}
     toscaCompositionName: {{ .Values.customNaming.toscaCompositionName }}
diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
index be8c35aaea..b732fad508 100644
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/deployment.yaml
@@ -28,9 +28,6 @@ spec:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
       initContainers:
-{{- if not .Values.global.useStrimziKafka }}
-{{ include "common.readinessCheck.waitFor" . | nindent 6 }}
-{{- end }}
       - command:
         - /app/ready.py
         args:
@@ -66,13 +63,11 @@ spec:
             {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "runtime-secret" "key" "login") | indent 10 }}
         - name: RUNTIME_PASSWORD
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "runtime-secret" "key" "password") | indent 10 }}
-{{- if .Values.global.useStrimziKafka }}
         - name: SASL_JAAS_CONFIG
           valueFrom:
             secretKeyRef:
               name: {{ include "common.name" . }}-ku
               key: sasl.jaas.config
-{{- end }}
         volumeMounts:
         - mountPath: /config-input
           name: ac-runtime-config
diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/kafkauser.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/kafkauser.yaml
index 92184b8e85..6fc37c3d01 100644
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/templates/kafkauser.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/templates/kafkauser.yaml
@@ -13,6 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 */}}
-{{ if .Values.global.useStrimziKafka }}
 {{ include "common.kafkauser" . }}
-{{ end }}
\ No newline at end of file
diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
index 34cceeded2..cc399d38da 100644
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
@@ -23,7 +23,6 @@ global:
   nodePortPrefixExt: 304
   persistence: {}
   #Strimzi Kafka properties
-  useStrimziKafka: set-via-parent-chart-global-value
   kafkaTopics:
     acRuntimeTopic:
       name: &acRuntimeTopic policy.clamp-runtime-acm
@@ -122,7 +121,7 @@ ingress:
 serviceMesh:
   authorizationPolicy:
     authorizedPrincipals:
-      - serviceAccount: message-router-read
+      - serviceAccount: strimzi-kafka-read
       - serviceAccount: policy-gui-read
 
 flavor: small
@@ -149,10 +148,6 @@ serviceAccount:
   roles:
     - read
 
-readinessCheck:
-  wait_for:
-    - message-router
-
 wait_for_job_container:
   containers:
     - '{{ include "common.release" . }}-policy-galera-config'