diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2021-12-10 08:36:45 +0000 |
|---|---|---|
| committer |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2022-01-12 07:53:19 +0000 |
| commit | fd450c4959d9cb4d4ae18218aa8b4e597139ce56 (patch) | |
| tree | b2441bb12066f58ea1cf927a6aad88335e6b842d /kubernetes/sdc/components/sdc-cs | |
| parent | 0d2cf1aee02c84d5ff262b4ac1d414fdadf5432b (diff) | |
[SDC] Add missing dependency to cassandra chart
In case of "localCluster: true" the cassandra chart will be added
in sdc-cs subchart. Renamed global section to sdc-cassandra.
Additionally serviceAccount is added to
cassandra definition in sdc-cs (see OOM-2905)
Issue-ID: OOM-2899
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: Id943db249a3abd9dbc67e333a05f6c2abd84a810
Diffstat (limited to 'kubernetes/sdc/components/sdc-cs')
| -rw-r--r-- | kubernetes/sdc/components/sdc-cs/Chart.yaml | 8 | ||||
| -rw-r--r-- | kubernetes/sdc/components/sdc-cs/templates/job.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdc/components/sdc-cs/values.yaml | 15 |
3 files changed, 23 insertions, 2 deletions
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 |