Merge "[DCAEGEN2] Move ves-openapi-manager to dcaegen2-services"

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b15de0..3c438a0 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,9 @@ stages:
 
 cla_authors:
   stage: linting
-  image: bitnami/git:2
+  image:
+    name: bitnami/git:2
+    entrypoint: [""]
   script:
     - . .ci/common.sh
     - title "Running cla authors retrieval..."
@@ -34,7 +36,9 @@ cla_authors:
 
 pylint:
   stage: linting
-  image: cytopia/pylint
+  image:
+    name: cytopia/pylint
+    entrypoint: [""]
   script:
     - . .ci/common.sh
     - title "Running pylint check..."
@@ -52,7 +56,9 @@ pylint:
 
 commit-message:
   stage: linting
-  image: jorisroovers/gitlint:0.16.0
+  image:
+    name: jorisroovers/gitlint:0.16.0
+    entrypoint: [""]
   script:
     - . .ci/common.sh
     - title "*** Running gitlint..."
@@ -67,7 +73,9 @@ commit-message:
 
 trailing-whitespaces:
   stage: linting
-  image: alpine/git:v2.24.1
+  image:
+    name: alpine/git:v2.24.1
+    entrypoint: [""]
   script:
     - . .ci/common.sh
     - title "Running trailing whitespaces check..."
@@ -81,7 +89,9 @@ trailing-whitespaces:
 
 tabs:
   stage: linting
-  image: alpine/git:v2.24.1
+  image:
+    name: alpine/git:v2.24.1
+    entrypoint: [""]
   script:
     - . .ci/common.sh
     - title "Running tabs check..."
@@ -95,7 +105,9 @@ tabs:
 
 documentation:doc8:
   stage: linting
-  image: testthedocs/ttd-doc8
+  image:
+    name: testthedocs/ttd-doc8
+    entrypoint: [""]
   script:
     - . .ci/common.sh
     - title "Running doc8 check..."
@@ -113,7 +125,9 @@ documentation:doc8:
 
 documentation:link-check:
   stage: linting
-  image: python:3.7
+  image:
+    name: python:3.7
+    entrypoint: [""]
   script:
     - . .ci/common.sh
     - pip install -r requirements.txt
@@ -134,7 +148,9 @@ documentation:link-check:
 
 documentation:spelling:
   stage: linting
-  image: python:3.7
+  image:
+    name: python:3.7
+    entrypoint: [""]
   script:
     - . .ci/common.sh
     - apt-get update
@@ -158,7 +174,9 @@ documentation:spelling:
 
 bashisms:
   stage: linting
-  image: manabu/checkbashisms-docker
+  image:
+    name: manabu/checkbashisms-docker
+    entrypoint: [""]
   script:
     - . .ci/common.sh
     - title "Running bashisms check..."
@@ -175,7 +193,9 @@ helm:fast:
   services:
     - name: bitnami/chartmuseum:latest
       alias: chartmuseum
-  image: alpine/helm:3.6.3
+  image:
+    name: alpine/helm:3.6.3
+    entrypoint: [""]
   variables:
     SKIP_LINT: "TRUE"
   script:
@@ -202,7 +222,9 @@ helm:full:
   services:
     - name: bitnami/chartmuseum:latest
       alias: chartmuseum
-  image: alpine/helm:3.6.3
+  image:
+    name: alpine/helm:3.6.3
+    entrypoint: [""]
   script:
     - . .ci/common.sh
     - apk add --no-cache make
@@ -226,7 +248,9 @@ helm:full:
 
 documentation:
   stage: build
-  image: python:3.7
+  image:
+    name: python:3.7
+    entrypoint: [""]
   script:
     - . .ci/common.sh
     - apt-get update
@@ -252,7 +276,9 @@ documentation:
 
 gating:launch:
   stage: test
-  image: busybox
+  image:
+    name: busybox
+    entrypoint: [""]
   script:
     - . .ci/common.sh
     - title "Launching request for a gate"

diff --git a/kubernetes/common/certInitializer/templates/job.yaml b/kubernetes/common/certInitializer/templates/job.yaml
index 2acb423..84a3e87 100644 (file)
--- a/kubernetes/common/certInitializer/templates/job.yaml
+++ b/kubernetes/common/certInitializer/templates/job.yaml
@@ -25,6 +25,8 @@ spec:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
       initContainers: {{ include "common.certInitializer.initContainer" (dict "dot" . "initRoot" .Values) | nindent 6 }}
