aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-21 22:29:17 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-11-24 13:56:53 +0100
commit503b229517a752ce1ebc5950deb823a4b428148e (patch)
tree3f0db8508451351dfa3b3816dd3c94c3af6b029f /kubernetes
parentd73cd28ebecb469d0fdad1a5a85ed9c31570037b (diff)
[CDS] Uses new tpls for repos / images
This commit makes CDS chart to use the new generator for repositories and images. As new templates doesn't work well with "sub charts", we move also subcharts to components folder. Issue-ID: OOM-2364 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I8156c8b568054b7eacf333196d877e12f7a52216
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/cds/Makefile51
-rw-r--r--kubernetes/cds/components/Makefile51
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/Chart.yaml (renamed from kubernetes/cds/charts/cds-blueprints-processor/Chart.yaml)0
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/requirements.yaml (renamed from kubernetes/cds/charts/cds-blueprints-processor/requirements.yaml)3
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/resources/config/ONAP_RootCA.cer (renamed from kubernetes/cds/charts/cds-blueprints-processor/resources/config/ONAP_RootCA.cer)0
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties (renamed from kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties)0
-rw-r--r--kubernetes/cds/components/cds-blueprints-processor/resources/config/error-messages_en.properties (renamed from kubernetes/cds/charts/cds-blueprints-processor/resources/config/error-messages_en.properties)0
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/resources/config/hazelcast.yaml (renamed from kubernetes/cds/charts/cds-blueprints-processor/resources/config/hazelcast.yaml)0
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/resources/config/logback.xml (renamed from kubernetes/cds/charts/cds-blueprints-processor/resources/config/logback.xml)0
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/templates/configmap.yaml (renamed from kubernetes/cds/charts/cds-blueprints-processor/templates/configmap.yaml)0
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml (renamed from kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml)8
-rw-r--r--kubernetes/cds/components/cds-blueprints-processor/templates/ingress.yaml (renamed from kubernetes/cds/charts/cds-blueprints-processor/templates/ingress.yaml)0
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/templates/pv.yaml (renamed from kubernetes/cds/charts/cds-blueprints-processor/templates/pv.yaml)0
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/templates/pvc.yaml (renamed from kubernetes/cds/charts/cds-blueprints-processor/templates/pvc.yaml)0
-rw-r--r--kubernetes/cds/components/cds-blueprints-processor/templates/secrets.yaml (renamed from kubernetes/cds/charts/cds-blueprints-processor/templates/secrets.yaml)0
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/templates/service.yaml (renamed from kubernetes/cds/charts/cds-blueprints-processor/templates/service.yaml)0
-rwxr-xr-xkubernetes/cds/components/cds-blueprints-processor/values.yaml (renamed from kubernetes/cds/charts/cds-blueprints-processor/values.yaml)14
-rwxr-xr-xkubernetes/cds/components/cds-command-executor/Chart.yaml (renamed from kubernetes/cds/charts/cds-command-executor/Chart.yaml)0
-rwxr-xr-x[-rw-r--r--]kubernetes/cds/components/cds-command-executor/requirements.yaml (renamed from kubernetes/cds/charts/cds-ui/requirements.yaml)3
-rwxr-xr-xkubernetes/cds/components/cds-command-executor/templates/deployment.yaml (renamed from kubernetes/cds/charts/cds-command-executor/templates/deployment.yaml)4
-rwxr-xr-xkubernetes/cds/components/cds-command-executor/templates/service.yaml (renamed from kubernetes/cds/charts/cds-command-executor/templates/service.yaml)0
-rwxr-xr-xkubernetes/cds/components/cds-command-executor/values.yaml (renamed from kubernetes/cds/charts/cds-command-executor/values.yaml)7
-rwxr-xr-xkubernetes/cds/components/cds-py-executor/Chart.yaml (renamed from kubernetes/cds/charts/cds-py-executor/Chart.yaml)0
-rwxr-xr-xkubernetes/cds/components/cds-py-executor/requirements.yaml (renamed from kubernetes/cds/charts/cds-py-executor/requirements.yaml)3
-rwxr-xr-xkubernetes/cds/components/cds-py-executor/templates/deployment.yaml (renamed from kubernetes/cds/charts/cds-py-executor/templates/deployment.yaml)2
-rw-r--r--kubernetes/cds/components/cds-py-executor/templates/secret.yaml (renamed from kubernetes/cds/charts/cds-py-executor/templates/secret.yaml)0
-rwxr-xr-xkubernetes/cds/components/cds-py-executor/templates/service.yaml (renamed from kubernetes/cds/charts/cds-py-executor/templates/service.yaml)0
-rwxr-xr-xkubernetes/cds/components/cds-py-executor/values.yaml (renamed from kubernetes/cds/charts/cds-py-executor/values.yaml)7
-rwxr-xr-xkubernetes/cds/components/cds-sdc-listener/Chart.yaml (renamed from kubernetes/cds/charts/cds-sdc-listener/Chart.yaml)0
-rwxr-xr-xkubernetes/cds/components/cds-sdc-listener/requirements.yaml (renamed from kubernetes/cds/charts/cds-sdc-listener/requirements.yaml)3
-rw-r--r--kubernetes/cds/components/cds-sdc-listener/resources/config/application.yaml (renamed from kubernetes/cds/charts/cds-sdc-listener/resources/config/application.yaml)0
-rw-r--r--kubernetes/cds/components/cds-sdc-listener/resources/config/logback.xml (renamed from kubernetes/cds/charts/cds-sdc-listener/resources/config/logback.xml)0
-rw-r--r--kubernetes/cds/components/cds-sdc-listener/templates/configmap.yaml (renamed from kubernetes/cds/charts/cds-sdc-listener/templates/configmap.yaml)0
-rw-r--r--kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml (renamed from kubernetes/cds/charts/cds-sdc-listener/templates/deployment.yaml)4
-rw-r--r--kubernetes/cds/components/cds-sdc-listener/templates/service.yaml (renamed from kubernetes/cds/charts/cds-sdc-listener/templates/service.yaml)0
-rw-r--r--kubernetes/cds/components/cds-sdc-listener/values.yaml (renamed from kubernetes/cds/charts/cds-sdc-listener/values.yaml)7
-rw-r--r--kubernetes/cds/components/cds-ui/Chart.yaml (renamed from kubernetes/cds/charts/cds-ui/Chart.yaml)0
-rw-r--r--[-rwxr-xr-x]kubernetes/cds/components/cds-ui/requirements.yaml (renamed from kubernetes/cds/charts/cds-command-executor/requirements.yaml)3
-rw-r--r--kubernetes/cds/components/cds-ui/templates/deployment.yaml (renamed from kubernetes/cds/charts/cds-ui/templates/deployment.yaml)2
-rw-r--r--kubernetes/cds/components/cds-ui/templates/ingress.yaml (renamed from kubernetes/cds/charts/cds-ui/templates/ingress.yaml)0
-rw-r--r--kubernetes/cds/components/cds-ui/templates/service.yaml (renamed from kubernetes/cds/charts/cds-ui/templates/service.yaml)0
-rw-r--r--kubernetes/cds/components/cds-ui/values.yaml (renamed from kubernetes/cds/charts/cds-ui/values.yaml)3
-rw-r--r--kubernetes/cds/requirements.yaml22
-rw-r--r--kubernetes/cds/values.yaml19
44 files changed, 164 insertions, 52 deletions
diff --git a/kubernetes/cds/Makefile b/kubernetes/cds/Makefile
new file mode 100644
index 0000000000..4c79718d02
--- /dev/null
+++ b/kubernetes/cds/Makefile
@@ -0,0 +1,51 @@
+# Copyright © 2020 Samsung Electronics
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+OUTPUT_DIR := $(ROOT_DIR)/../dist
+PACKAGE_DIR := $(OUTPUT_DIR)/packages
+SECRET_DIR := $(OUTPUT_DIR)/secrets
+
+EXCLUDES := dist resources templates charts docker
+HELM_BIN := helm
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+
+all: $(HELM_CHARTS)
+
+$(HELM_CHARTS):
+ @echo "\n[$@]"
+ @make package-$@
+
+make-%:
+ @if [ -f $*/Makefile ]; then make -C $*; fi
+
+dep-%: make-%
+ @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+ @$(HELM_BIN) repo index $(PACKAGE_DIR)
+
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
diff --git a/kubernetes/cds/components/Makefile b/kubernetes/cds/components/Makefile
new file mode 100644
index 0000000000..f2e7a1fb82
--- /dev/null
+++ b/kubernetes/cds/components/Makefile
@@ -0,0 +1,51 @@
+# Copyright © 2020 Samsung Electronics
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+OUTPUT_DIR := $(ROOT_DIR)/../../dist
+PACKAGE_DIR := $(OUTPUT_DIR)/packages
+SECRET_DIR := $(OUTPUT_DIR)/secrets
+
+EXCLUDES := soHelpers
+HELM_BIN := helm
+HELM_CHARTS := soHelpers $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+
+all: $(HELM_CHARTS)
+
+$(HELM_CHARTS):
+ @echo "\n[$@]"
+ @make package-$@
+
+make-%:
+ @if [ -f $*/Makefile ]; then make -C $*; fi
+
+dep-%: make-%
+ @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+ @$(HELM_BIN) repo index $(PACKAGE_DIR)
+
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/Chart.yaml b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
index 64e3a952bc..64e3a952bc 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/Chart.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/requirements.yaml b/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml
index 72e8b3cd4a..b3805c7e41 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/requirements.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml
@@ -15,4 +15,7 @@
dependencies:
- name: common
version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/ONAP_RootCA.cer b/kubernetes/cds/components/cds-blueprints-processor/resources/config/ONAP_RootCA.cer
index e9a50d7ea0..e9a50d7ea0 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/ONAP_RootCA.cer
+++ b/kubernetes/cds/components/cds-blueprints-processor/resources/config/ONAP_RootCA.cer
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties b/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
index a3d32a9a03..a3d32a9a03 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
+++ b/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/error-messages_en.properties b/kubernetes/cds/components/cds-blueprints-processor/resources/config/error-messages_en.properties
index 0c657f1b4f..0c657f1b4f 100644
--- a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/error-messages_en.properties
+++ b/kubernetes/cds/components/cds-blueprints-processor/resources/config/error-messages_en.properties
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/hazelcast.yaml b/kubernetes/cds/components/cds-blueprints-processor/resources/config/hazelcast.yaml
index 3a3a1ce095..3a3a1ce095 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/hazelcast.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/resources/config/hazelcast.yaml
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/logback.xml b/kubernetes/cds/components/cds-blueprints-processor/resources/config/logback.xml
index 88ac8d98df..88ac8d98df 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/logback.xml
+++ b/kubernetes/cds/components/cds-blueprints-processor/resources/config/logback.xml
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/templates/configmap.yaml b/kubernetes/cds/components/cds-blueprints-processor/templates/configmap.yaml
index 15f611478b..15f611478b 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/templates/configmap.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/templates/configmap.yaml
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml b/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml
index c26d17ed03..f321e54fd1 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml
@@ -69,7 +69,7 @@ spec:
subPath: application.properties
- mountPath: /config
name: processed-config
- image: "{{ .Values.global.envsubstImage }}"
+ image: {{ include "repositoryGenerator.image.envsubst" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
@@ -88,7 +88,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
- name: fix-permission
@@ -97,14 +97,14 @@ spec:
- -R
- 1000:1000
- /opt/app/onap/blueprints/deploy
- image: busybox:latest
+ image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: {{ .Values.persistence.deployedBlueprint }}
name: {{ include "common.fullname" . }}-blueprints
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: APP_CONFIG_HOME
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/templates/ingress.yaml b/kubernetes/cds/components/cds-blueprints-processor/templates/ingress.yaml
index 8f87c68f1e..8f87c68f1e 100644
--- a/kubernetes/cds/charts/cds-blueprints-processor/templates/ingress.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/templates/ingress.yaml
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/templates/pv.yaml b/kubernetes/cds/components/cds-blueprints-processor/templates/pv.yaml
index 6155ee9e28..6155ee9e28 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/templates/pv.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/templates/pv.yaml
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/templates/pvc.yaml b/kubernetes/cds/components/cds-blueprints-processor/templates/pvc.yaml
index 9da36c85e4..9da36c85e4 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/templates/pvc.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/templates/pvc.yaml
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/templates/secrets.yaml b/kubernetes/cds/components/cds-blueprints-processor/templates/secrets.yaml
index 34932b713d..34932b713d 100644
--- a/kubernetes/cds/charts/cds-blueprints-processor/templates/secrets.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/templates/secrets.yaml
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/templates/service.yaml b/kubernetes/cds/components/cds-blueprints-processor/templates/service.yaml
index 5d2e438e1e..5d2e438e1e 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/templates/service.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/templates/service.yaml
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
index 6c5dfbb029..629b8252cc 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
@@ -21,21 +21,12 @@ global:
# with other instances running within the same k8s cluster
nodePortPrefixExt: 304
- # image repositories
- repository: nexus3.onap.org:10001
-
- # readiness check
- readinessImage: onap/oom/readiness:3.0.1
-
# image pull policy
pullPolicy: Always
persistence:
mountPath: /dockerdata-nfs
- # envsusbt
- envsubstImage: dibi/envsubst
-
#This configuration specifies Service and port for SDNC OAM interface
sdncOamService: sdnc-oam
sdncOamPort: 8282
@@ -60,7 +51,6 @@ secrets:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/ccsdk-blueprintsprocessor:1.0.3
pullPolicy: Always
@@ -81,8 +71,8 @@ config:
dbServer: cds-db
dbPort: 3306
dbName: sdnctl
- # dbUser: sdnctl
- # dbPassword: sdnctl
+ dbUser: sdnctl
+ dbPassword: sdnctl
# dbCredsExternalSecret: <some secret name>
# dbRootPassword: password
# dbRootPassExternalSecret
diff --git a/kubernetes/cds/charts/cds-command-executor/Chart.yaml b/kubernetes/cds/components/cds-command-executor/Chart.yaml
index 62fb5629d7..62fb5629d7 100755
--- a/kubernetes/cds/charts/cds-command-executor/Chart.yaml
+++ b/kubernetes/cds/components/cds-command-executor/Chart.yaml
diff --git a/kubernetes/cds/charts/cds-ui/requirements.yaml b/kubernetes/cds/components/cds-command-executor/requirements.yaml
index b33ac701fe..7a0e74bfaf 100644..100755
--- a/kubernetes/cds/charts/cds-ui/requirements.yaml
+++ b/kubernetes/cds/components/cds-command-executor/requirements.yaml
@@ -15,4 +15,7 @@
dependencies:
- name: common
version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-command-executor/templates/deployment.yaml b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
index 053e886347..40238c2513 100755
--- a/kubernetes/cds/charts/cds-command-executor/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
@@ -47,12 +47,12 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.grpc.internalPort }}
diff --git a/kubernetes/cds/charts/cds-command-executor/templates/service.yaml b/kubernetes/cds/components/cds-command-executor/templates/service.yaml
index 2301902f56..2301902f56 100755
--- a/kubernetes/cds/charts/cds-command-executor/templates/service.yaml
+++ b/kubernetes/cds/components/cds-command-executor/templates/service.yaml
diff --git a/kubernetes/cds/charts/cds-command-executor/values.yaml b/kubernetes/cds/components/cds-command-executor/values.yaml
index f7dc4cf427..c9e4354199 100755
--- a/kubernetes/cds/charts/cds-command-executor/values.yaml
+++ b/kubernetes/cds/components/cds-command-executor/values.yaml
@@ -22,12 +22,6 @@ global:
# with other instances running within the same k8s cluster
nodePortPrefix: 302
- # image repositories
- repository: nexus3.onap.org:10001
-
- # readiness check
- readinessImage: onap/oom/readiness:3.0.1
-
# image pull policy
pullPolicy: Always
@@ -38,7 +32,6 @@ global:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/ccsdk-commandexecutor:1.0.3
pullPolicy: Always
diff --git a/kubernetes/cds/charts/cds-py-executor/Chart.yaml b/kubernetes/cds/components/cds-py-executor/Chart.yaml
index 41b43c34a3..41b43c34a3 100755
--- a/kubernetes/cds/charts/cds-py-executor/Chart.yaml
+++ b/kubernetes/cds/components/cds-py-executor/Chart.yaml
diff --git a/kubernetes/cds/charts/cds-py-executor/requirements.yaml b/kubernetes/cds/components/cds-py-executor/requirements.yaml
index 676fe8f6b2..722ecad6bf 100755
--- a/kubernetes/cds/charts/cds-py-executor/requirements.yaml
+++ b/kubernetes/cds/components/cds-py-executor/requirements.yaml
@@ -15,4 +15,7 @@
dependencies:
- name: common
version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-py-executor/templates/deployment.yaml b/kubernetes/cds/components/cds-py-executor/templates/deployment.yaml
index 352b3cfca0..d7b2959fcb 100755
--- a/kubernetes/cds/charts/cds-py-executor/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-py-executor/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
spec:
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
command:
- bash
args:
diff --git a/kubernetes/cds/charts/cds-py-executor/templates/secret.yaml b/kubernetes/cds/components/cds-py-executor/templates/secret.yaml
index 7916b3c233..7916b3c233 100644
--- a/kubernetes/cds/charts/cds-py-executor/templates/secret.yaml
+++ b/kubernetes/cds/components/cds-py-executor/templates/secret.yaml
diff --git a/kubernetes/cds/charts/cds-py-executor/templates/service.yaml b/kubernetes/cds/components/cds-py-executor/templates/service.yaml
index 095d70d179..095d70d179 100755
--- a/kubernetes/cds/charts/cds-py-executor/templates/service.yaml
+++ b/kubernetes/cds/components/cds-py-executor/templates/service.yaml
diff --git a/kubernetes/cds/charts/cds-py-executor/values.yaml b/kubernetes/cds/components/cds-py-executor/values.yaml
index 5bff0be083..8941909db4 100755
--- a/kubernetes/cds/charts/cds-py-executor/values.yaml
+++ b/kubernetes/cds/components/cds-py-executor/values.yaml
@@ -20,12 +20,6 @@ global:
# with other instances running within the same k8s cluster
nodePortPrefix: 302
- # image repositories
- repository: nexus3.onap.org:10001
-
- # readiness check
- readinessImage: onap/oom/readiness:3.0.1
-
# image pull policy
pullPolicy: Always
@@ -36,7 +30,6 @@ global:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/ccsdk-py-executor:1.0.3
pullPolicy: Always
diff --git a/kubernetes/cds/charts/cds-sdc-listener/Chart.yaml b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
index 975923ebbe..975923ebbe 100755
--- a/kubernetes/cds/charts/cds-sdc-listener/Chart.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
diff --git a/kubernetes/cds/charts/cds-sdc-listener/requirements.yaml b/kubernetes/cds/components/cds-sdc-listener/requirements.yaml
index b33ac701fe..7a0e74bfaf 100755
--- a/kubernetes/cds/charts/cds-sdc-listener/requirements.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/requirements.yaml
@@ -15,4 +15,7 @@
dependencies:
- name: common
version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-sdc-listener/resources/config/application.yaml b/kubernetes/cds/components/cds-sdc-listener/resources/config/application.yaml
index b3e95a2a21..b3e95a2a21 100644
--- a/kubernetes/cds/charts/cds-sdc-listener/resources/config/application.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/resources/config/application.yaml
diff --git a/kubernetes/cds/charts/cds-sdc-listener/resources/config/logback.xml b/kubernetes/cds/components/cds-sdc-listener/resources/config/logback.xml
index b48cad75f1..b48cad75f1 100644
--- a/kubernetes/cds/charts/cds-sdc-listener/resources/config/logback.xml
+++ b/kubernetes/cds/components/cds-sdc-listener/resources/config/logback.xml
diff --git a/kubernetes/cds/charts/cds-sdc-listener/templates/configmap.yaml b/kubernetes/cds/components/cds-sdc-listener/templates/configmap.yaml
index 01e1b22ad5..01e1b22ad5 100644
--- a/kubernetes/cds/charts/cds-sdc-listener/templates/configmap.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/templates/configmap.yaml
diff --git a/kubernetes/cds/charts/cds-sdc-listener/templates/deployment.yaml b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
index ab544f0a44..7dca49c761 100644
--- a/kubernetes/cds/charts/cds-sdc-listener/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
@@ -51,12 +51,12 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: APP_CONFIG_HOME
diff --git a/kubernetes/cds/charts/cds-sdc-listener/templates/service.yaml b/kubernetes/cds/components/cds-sdc-listener/templates/service.yaml
index af837f2b3a..af837f2b3a 100644
--- a/kubernetes/cds/charts/cds-sdc-listener/templates/service.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/templates/service.yaml
diff --git a/kubernetes/cds/charts/cds-sdc-listener/values.yaml b/kubernetes/cds/components/cds-sdc-listener/values.yaml
index c830d1d419..105e634408 100644
--- a/kubernetes/cds/charts/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/values.yaml
@@ -19,12 +19,6 @@ global:
# with other instances running within the same k8s cluster
nodePortPrefix: 302
- # image repositories
- repository: nexus3.onap.org:10001
-
- # readiness check
- readinessImage: onap/oom/readiness:3.0.1
-
# image pull policy
pullPolicy: Always
@@ -35,7 +29,6 @@ global:
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
image: onap/ccsdk-sdclistener:1.0.3
name: sdc-listener
pullPolicy: Always
diff --git a/kubernetes/cds/charts/cds-ui/Chart.yaml b/kubernetes/cds/components/cds-ui/Chart.yaml
index 3ed3cf3717..3ed3cf3717 100644
--- a/kubernetes/cds/charts/cds-ui/Chart.yaml
+++ b/kubernetes/cds/components/cds-ui/Chart.yaml
diff --git a/kubernetes/cds/charts/cds-command-executor/requirements.yaml b/kubernetes/cds/components/cds-ui/requirements.yaml
index b33ac701fe..7a0e74bfaf 100755..100644
--- a/kubernetes/cds/charts/cds-command-executor/requirements.yaml
+++ b/kubernetes/cds/components/cds-ui/requirements.yaml
@@ -15,4 +15,7 @@
dependencies:
- name: common
version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
repository: '@local' \ No newline at end of file
diff --git a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml b/kubernetes/cds/components/cds-ui/templates/deployment.yaml
index 4d3d8347db..1c88f56d99 100644
--- a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-ui/templates/deployment.yaml
@@ -39,7 +39,7 @@ spec:
spec:
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/cds/charts/cds-ui/templates/ingress.yaml b/kubernetes/cds/components/cds-ui/templates/ingress.yaml
index 8f87c68f1e..8f87c68f1e 100644
--- a/kubernetes/cds/charts/cds-ui/templates/ingress.yaml
+++ b/kubernetes/cds/components/cds-ui/templates/ingress.yaml
diff --git a/kubernetes/cds/charts/cds-ui/templates/service.yaml b/kubernetes/cds/components/cds-ui/templates/service.yaml
index bfc3e30c84..bfc3e30c84 100644
--- a/kubernetes/cds/charts/cds-ui/templates/service.yaml
+++ b/kubernetes/cds/components/cds-ui/templates/service.yaml
diff --git a/kubernetes/cds/charts/cds-ui/values.yaml b/kubernetes/cds/components/cds-ui/values.yaml
index 496aa85fea..1c7f628b2c 100644
--- a/kubernetes/cds/charts/cds-ui/values.yaml
+++ b/kubernetes/cds/components/cds-ui/values.yaml
@@ -18,14 +18,11 @@
#################################################################
global:
nodePortPrefixExt: 304
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
subChartsOnly:
enabled: true
# application image
-repository: nexus3.onap.org:10001
image: onap/ccsdk-cds-ui-server:1.0.3
pullPolicy: Always
diff --git a/kubernetes/cds/requirements.yaml b/kubernetes/cds/requirements.yaml
index eafe11035e..122e403727 100644
--- a/kubernetes/cds/requirements.yaml
+++ b/kubernetes/cds/requirements.yaml
@@ -19,4 +19,24 @@ dependencies:
repository: '@local'
- name: mariadb-galera
version: ~6.x-0
- repository: '@local' \ No newline at end of file
+ repository: '@local'
+ - name: cds-blueprints-processor
+ version: ~6.x-0
+ repository: 'file://components/cds-blueprints-processor'
+ condition: cds-blueprints-processor.enabled
+ - name: cds-blueprints-processor
+ version: ~6.x-0
+ repository: 'file://components/cds-command-executor'
+ condition: cds-command-executor.enabled
+ - name: cds-py-executor
+ version: ~6.x-0
+ repository: 'file://components/cds-py-executor'
+ condition: cds-py-executor.enabled
+ - name: cds-sdc-listener
+ version: ~6.x-0
+ repository: 'file://components/cds-sdc-listener'
+ condition: cds-sdc-listener.enabled
+ - name: cds-ui
+ version: ~6.x-0
+ repository: 'file://components/cds-ui'
+ condition: cds-ui.enabled \ No newline at end of file
diff --git a/kubernetes/cds/values.yaml b/kubernetes/cds/values.yaml
index e5e7b83b56..0b7403e8ac 100644
--- a/kubernetes/cds/values.yaml
+++ b/kubernetes/cds/values.yaml
@@ -20,10 +20,6 @@
global:
nodePortPrefix: 302
nodePortPrefixExt: 304
- repository: nexus3.onap.org:10001
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
persistence:
mountPath: /dockerdata-nfs
@@ -42,7 +38,6 @@ secrets:
# Application configuration defaults.
#################################################################
# application images
-repository: nexus3.onap.org:10001
pullPolicy: Always
@@ -91,6 +86,7 @@ mariadb-galera:
mountSubPath: cds/data
cds-blueprints-processor:
+ enabled: true
config:
cdsDB:
dbServer: *dbServer
@@ -98,6 +94,19 @@ cds-blueprints-processor:
dbName: *mysqlDbName
dbCredsExternalSecret: *dbUserSecretName
+cds-command-executor:
+ enabled: true
+
+cds-py-executor:
+ enabled: true
+
+cds-sdc-listener:
+ enabled: true
+
+cds-ui:
+ enabled: true
+
+
#Resource Limit flavor -By Default using small
flavor: small
#segregation for different envionment (Small and Large)