diff options
Diffstat (limited to 'kubernetes/policy/components/policy-clamp-ac-pf-ppnt')
| -rw-r--r-- | kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml | 46 | ||||
| -rw-r--r-- | kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml | 2 |
2 files changed, 38 insertions, 10 deletions
diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml index 856b16d91d..fc0060629e 100644 --- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml +++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/resources/config/PolicyParticipantParameters.yaml @@ -21,20 +21,19 @@ spring: user: name: ${RESTSERVER_USER} password: ${RESTSERVER_PASSWORD} -{{- if .Values.config.useStrimziKafka }} kafka: + consumer: + group-id: {{ .Values.config.kafka.consumer.groupId }} +{{- if .Values.config.useStrimziKafka }} bootstrap-servers: {{ include "common.release" . }}-{{ .Values.config.kafkaBootstrap }}:9092 security.protocol: SASL_PLAINTEXT properties.sasl: mechanism: SCRAM-SHA-512 jaas.config: ${JAASLOGIN} {{ else }} -{{ toYaml .Values.config.eventPublisher | nindent 2 }} +{{ toYaml .Values.config.eventConsumption | nindent 2 }} {{- end }} -{{- if .Values.config.additional }} -{{ toYaml .Values.config.additional | nindent 2 }} -{{- end }} security: enable-csrf: false @@ -47,7 +46,7 @@ participant: port: 6969 userName: ${API_USER} password: ${API_PASSWORD} - useHttps: true + useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }} allowSelfSignedCerts: true policyPapParameters: clientName: pap @@ -55,7 +54,7 @@ participant: port: 6969 userName: ${PAP_USER} password: ${PAP_PASSWORD} - useHttps: true + useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }} allowSelfSignedCerts: true intermediaryParameters: reportingTimeIntervalMs: 120000 @@ -74,14 +73,40 @@ participant: - ${topicServer:message-router} topicCommInfrastructure: dmaap fetchTimeout: 15000 - useHttps: true + useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }} topicSinks: - topic: POLICY-ACRUNTIME-PARTICIPANT servers: - ${topicServer:message-router} topicCommInfrastructure: dmaap - useHttps: true + useHttps: {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }} + +# If Strimzi Kafka to be used for communication, replace clampAutomationCompositionTopics configuration with below +# clampAutomationCompositionTopics: +# topicSources: +# - +# topic: policy-acruntime-participant +# servers: +# - {{ include "common.release" . }}-{{ .Values.config.kafkaBootstrap }}:9092 +# topicCommInfrastructure: kafka +# fetchTimeout: 15000 +# useHttps: true +# additionalProps: +# security.protocol: SASL_PLAINTEXT +# sasl.mechanism: SCRAM-SHA-512 +# sasl.jaas.config: ${JAASLOGIN} +# topicSinks: +# - +# topic: policy-acruntime-participant +# servers: +# - {{ include "common.release" . }}-{{ .Values.config.kafkaBootstrap }}:9092 +# topicCommInfrastructure: kafka +# useHttps: true +# additionalProps: +# security.protocol: SASL_PLAINTEXT +# sasl.mechanism: SCRAM-SHA-512 +# sasl.jaas.config: ${JAASLOGIN} management: endpoints: @@ -93,3 +118,6 @@ server: port: 8085 servlet: context-path: /onap/policyparticipant + ssl: + enabled: {{ (eq "true" (include "common.needTLS" .)) | ternary true false }} + diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml index 6fefa02783..9d000f1018 100644 --- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml +++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml @@ -90,7 +90,7 @@ certInitializer: # Application configuration defaults. ################################################################# # application image -image: onap/policy-clamp-ac-pf-ppnt:6.2.3 +image: onap/policy-clamp-ac-pf-ppnt:6.3.0 pullPolicy: Always # flag to enable debugging - application support required |