Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[CPS] Updating permit-uri config
[oom.git]
/
kubernetes
/
cps
/
components
/
ncmp-dmi-plugin
/
resources
/
config
/
application-helm.yml
diff --git
a/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
b/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
index
1c15a2d
..
2b68b6c
100644
(file)
--- a/
kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
+++ b/
kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
@@
-37,7
+37,7
@@
sdnc:
security:
# comma-separated uri patterns which do not require authorization
security:
# comma-separated uri patterns which do not require authorization
- permit-uri: /
manage/**,/swagger-ui/**,/swagger-resource
s/**,/v3/api-docs
+ permit-uri: /
actuator/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-doc
s/**,/v3/api-docs
auth:
username: ${DMI_PLUGIN_USERNAME}
password: ${DMI_PLUGIN_PASSWORD}
auth:
username: ${DMI_PLUGIN_USERNAME}
password: ${DMI_PLUGIN_PASSWORD}
@@
-49,11
+49,19
@@
logging:
onap:
cps: {{ .Values.logging.cps }}
onap:
cps: {{ .Values.logging.cps }}
+{{- with (first .Values.kafkaUser.acls) }}
+spring.kafka.consumer.group-id: {{ .name }}
+{{- end }}
spring.kafka.bootstrap-servers: {{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
spring.kafka.security.protocol: SASL_PLAINTEXT
spring.kafka.bootstrap-servers: {{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
spring.kafka.security.protocol: SASL_PLAINTEXT
-spring.kafka.properties.sasl.mechanism:
SCRAM-SHA-512
+spring.kafka.properties.sasl.mechanism:
{{ .Values.kafkaUser.authenticationType | upper }}
spring.kafka.properties.sasl.jaas.config: ${SASL_JAAS_CONFIG}
spring.kafka.properties.sasl.jaas.config: ${SASL_JAAS_CONFIG}
+# Kafka Topics
+{{- if .Values.topics.config }}
+{{ toYaml .Values.topics.config | nindent 2 }}
+{{- end }}
+
{{- if .Values.config.additional }}
{{ toYaml .Values.config.additional | nindent 2 }}
{{- end }}
{{- if .Values.config.additional }}
{{ toYaml .Values.config.additional | nindent 2 }}
{{- end }}