+      imagePullSecrets:
+      - name: "{{ include "common.namespace" . }}-docker-registry-key"
       containers:
       - name: create-tls-secret
         command:

diff --git a/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh b/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh
index 94c95d6..a538238 100755 (executable)
--- a/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh
+++ b/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh
@@ -49,6 +49,8 @@ configureEjbca() {
     ejbca.sh roles changerule "Certificate Update Admin" /endentityprofilesrules/Custom_EndEntity/ ACCEPT
     ejbca.sh roles changerule "Certificate Update Admin" /ra_functionality/edit_end_entity/ ACCEPT
     ejbca.sh roles addrolemember "Certificate Update Admin" ManagementCA WITH_ORGANIZATION --value "{{ .Values.cmpv2Config.global.certificate.default.subject.organization }}"
+    # workarround to exit successfully, as a reexecution of "addrolemember" returns an error
+    exit 0
 }
 
 

diff --git a/kubernetes/policy/Chart.yaml b/kubernetes/policy/Chart.yaml
index 54e2103..52c1b86 100755 (executable)
--- a/kubernetes/policy/Chart.yaml
+++ b/kubernetes/policy/Chart.yaml
@@ -67,6 +67,14 @@ dependencies:
     version: ~10.x-0
     repository: 'file://components/policy-clamp-cl-k8s-ppnt'
     condition: policy-clamp-cl-k8s-ppnt.enabled
+  - name: policy-clamp-cl-http-ppnt
+    version: ~10.x-0
+    repository: 'file://components/policy-clamp-cl-http-ppnt'
+    condition: policy-clamp-cl-http-ppnt.enabled
+  - name: policy-clamp-cl-pf-ppnt
+    version: ~10.x-0
+    repository: 'file://components/policy-clamp-cl-pf-ppnt'
+    condition: policy-clamp-cl-pf-ppnt.enabled
   - name: policy-clamp-cl-runtime
     version: ~10.x-0
     repository: 'file://components/policy-clamp-cl-runtime'

diff --git a/kubernetes/policy/components/policy-apex-pdp/values.yaml b/kubernetes/policy/components/policy-apex-pdp/values.yaml
index 3318a19..48e6802 100755 (executable)
--- a/kubernetes/policy/components/policy-apex-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/values.yaml
@@ -49,7 +49,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-apex-pdp:2.6.1
+image: onap/policy-apex-pdp:2.7.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-api/values.yaml b/kubernetes/policy/components/policy-api/values.yaml
index 43ec1d7..e037c64 100755 (executable)
--- a/kubernetes/policy/components/policy-api/values.yaml
+++ b/kubernetes/policy/components/policy-api/values.yaml
@@ -78,7 +78,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-api:2.5.1
+image: onap/policy-api:2.6.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-clamp-be/values.yaml b/kubernetes/policy/components/policy-clamp-be/values.yaml
index 35011de..85e97b9 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-be/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-be/values.yaml
@@ -70,7 +70,7 @@ secrets:
 flavor: small
 
 # application image
-image: onap/policy-clamp-backend:6.1.3
+image: onap/policy-clamp-backend:6.2.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-cl-http-ppnt/values.yaml
index 6ea647e..44535c9 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-cl-http-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-http-ppnt/values.yaml
@@ -65,7 +65,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-cl-http-ppnt:6.1.3
+image: onap/policy-clamp-cl-http-ppnt:6.2.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml
index f98fce1..701536a 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-k8s-ppnt/values.yaml
@@ -72,7 +72,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-cl-k8s-ppnt:6.1.3
+image: onap/policy-clamp-cl-k8s-ppnt:6.2.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/values.yaml
index a831da8..ef8a7c0 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-pf-ppnt/values.yaml
@@ -77,7 +77,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-cl-pf-ppnt:6.1.3
+image: onap/policy-clamp-cl-pf-ppnt:6.2.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/resources/config/clRuntimeParameters.yaml b/kubernetes/policy/components/policy-clamp-cl-runtime/resources/config/clRuntimeParameters.yaml
index 250e912..157db83 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/resources/config/clRuntimeParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-runtime/resources/config/clRuntimeParameters.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2021 Nordix Foundation. All rights reserved.
+#   Copyright (C) 2021-2022 Nordix Foundation. All rights reserved.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -24,6 +24,16 @@ spring:
   http:
     converters:
       preferred-json-mapper: gson
