diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2019-04-30 19:17:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-30 19:17:52 +0000 |
| commit | 354afbbf205d4c7e34337d7af184560882966d91 (patch) | |
| tree | c3c7d813d64a6451b5630ab02183abe0727cde02 /kubernetes/sdc/charts/sdc-wfd-be | |
| parent | d9054f9a949d5a5842818ec51731f9889028e06f (diff) | |
| parent | 35f83f5ba9cf0e7053160710fa18d73156bdba66 (diff) | |
Merge "Upgrade SDC to use common Cassandra Cluster"
Diffstat (limited to 'kubernetes/sdc/charts/sdc-wfd-be')
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-be/values.yaml | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml index bb96d342f7..0bf1bf5d31 100644 --- a/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml +++ b/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml @@ -73,7 +73,7 @@ spec: - name: JAVA_OPTIONS value: {{ .Values.config.javaOptions }} - name: CS_HOSTS - value: "{{ .Values.config.cassandraHosts }}" + value: "{{ .Values.global.cassandra.serviceName }}" - name: CS_PORT value: "{{ .Values.config.cassandraClientPort }}" - name: CS_AUTHENTICATE diff --git a/kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml b/kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml index 38f526d215..90ff1b46ba 100644 --- a/kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml +++ b/kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml @@ -54,7 +54,7 @@ spec: imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: CS_HOST - value: "sdc-cs" + value: "{{ .Values.global.cassandra.serviceName }}" - name: CS_PORT value: "{{ .Values.config.cassandraThriftClientPort }}" - name: CS_AUTHENTICATE @@ -67,4 +67,4 @@ spec: secretKeyRef: {name: {{ .Release.Name }}-sdc-cs-secrets, key: sdc_password} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" -{{ end }}
\ No newline at end of file +{{ end }} diff --git a/kubernetes/sdc/charts/sdc-wfd-be/values.yaml b/kubernetes/sdc/charts/sdc-wfd-be/values.yaml index 63554369ed..8737b33190 100644 --- a/kubernetes/sdc/charts/sdc-wfd-be/values.yaml +++ b/kubernetes/sdc/charts/sdc-wfd-be/values.yaml @@ -19,7 +19,7 @@ global: nodePortPrefix: 302 readinessRepository: oomk8s - readinessImage: readiness-check:2.0.0 + readinessImage: readiness-check:2.0.2 loggingRepository: docker.elastic.co loggingImage: beats/filebeat:5.5.0 @@ -41,7 +41,6 @@ initJob: config: javaOptions: "-Xdebug -agentlib:jdwp=transport=dt_socket,address=7001,server=y,suspend=n -Xmx1536m -Xms1536m" cassandraAuthenticationEnabled: true - cassandraHosts: sdc-cs cassandraThriftClientPort: 9160 cassandraClientPort: 9042 sdcProtocol: HTTP |