summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdc/components
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/sdc/components')
-rw-r--r--kubernetes/sdc/components/sdc-be/values.yaml2
-rw-r--r--kubernetes/sdc/components/sdc-cs/Chart.yaml8
-rw-r--r--kubernetes/sdc/components/sdc-cs/templates/job.yaml2
-rw-r--r--kubernetes/sdc/components/sdc-cs/values.yaml15
-rw-r--r--kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml2
-rw-r--r--kubernetes/sdc/components/sdc-onboarding-be/values.yaml2
-rw-r--r--kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml2
-rw-r--r--kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml2
-rw-r--r--kubernetes/sdc/components/sdc-wfd-be/values.yaml2
9 files changed, 29 insertions, 8 deletions
diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index 0449648b27..7b11692d4b 100644
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -19,7 +19,7 @@
global:
nodePortPrefix: 302
aafEnabled: true
- cassandra:
+ sdc_cassandra:
#This flag allows SDC to instantiate its own cluster, serviceName
#should be sdc-cs if this flag is enabled
localCluster: false
diff --git a/kubernetes/sdc/components/sdc-cs/Chart.yaml b/kubernetes/sdc/components/sdc-cs/Chart.yaml
index 5b4d631889..0789ee32b2 100644
--- a/kubernetes/sdc/components/sdc-cs/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-cs/Chart.yaml
@@ -30,3 +30,11 @@ dependencies:
- name: serviceAccount
version: ~10.x-0
repository: '@local'
+ - name: cassandra
+ version: ~10.x-0
+ # local reference to common chart, as it is
+ # a part of this chart's package and will not
+ # be published independently to a repo (at this point)
+ repository: '@local'
+ condition: global.sdc_cassandra.localCluster
+
diff --git a/kubernetes/sdc/components/sdc-cs/templates/job.yaml b/kubernetes/sdc/components/sdc-cs/templates/job.yaml
index fb849b9f25..4a8388ada4 100644
--- a/kubernetes/sdc/components/sdc-cs/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-cs/templates/job.yaml
@@ -42,7 +42,7 @@ spec:
- /app/ready.py
args:
- --container-name
- {{- if .Values.global.cassandra.localCluster }}
+ {{- if .Values.global.sdc_cassandra.localCluster }}
- sdc-cs
{{- else }}
- cassandra
diff --git a/kubernetes/sdc/components/sdc-cs/values.yaml b/kubernetes/sdc/components/sdc-cs/values.yaml
index e00475adc4..2ac9c7f074 100644
--- a/kubernetes/sdc/components/sdc-cs/values.yaml
+++ b/kubernetes/sdc/components/sdc-cs/values.yaml
@@ -21,7 +21,7 @@ global:
readinessImage: onap/oom/readiness:3.0.1
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
- cassandra:
+ sdc_cassandra:
#This flag allows SDC to instantiate its own cluster, serviceName
#should be sdc-cs if this flag is enabled
localCluster: false
@@ -36,6 +36,19 @@ global:
#################################################################
# Application configuration defaults.
#################################################################
+
+#Used only if localCluster is enabled. Instantiates SDC's own cassandra cluster
+cassandra:
+ nameOverride: sdc-cs
+ replicaCount: 3
+ service:
+ name: sdc-cs
+ serviceAccount:
+ nameOverride: sdc-cs
+ persistence:
+ mountSubPath: sdc/sdc-cs/CS
+ enabled: true
+
# application image
repository: nexus3.onap.org:10001
image: onap/sdc-cassandra:1.9.5
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml b/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
index c8edb29a28..d92b42a09c 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
@@ -82,7 +82,7 @@ spec:
valueFrom:
secretKeyRef: {name: {{ include "common.release" . }}-sdc-cs-secrets, key: cs_password}
- name: CS_HOST_IP
- value: "{{ .Values.global.cassandra.serviceName }}"
+ value: "{{ .Values.global.sdc_cassandra.serviceName }}"
resources:
limits:
cpu: 800m
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
index d8cc670bdf..3ed98fef3f 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
@@ -20,7 +20,7 @@ global:
nodePortPrefix: 302
aafEnabled: true
persistence: {}
- cassandra:
+ sdc_cassandra:
#This flag allows SDC to instantiate its own cluster, serviceName
#should be sdc-cs if this flag is enabled
localCluster: false
diff --git a/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
index 343bda8ff9..1cfcad4f56 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
@@ -109,7 +109,7 @@ spec:
- name: JAVA_OPTIONS
value: {{ .Values.config.javaOptions }}
- name: CS_HOSTS
- value: "{{ .Values.global.cassandra.serviceName }}"
+ value: "{{ .Values.global.sdc_cassandra.serviceName }}"
- name: CS_PORT
value: "{{ .Values.config.cassandraClientPort }}"
- name: CS_AUTHENTICATE
diff --git a/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml b/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
index f7b0cfa04b..da3df9062f 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/templates/job.yaml
@@ -65,7 +65,7 @@ spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: CS_HOST
- value: "{{ .Values.global.cassandra.serviceName }}"
+ value: "{{ .Values.global.sdc_cassandra.serviceName }}"
- name: CS_PORT
value: "{{ .Values.config.cassandraClientPort }}"
- name: CS_AUTHENTICATE
diff --git a/kubernetes/sdc/components/sdc-wfd-be/values.yaml b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
index 8b61567114..d5e4eaaebb 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
@@ -19,7 +19,7 @@
global:
nodePortPrefix: 302
aafEnabled: true
- cassandra:
+ sdc_cassandra:
#This flag allows SDC to instantiate its own cluster, serviceName
#should be sdc-cs if this flag is enabled
localCluster: false