+  datasource:
+    url: jdbc:mariadb://{{ .Values.db.service.name }}:{{ .Values.db.service.internalPort }}/controlloop
+    driverClassName: org.mariadb.jdbc.Driver
+    username: ${SQL_USER}
+    password: ${SQL_PASSWORD}
+    hikari:
+      connectionTimeout: 30000
+      idleTimeout: 600000
+      maxLifetime: 1800000
+      maximumPoolSize: 10
 
 security:
   enable-csrf: false
@@ -47,6 +57,7 @@ runtime:
     updateParameters:
       maxRetryCount: 3
       maxWaitMs: 100000
+  databasePlatform: org.eclipse.persistence.platform.database.MySQLPlatform
   databaseProviderParameters:
     name: PolicyProviderParameterGroup
     implementation: org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl

diff --git a/kubernetes/policy/components/policy-clamp-cl-runtime/values.yaml b/kubernetes/policy/components/policy-clamp-cl-runtime/values.yaml
index c0044e2..59d7d31 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-cl-runtime/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-cl-runtime/values.yaml
@@ -78,7 +78,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-clamp-cl-runtime:6.1.3
+image: onap/policy-clamp-cl-runtime:6.2.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-clamp-fe/values.yaml b/kubernetes/policy/components/policy-clamp-fe/values.yaml
index e558741..80f4099 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-fe/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-fe/values.yaml
@@ -60,7 +60,7 @@ subChartsOnly:
 flavor: small
 
 # application image
-image: onap/policy-clamp-frontend:6.1.3
+image: onap/policy-clamp-frontend:6.2.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-distribution/values.yaml b/kubernetes/policy/components/policy-distribution/values.yaml
index ef676bb..42caed4 100755 (executable)
--- a/kubernetes/policy/components/policy-distribution/values.yaml
+++ b/kubernetes/policy/components/policy-distribution/values.yaml
@@ -67,7 +67,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-distribution:2.6.1
+image: onap/policy-distribution:2.7.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml
index 4d7c0f2..411855e 100755 (executable)
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -35,7 +35,7 @@ secrets:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pdpd-cl:1.9.1
+image: onap/policy-pdpd-cl:1.10.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-gui/values.yaml b/kubernetes/policy/components/policy-gui/values.yaml
index a1810d3..6ee7715 100644 (file)
--- a/kubernetes/policy/components/policy-gui/values.yaml
+++ b/kubernetes/policy/components/policy-gui/values.yaml
@@ -63,7 +63,7 @@ subChartsOnly:
 flavor: small
 
 # application image
-image: onap/policy-gui:2.1.1
+image: onap/policy-gui:2.2.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-pap/values.yaml b/kubernetes/policy/components/policy-pap/values.yaml
index e7db99e..a31de71 100755 (executable)
--- a/kubernetes/policy/components/policy-pap/values.yaml
+++ b/kubernetes/policy/components/policy-pap/values.yaml
@@ -92,7 +92,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-pap:2.5.1
+image: onap/policy-pap:2.6.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/components/policy-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
index 2007ab2..718c222 100755 (executable)
--- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
@@ -83,7 +83,7 @@ certInitializer:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-xacml-pdp:2.5.1
+image: onap/policy-xacml-pdp:2.6.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/templates/job.yaml b/kubernetes/policy/templates/job.yaml
index d781a63..d59b5fe 100755 (executable)
--- a/kubernetes/policy/templates/job.yaml
+++ b/kubernetes/policy/templates/job.yaml
@@ -73,7 +73,7 @@ spec:
 {{ include "common.resources" . }}
       containers:
       - name: {{ include "common.release" . }}-policy-galera-db-migrator
-        image: {{ .Values.repository }}/{{ .Values.dbmigrator.image }}
+        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.dbmigrator.image }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
         - mountPath: /dbcmd-config/db_migrator_policy_init.sh

diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index 0449648..7b11692 100644 (file)
--- 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 5b4d631..0789ee3 100644 (file)
--- 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 fb849b9..4a8388a 100644 (file)
--- 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 e00475a..2ac9c7f 100644 (file)
--- 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 c8edb29..d92b42a 100644 (file)
--- 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 d8cc670..3ed98fe 100644 (file)
--- 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 343bda8..1cfcad4 100644 (file)
--- 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 f7b0cfa..da3df90 100644 (file)
--- 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 8b61567..d5e4eaa 100644 (file)
--- 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

diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index bd76b97..3b03205 100755 (executable)
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -9,7 +9,7 @@
 
     "default_attributes": {
         "disableHttp": {{ .Values.global.security.disableHttp }},
-        "CS_VIP": "{{.Values.global.cassandra.serviceName}}.{{include "common.namespace" .}}",
+        "CS_VIP": "{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}",
         "BE_VIP": "sdc-be.{{include "common.namespace" .}}",
         "ONBOARDING_BE_VIP": "sdc-onboarding-be.{{include "common.namespace" .}}",
         "FE_VIP": "sdc-fe.{{include "common.namespace" .}}",
@@ -37,7 +37,7 @@
         },
         "Nodes": {
             "CS": [
-                "{{.Values.global.cassandra.serviceName}}.{{include "common.namespace" .}}"
+                "{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}"
             ],
             "BE": "sdc-be.{{include "common.namespace" .}}",
             "ONBOARDING_BE": "sdc-onboarding-be.{{include "common.namespace" .}}",
@@ -79,8 +79,8 @@
             "cassandra_user": "asdc_user",
             "cassandra_password": "Aa1234%^!",
             "concurrent_writes": "32",
-            "cluster_name": "{{.Values.global.cassandra.clusterName}}",
-            "datacenter_name": "{{.Values.global.cassandra.dataCenter}}",
+            "cluster_name": "{{.Values.global.sdc_cassandra.clusterName}}",
+            "datacenter_name": "{{.Values.global.sdc_cassandra.dataCenter}}",
             "multithreaded_compaction": "false",
             "cache_dir": "/var/lib/cassandra/saved_caches",
             "log_file": "/var/lib/cassandra/log/system.log",
@@ -89,10 +89,10 @@
             "socket_read_timeout": "20000",
             "socket_connect_timeout": "20000",
             "janusgraph_connection_timeout": "10000",
-            "replication_factor": "{{.Values.global.cassandra.replicaCount}}",
-            "db_cache": "{{.Values.global.cassandra.dbCache}}",
-            "read_consistency_level": "{{.Values.global.cassandra.readConsistencyLevel}}",
-            "write_consistency_level":"{{.Values.global.cassandra.writeConsistencyLevel}}"
+            "replication_factor": "{{.Values.global.sdc_cassandra.replicaCount}}",
+            "db_cache": "{{.Values.global.sdc_cassandra.dbCache}}",
+            "read_consistency_level": "{{.Values.global.sdc_cassandra.readConsistencyLevel}}",
+            "write_consistency_level":"{{.Values.global.sdc_cassandra.writeConsistencyLevel}}"
         },
       "DMAAP": {
          "consumer": {

diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml
index 98b4abe..73e9654 100644 (file)
--- a/kubernetes/sdc/values.yaml
+++ b/kubernetes/sdc/values.yaml
@@ -25,14 +25,15 @@ global:
     keystore_password: PyhrUCFZdXIhWyohWTUhRV5mKFpLYzMx
     wf_external_user_password: S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==
   aafEnabled: true
-  cassandra:
+  sdc_cassandra:
    #This flag allows SDC to instantiate its own cluster, serviceName
-   #should be sdc-cs if this flag is enabled
+   #should be "sdc-cs" if this flag is enabled
    localCluster: false
    #The cassandra service name to connect to (default: shared cassandra service)
    serviceName: cassandra
    #Shared cassandra cluster replicaCount, should be changed if localCluster is enabled
    #to match with its own cluster replica
+   #see "cassandra: replicaCount" in file sdc-cs/values.yaml)
    replicaCount: 3
    dbCache: true
    readConsistencyLevel: ONE
@@ -63,16 +64,6 @@ config:
     workflowUrl: 10.0.2.15
     vnfRepoPort: 8703
 
-#Used only if localCluster is enabled. Instantiates SDC's own cassandra cluster
-cassandra:
-  nameOverride: sdc-cs
-  replicaCount: 1
-  service:
-    name: sdc-cs
-  persistence:
-    mountSubPath: sdc/sdc-cs/CS
-    enabled: true
-
 # dependency / sub-chart configuration
 sdc-wfd:
   enabled: true