aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/cds/components/cds-blueprints-processor/resources
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2022-04-29 13:01:14 +0200
committerFiachra Corcoran <fiachra.corcoran@est.tech>2022-05-09 09:01:04 +0000
commit4ee97a9f28fcb17b272e4e94931f9528afe797a7 (patch)
treef4c7903f84cad6c87e4e1a6105c739d187c29a83 /kubernetes/cds/components/cds-blueprints-processor/resources
parent271560c6bc1e5ed027a7cc11683e6688c3bc56bf (diff)
[CDS] Service mesh compatibility
Patch on CDS charts dedicated to remove https and cert-related calls from all files. This ensure compatibility with patched AAI (IID: OOM-2670) and lays ground for service mesh use. Replaces https://gerrit.onap.org/r/c/oom/+/126099 Correction for CDS-Strimzi support in application properties Issue-ID: OOM-2824 Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de> Change-Id: I522fe60ca748b7e5f731045dac8ca11b13ae2811
Diffstat (limited to 'kubernetes/cds/components/cds-blueprints-processor/resources')
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties24
1 files changed, 14 insertions, 10 deletions
diff --git a/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties b/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
index 0beaf4a42a..b6a3433439 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
+++ b/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
@@ -101,7 +101,11 @@ blueprintsprocessor.restclient.sdnc.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoG
# AAI Data REST Client settings
blueprintsprocessor.restclient.aai-data.type=basic-auth
-blueprintsprocessor.restclient.aai-data.url=https://aai:8443
+{{ if ( include "common.needTLS" .) }}
+blueprintsprocessor.restclient.aai-data.url=https://{{ .Values.global.aaiData.ServiceName }}:8443
+{{- else -}}
+blueprintsprocessor.restclient.aai-data.url=http://{{ .Values.global.aaiData.ServiceName }}:{{ .Values.global.aaiData.ExternalPlainPort }}
+{{- end }}
blueprintsprocessor.restclient.aai-data.username=aai@aai.onap.org
blueprintsprocessor.restclient.aai-data.password=demo123456!
blueprintsprocessor.restclient.aai-data.additionalHeaders.X-TransactionId=cds-transaction-id
@@ -111,7 +115,7 @@ blueprintsprocessor.restclient.aai-data.additionalHeaders.Accept=application/jso
# Self Service Request Kafka Message Consumer
blueprintsprocessor.messageconsumer.self-service-api.kafkaEnable={{ .Values.kafkaRequestConsumer.enabled }}
blueprintsprocessor.messageconsumer.self-service-api.type={{ .Values.kafkaRequestConsumer.type }}
-{{- if eq .Values.useStrimziKafka true }}
+{{ if eq .Values.useStrimziKafka true }}
blueprintsprocessor.messageconsumer.self-service-api.bootstrapServers={{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
{{- else -}}
blueprintsprocessor.messageconsumer.self-service-api.bootstrapServers={{ .Values.kafkaRequestConsumer.bootstrapServers }}
@@ -120,7 +124,7 @@ blueprintsprocessor.messageconsumer.self-service-api.groupId={{ .Values.kafkaReq
blueprintsprocessor.messageconsumer.self-service-api.topic={{ .Values.kafkaRequestConsumer.topic }}
blueprintsprocessor.messageconsumer.self-service-api.clientId={{ .Values.kafkaRequestConsumer.clientId }}
blueprintsprocessor.messageconsumer.self-service-api.pollMillSec={{ .Values.kafkaRequestConsumer.pollMillSec }}
-{{- if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
+{{ if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
# SCRAM
blueprintsprocessor.messageconsumer.self-service-api.scramUsername={{ include "common.release" . }}-{{ .Values.cdsKafkaUser }}
blueprintsprocessor.messageconsumer.self-service-api.scramPassword=${JAAS_PASS}
@@ -128,14 +132,14 @@ blueprintsprocessor.messageconsumer.self-service-api.scramPassword=${JAAS_PASS}
# Self Service Response Kafka Message Producer
blueprintsprocessor.messageproducer.self-service-api.type={{ .Values.kafkaRequestProducer.type }}
-{{- if eq .Values.useStrimziKafka true }}
+{{ if eq .Values.useStrimziKafka true }}
blueprintsprocessor.messageproducer.self-service-api.bootstrapServers={{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
{{- else -}}
blueprintsprocessor.messageproducer.self-service-api.bootstrapServers={{ .Values.kafkaRequestProducer.bootstrapServers }}
{{- end }}
blueprintsprocessor.messageproducer.self-service-api.clientId={{ .Values.kafkaRequestProducer.clientId }}
blueprintsprocessor.messageproducer.self-service-api.topic={{ .Values.kafkaRequestProducer.topic }}
-{{- if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
+{{ if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
# SCRAM
blueprintsprocessor.messageproducer.self-service-api.scramUsername={{ include "common.release" . }}-{{ .Values.cdsKafkaUser }}
blueprintsprocessor.messageproducer.self-service-api.scramPassword=${JAAS_PASS}
@@ -146,14 +150,14 @@ blueprintsprocessor.messageproducer.self-service-api.scramPassword=${JAAS_PASS}
## Audit request
blueprintsprocessor.messageproducer.self-service-api.audit.kafkaEnable={{ .Values.kafkaAuditRequest.enabled }}
blueprintsprocessor.messageproducer.self-service-api.audit.request.type={{ .Values.kafkaAuditRequest.type }}
-{{- if eq .Values.useStrimziKafka true }}
+{{ if eq .Values.useStrimziKafka true }}
blueprintsprocessor.messageproducer.self-service-api.audit.request.bootstrapServers={{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
{{- else -}}
blueprintsprocessor.messageproducer.self-service-api.audit.request.bootstrapServers={{ .Values.kafkaAuditRequest.bootstrapServers }}
{{- end }}
blueprintsprocessor.messageproducer.self-service-api.audit.request.clientId={{ .Values.kafkaAuditRequest.clientId }}
blueprintsprocessor.messageproducer.self-service-api.audit.request.topic={{ .Values.kafkaAuditRequest.topic }}
-{{- if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
+{{ if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
# SCRAM
blueprintsprocessor.messageproducer.self-service-api.audit.request.scramUsername={{ include "common.release" . }}-{{ .Values.cdsKafkaUser }}
blueprintsprocessor.messageproducer.self-service-api.audit.request.scramPassword=${JAAS_PASS}
@@ -161,14 +165,14 @@ blueprintsprocessor.messageproducer.self-service-api.audit.request.scramPassword
## Audit response
blueprintsprocessor.messageproducer.self-service-api.audit.response.type={{ .Values.kafkaAuditResponse.type }}
-{{- if eq .Values.useStrimziKafka true }}
+{{ if eq .Values.useStrimziKafka true }}
blueprintsprocessor.messageproducer.self-service-api.audit.response.bootstrapServers={{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
{{- else -}}
blueprintsprocessor.messageproducer.self-service-api.audit.response.bootstrapServers={{ .Values.kafkaAuditRequest.bootstrapServers }}
{{- end }}
blueprintsprocessor.messageproducer.self-service-api.audit.response.clientId={{ .Values.kafkaAuditResponse.clientId }}
blueprintsprocessor.messageproducer.self-service-api.audit.response.topic={{ .Values.kafkaAuditResponse.topic }}
-{{- if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
+{{ if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
# SCRAM
blueprintsprocessor.messageproducer.self-service-api.audit.response.scramUsername={{ include "common.release" . }}-{{ .Values.cdsKafkaUser }}
blueprintsprocessor.messageproducer.self-service-api.audit.response.scramPassword=${JAAS_PASS}
@@ -194,7 +198,7 @@ endpoints.user.name=eHbVUbJAj4AG2522cSbrOQ==
endpoints.user.password=eHbVUbJAj4AG2522cSbrOQ==
#BaseUrls for health check blueprint processor services
-blueprintprocessor.healthcheck.baseUrl=http://localhost:8080/
+blueprintprocessor.healthcheck.baseUrl=http://cds-blueprints-processor-http:8080/
blueprintprocessor.healthcheck.mapping-service-name-with-service-link=[Execution service,/api/v1/execution-service/health-check],[Resources service,/api/v1/resources/health-check],[Template service,/api/v1/template/health-check]
#BaseUrls for health check Cds Listener services