[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, 26 deletions

diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
index 761f19c5e3..14deab557b 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
@@ -43,40 +43,28 @@ participant:
           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 }}
     participantSupportedElementTypes:
       -
         typeName: org.onap.policy.clamp.acm.K8SMicroserviceAutomationCompositionElement
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml
index d69a85824e..d3a280a4d4 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/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:
         - sh
         args:
@@ -41,13 +38,11 @@ spec:
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "restserver-secret" "key" "login") | indent 10 }}
         - name: RESTSERVER_PASSWORD
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "restserver-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-k8s-ppnt-config
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/kafkauser.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/kafkauser.yaml
index 92184b8e85..6fc37c3d01 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/kafkauser.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/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-ac-k8s-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
index 5d82c83cc5..407f5dd724 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/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
@@ -89,7 +88,7 @@ ingress:
 serviceMesh:
   authorizationPolicy:
     authorizedPrincipals:
-      - serviceAccount: message-router-read
+      - serviceAccount: strimzi-kafka-read
 
 flavor: small
 resources:
@@ -147,6 +146,3 @@ kafkaUser:
       type: topic
       operations: [Read, Write]
 
-readinessCheck:
-  wait_for:
-    - message-router