diff options
-rw-r--r-- | kubernetes/sdnc/templates/statefulset.yaml | 22 | ||||
-rw-r--r-- | kubernetes/sdnc/values.yaml | 19 |
2 files changed, 39 insertions, 2 deletions
diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index fc584d8e25..f53c41c0f5 100644 --- a/kubernetes/sdnc/templates/statefulset.yaml +++ b/kubernetes/sdnc/templates/statefulset.yaml @@ -121,7 +121,6 @@ spec: value: "{{ .Values.config.sdnr.oauth.odluxRbac.enabled | default "true" }}" {{ end }} - volumeMounts: - mountPath: /config-input name: config-input @@ -311,6 +310,27 @@ spec: value: "{{ .Values.config.sdnr.oauth.enabled | default "false" }}" - name: SDNR_NETCONF_CALLHOME_ENABLED value: "{{ .Values.config.sdnr.netconfCallHome.enabled | default "false" }}" + - name: SDNR_VES_COLLECTOR_ENABLED + value: "{{ .Values.config.sdnr.vesCollector.enabled }}" + - name: SDNR_VES_COLLECTOR_TLS_ENABLED + value: "{{ .Values.config.sdnr.vesCollector.tls.enabled }}" + - name: SDNR_VES_COLLECTOR_TRUST_ALL_CERTS + value: "{{ .Values.config.sdnr.vesCollector.trustAllCertificates }}" + - name: SDNR_VES_COLLECTOR_IP + value: "{{ .Values.config.sdnr.vesCollector.address }}" + - name: SDNR_VES_COLLECTOR_PORT + value: "{{ .Values.config.sdnr.vesCollector.port }}" + - name: SDNR_VES_COLLECTOR_VERSION + value: "{{ .Values.config.sdnr.vesCollector.version | default "v7" }}" + - name: SDNR_VES_COLLECTOR_REPORTING_ENTITY_NAME + value: "{{ .Values.config.sdnr.vesCollector.reportingEntityName | default "ONAP SDN-R" }}" + - name: SDNR_VES_COLLECTOR_EVENTLOG_MSG_DETAIL + value: "{{ .Values.config.sdnr.vesCollector.eventLogMsgDetail | default "SHORT" }}" + - name: SDNR_VES_COLLECTOR_USERNAME + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "ves-collector-secret" "key" "login") | indent 12 }} + - name: SDNR_VES_COLLECTOR_PASSWORD + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "ves-collector-secret" "key" "password") | indent 12 }} + volumeMounts: {{ include "common.certInitializer.volumeMount" . | indent 10 }} {{- if .Values.global.cmpv2Enabled }} diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 15a8045d2f..cbf5678283 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -181,7 +181,10 @@ secrets: externalSecret: '{{ ternary (tpl (default "" .Values.config.sdnr.oauth.providersSecrets.keycloakExternalSecret) .) "oauth-disabled" .Values.config.sdnr.oauth.enabled }}' password: '{{ .Values.config.sdnr.oauth.providersSecrets.keycloak }}' passwordPolicy: required - + - uid: ves-collector-secret + type: basicAuth + login: '{{ .Values.config.sdnr.vesCollector.username }}' + password: '{{ .Values.config.sdnr.vesCollector.password }}' ################################################################# # Certificates ################################################################# @@ -261,6 +264,7 @@ config: ansibleUser: sdnc ansiblePassword: sdnc # ansibleCredsExternalSecret: some secret + dbSdnctlDatabase: &sdncDbName sdnctl enableClustering: true sdncHome: /opt/onap/sdnc @@ -354,6 +358,18 @@ config: title: ONAP Keycloak Provider roleMapping: mykeycloak: admin + vesCollector: + enabled: false + tls: + enabled: true + trustAllCertificates: false + username: sample1 + password: sample1 + address: dcae-ves-collector.onap + port: 8443 + version: v7 + reportingEntityName: ONAP SDN-R + eventLogMsgDetail: SHORT # dependency / sub-chart configuration certInitializer: @@ -501,6 +517,7 @@ elasticsearch: dedicatednode: "no" nameOverride: *elasticSearchName cluster_name: sdnrdb-cluster + # enable sdnc-web: enabled: true |