[VFC] Uses new tpls for repos / images 28/115128/5
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>
Thu, 19 Nov 2020 16:35:56 +0000 (17:35 +0100)
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>
Tue, 24 Nov 2020 16:47:47 +0000 (16:47 +0000)
This commit makes VFC template 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: I469198fdfd3aec756e250764875a9ebcfd0a108d

70 files changed:
kubernetes/vfc/Makefile [new file with mode: 0644]
kubernetes/vfc/components/Makefile [new file with mode: 0644]
kubernetes/vfc/components/vfc-generic-vnfm-driver/.helmignore [moved from kubernetes/vfc/charts/vfc-generic-vnfm-driver/.helmignore with 100% similarity]
kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml [moved from kubernetes/vfc/charts/vfc-generic-vnfm-driver/Chart.yaml with 100% similarity]
kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml [new file with mode: 0644]
kubernetes/vfc/components/vfc-generic-vnfm-driver/resources/config/logging/log.yml [moved from kubernetes/vfc/charts/vfc-generic-vnfm-driver/resources/config/logging/log.yml with 100% similarity]
kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/configmap.yaml [moved from kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/configmap.yaml with 100% similarity]
kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml [moved from kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml with 96% similarity]
kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/service.yaml [moved from kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/service.yaml with 100% similarity]
kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml [moved from kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml with 93% similarity]
kubernetes/vfc/components/vfc-huawei-vnfm-driver/.helmignore [moved from kubernetes/vfc/charts/vfc-huawei-vnfm-driver/.helmignore with 100% similarity]
kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml [moved from kubernetes/vfc/charts/vfc-huawei-vnfm-driver/Chart.yaml with 100% similarity]
kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml [new file with mode: 0644]
kubernetes/vfc/components/vfc-huawei-vnfm-driver/resources/config/logging/log4j.properties [moved from kubernetes/vfc/charts/vfc-huawei-vnfm-driver/resources/config/logging/log4j.properties with 100% similarity]
kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/configmap.yaml [moved from kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/configmap.yaml with 100% similarity]
kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml [moved from kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml with 86% similarity]
kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/service.yaml [moved from kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/service.yaml with 100% similarity]
kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml [moved from kubernetes/vfc/charts/vfc-huawei-vnfm-driver/values.yaml with 92% similarity]
kubernetes/vfc/components/vfc-nslcm/.helmignore [moved from kubernetes/vfc/charts/vfc-nslcm/.helmignore with 100% similarity]
kubernetes/vfc/components/vfc-nslcm/Chart.yaml [moved from kubernetes/vfc/charts/vfc-nslcm/Chart.yaml with 100% similarity]
kubernetes/vfc/components/vfc-nslcm/requirements.yaml [new file with mode: 0644]
kubernetes/vfc/components/vfc-nslcm/resources/config/logging/log.yml [moved from kubernetes/vfc/charts/vfc-nslcm/resources/config/logging/log.yml with 100% similarity]
kubernetes/vfc/components/vfc-nslcm/templates/configmap.yaml [moved from kubernetes/vfc/charts/vfc-nslcm/templates/configmap.yaml with 100% similarity]
kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml [moved from kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml with 95% similarity]
kubernetes/vfc/components/vfc-nslcm/templates/secrets.yaml [moved from kubernetes/vfc/charts/vfc-nslcm/templates/secrets.yaml with 100% similarity]
kubernetes/vfc/components/vfc-nslcm/templates/service.yaml [moved from kubernetes/vfc/charts/vfc-nslcm/templates/service.yaml with 100% similarity]
kubernetes/vfc/components/vfc-nslcm/values.yaml [moved from kubernetes/vfc/charts/vfc-nslcm/values.yaml with 92% similarity]
kubernetes/vfc/components/vfc-redis/.helmignore [moved from kubernetes/vfc/charts/vfc-redis/.helmignore with 100% similarity]
kubernetes/vfc/components/vfc-redis/Chart.yaml [moved from kubernetes/vfc/charts/vfc-redis/Chart.yaml with 100% similarity]
kubernetes/vfc/components/vfc-redis/requirements.yaml [new file with mode: 0644]
kubernetes/vfc/components/vfc-redis/templates/deployment.yaml [moved from kubernetes/vfc/charts/vfc-redis/templates/deployment.yaml with 96% similarity]
kubernetes/vfc/components/vfc-redis/templates/service.yaml [moved from kubernetes/vfc/charts/vfc-redis/templates/service.yaml with 100% similarity]
kubernetes/vfc/components/vfc-redis/values.yaml [moved from kubernetes/vfc/charts/vfc-redis/values.yaml with 92% similarity]
kubernetes/vfc/components/vfc-vnflcm/.helmignore [moved from kubernetes/vfc/charts/vfc-vnflcm/.helmignore with 100% similarity]
kubernetes/vfc/components/vfc-vnflcm/Chart.yaml [moved from kubernetes/vfc/charts/vfc-vnflcm/Chart.yaml with 100% similarity]
kubernetes/vfc/components/vfc-vnflcm/requirements.yaml [new file with mode: 0644]
kubernetes/vfc/components/vfc-vnflcm/resources/config/logging/log.yml [moved from kubernetes/vfc/charts/vfc-vnflcm/resources/config/logging/log.yml with 100% similarity]
kubernetes/vfc/components/vfc-vnflcm/templates/configmap.yaml [moved from kubernetes/vfc/charts/vfc-vnflcm/templates/configmap.yaml with 100% similarity]
kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml [moved from kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml with 95% similarity]
kubernetes/vfc/components/vfc-vnflcm/templates/secrets.yaml [moved from kubernetes/vfc/charts/vfc-vnflcm/templates/secrets.yaml with 100% similarity]
kubernetes/vfc/components/vfc-vnflcm/templates/service.yaml [moved from kubernetes/vfc/charts/vfc-vnflcm/templates/service.yaml with 100% similarity]
kubernetes/vfc/components/vfc-vnflcm/values.yaml [moved from kubernetes/vfc/charts/vfc-vnflcm/values.yaml with 92% similarity]
kubernetes/vfc/components/vfc-vnfmgr/.helmignore [moved from kubernetes/vfc/charts/vfc-vnfmgr/.helmignore with 100% similarity]
kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml [moved from kubernetes/vfc/charts/vfc-vnfmgr/Chart.yaml with 100% similarity]
kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml [new file with mode: 0644]
kubernetes/vfc/components/vfc-vnfmgr/resources/config/logging/log.yml [moved from kubernetes/vfc/charts/vfc-vnfmgr/resources/config/logging/log.yml with 100% similarity]
kubernetes/vfc/components/vfc-vnfmgr/templates/configmap.yaml [moved from kubernetes/vfc/charts/vfc-vnfmgr/templates/configmap.yaml with 100% similarity]
kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml [moved from kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml with 95% similarity]
kubernetes/vfc/components/vfc-vnfmgr/templates/secrets.yaml [moved from kubernetes/vfc/charts/vfc-vnfmgr/templates/secrets.yaml with 100% similarity]
kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml [moved from kubernetes/vfc/charts/vfc-vnfmgr/templates/service.yaml with 100% similarity]
kubernetes/vfc/components/vfc-vnfmgr/values.yaml [moved from kubernetes/vfc/charts/vfc-vnfmgr/values.yaml with 92% similarity]
kubernetes/vfc/components/vfc-vnfres/.helmignore [moved from kubernetes/vfc/charts/vfc-vnfres/.helmignore with 100% similarity]
kubernetes/vfc/components/vfc-vnfres/Chart.yaml [moved from kubernetes/vfc/charts/vfc-vnfres/Chart.yaml with 100% similarity]
kubernetes/vfc/components/vfc-vnfres/requirements.yaml [new file with mode: 0644]
kubernetes/vfc/components/vfc-vnfres/resources/config/logging/log.yml [moved from kubernetes/vfc/charts/vfc-vnfres/resources/config/logging/log.yml with 100% similarity]
kubernetes/vfc/components/vfc-vnfres/templates/configmap.yaml [moved from kubernetes/vfc/charts/vfc-vnfres/templates/configmap.yaml with 100% similarity]
kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml [moved from kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml with 95% similarity]
kubernetes/vfc/components/vfc-vnfres/templates/secrets.yaml [moved from kubernetes/vfc/charts/vfc-vnfres/templates/secrets.yaml with 100% similarity]
kubernetes/vfc/components/vfc-vnfres/templates/service.yaml [moved from kubernetes/vfc/charts/vfc-vnfres/templates/service.yaml with 100% similarity]
kubernetes/vfc/components/vfc-vnfres/values.yaml [moved from kubernetes/vfc/charts/vfc-vnfres/values.yaml with 92% similarity]
kubernetes/vfc/components/vfc-zte-vnfm-driver/.helmignore [moved from kubernetes/vfc/charts/vfc-zte-vnfm-driver/.helmignore with 100% similarity]
kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml [moved from kubernetes/vfc/charts/vfc-zte-vnfm-driver/Chart.yaml with 100% similarity]
kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml [new file with mode: 0644]
kubernetes/vfc/components/vfc-zte-vnfm-driver/resources/config/logging/log.yml [moved from kubernetes/vfc/charts/vfc-zte-vnfm-driver/resources/config/logging/log.yml with 100% similarity]
kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/configmap.yaml [moved from kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/configmap.yaml with 100% similarity]
kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml [moved from kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/deployment.yaml with 86% similarity]
kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/service.yaml [moved from kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/service.yaml with 100% similarity]
kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml [moved from kubernetes/vfc/charts/vfc-zte-vnfm-driver/values.yaml with 92% similarity]
kubernetes/vfc/requirements.yaml
kubernetes/vfc/values.yaml

diff --git a/kubernetes/vfc/Makefile b/kubernetes/vfc/Makefile
new file mode 100644 (file)
index 0000000..4c79718
--- /dev/null
@@ -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/vfc/components/Makefile b/kubernetes/vfc/components/Makefile
new file mode 100644 (file)
index 0000000..bf267b7
--- /dev/null
@@ -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 :=
+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/vfc/components/vfc-generic-vnfm-driver/requirements.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -0,0 +1,21 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+
+dependencies:
+  - name: common
+    version: ~6.x-0
+    repository: '@local'
+  - name: repositoryGenerator
+    version: ~6.x-0
+    repository: '@local'
@@ -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 }}
@@ -86,7 +86,7 @@ spec:
 
         # side car containers
         - name: {{ include "common.name" . }}-filebeat-onap
-          image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+          image: {{ include "repositoryGenerator.image.logging" . }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           volumeMounts:
           - name: {{ include "common.fullname" . }}-filebeat-conf
@@ -17,9 +17,8 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
+  config:
+    ssl_enabled: false
 
 #################################################################
 # Application configuration defaults.
@@ -27,7 +26,6 @@ global:
 # application image
 flavor: small
 
-repository: nexus3.onap.org:10001
 image: onap/vfc/gvnfmdriver:1.4.0
 pullPolicy: Always
 
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -0,0 +1,21 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+
+dependencies:
+  - name: common
+    version: ~6.x-0
+    repository: '@local'
+  - name: repositoryGenerator
+    version: ~6.x-0
+    repository: '@local'
@@ -37,25 +37,9 @@ spec:
       annotations:
         sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
     spec:
-      initContainers:
-#Example init container for dependency checking
-#      - command:
-#        - /app/ready.py
-#        args:
-#        - --container-name
-#        - mariadb
-#        env:
-#        - name: NAMESPACE
-#          valueFrom:
-#            fieldRef:
-#              apiVersion: v1
-#              fieldPath: metadata.namespace
-#        image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
-#        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.internalPort }}
@@ -105,7 +89,7 @@ spec:
 
         # side car containers
         - name: {{ include "common.name" . }}-filebeat-onap
-          image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+          image: {{ include "repositoryGenerator.image.logging" . }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           volumeMounts:
           - name: {{ include "common.fullname" . }}-filebeat-conf
@@ -17,9 +17,8 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
+  config:
+    ssl_enabled: false
 
 #################################################################
 # Application configuration defaults.
@@ -27,7 +26,6 @@ global:
 # application image
 flavor: small
 
-repository: nexus3.onap.org:10001
 image: onap/vfc/nfvo/svnfm/huawei:1.3.8
 pullPolicy: Always
 
diff --git a/kubernetes/vfc/components/vfc-nslcm/requirements.yaml b/kubernetes/vfc/components/vfc-nslcm/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -0,0 +1,21 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+
+dependencies:
+  - name: common
+    version: ~6.x-0
+    repository: '@local'
+  - name: repositoryGenerator
+    version: ~6.x-0
+    repository: '@local'
@@ -49,7 +49,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
       containers:
@@ -59,7 +59,7 @@ spec:
           args:
             - -c
             - 'MYSQL_AUTH=${MYSQL_ROOT_USER}:${MYSQL_ROOT_PASSWORD} ./docker-entrypoint.sh'
-          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+          image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports:
           - containerPort: {{ .Values.service.internalPort }}
@@ -116,7 +116,7 @@ spec:
 
         # side car containers
         - name: {{ include "common.name" . }}-filebeat-onap
-          image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+          image: {{ include "repositoryGenerator.image.logging" . }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           volumeMounts:
           - name: {{ include "common.fullname" . }}-filebeat-conf
@@ -17,9 +17,8 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
+  config:
+    ssl_enabled: false
 
 #################################################################
 # Secrets metaconfig
@@ -37,7 +36,6 @@ secrets:
 # application image
 flavor: small
 
-repository: nexus3.onap.org:10001
 image: onap/vfc/nslcm:1.4.1
 pullPolicy: Always
 
@@ -51,7 +49,7 @@ debugEnabled: false
 config:
   mariadbService: vfc-mariadb
   mariadbPort: 3306
-  mariadbRootPassword: secretpassword
+  mariadbRootPassword: secretpassword
   # mariadbRootPasswordExternalSecret: some secret
 
 
diff --git a/kubernetes/vfc/components/vfc-redis/requirements.yaml b/kubernetes/vfc/components/vfc-redis/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -0,0 +1,21 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+
+dependencies:
+  - name: common
+    version: ~6.x-0
+    repository: '@local'
+  - name: repositoryGenerator
+    version: ~6.x-0
+    repository: '@local'
@@ -37,7 +37,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 }}
@@ -17,9 +17,6 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
 
 #################################################################
 # Application configuration defaults.
@@ -27,7 +24,6 @@ global:
 # application image
 flavor: small
 
-repository: nexus3.onap.org:10001
 image: onap/vfc/db:1.3.4
 pullPolicy: Always
 
diff --git a/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml b/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -0,0 +1,21 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+
+dependencies:
+  - name: common
+    version: ~6.x-0
+    repository: '@local'
+  - name: repositoryGenerator
+    version: ~6.x-0
+    repository: '@local'
@@ -49,7 +49,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
       containers:
@@ -59,7 +59,7 @@ spec:
           args:
             - -c
             - 'MYSQL_AUTH=root:${MYSQL_ROOT_PASSWORD} ./docker-entrypoint.sh'
-          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+          image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports:
           - containerPort: {{ .Values.service.internalPort }}
@@ -116,7 +116,7 @@ spec:
 
         # side car containers
         - name: {{ include "common.name" . }}-filebeat-onap
-          image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+          image: {{ include "repositoryGenerator.image.logging" . }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           volumeMounts:
           - name: {{ include "common.fullname" . }}-filebeat-conf
@@ -17,9 +17,8 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
+  config:
+    ssl_enabled: false
 
 #################################################################
 # Secrets metaconfig
@@ -37,7 +36,6 @@ secrets:
 # application image
 flavor: small
 
-repository: nexus3.onap.org:10001
 image: onap/vfc/vnflcm:1.4.0
 pullPolicy: Always
 
@@ -51,7 +49,7 @@ debugEnabled: false
 config:
   mariadbService: vfc-mariadb
   mariadbPort: 3306
-  mariadbRootPassword: secretpassword
+  mariadbRootPassword: secretpassword
   # mariadbRootPasswordExternalSecret: some secret
 
 
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml b/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -0,0 +1,21 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+
+dependencies:
+  - name: common
+    version: ~6.x-0
+    repository: '@local'
+  - name: repositoryGenerator
+    version: ~6.x-0
+    repository: '@local'
@@ -49,7 +49,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
       containers:
@@ -59,7 +59,7 @@ spec:
           args:
             - -c
             - 'MYSQL_AUTH=root:${MYSQL_ROOT_PASSWORD} ./docker-entrypoint.sh'
-          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+          image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports:
           - containerPort: {{ .Values.service.internalPort }}
@@ -116,7 +116,7 @@ spec:
 
         # side car containers
         - name: {{ include "common.name" . }}-filebeat-onap
-          image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+          image: {{ include "repositoryGenerator.image.logging" . }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           volumeMounts:
           - name: {{ include "common.fullname" . }}-filebeat-conf
@@ -17,9 +17,8 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
+  config:
+    ssl_enabled: false
 
 #################################################################
 # Secrets metaconfig
@@ -37,7 +36,6 @@ secrets:
 # application image
 flavor: small
 
-repository: nexus3.onap.org:10001
 image: onap/vfc/vnfmgr:1.3.9
 pullPolicy: Always
 
@@ -51,7 +49,7 @@ debugEnabled: false
 config:
   mariadbService: vfc-mariadb
   mariadbPort: 3306
-  mariadbRootPassword: secretpassword
+  mariadbRootPassword: secretpassword
   # mariadbRootPasswordExternalSecret: some secret
 
 # default number of instances
diff --git a/kubernetes/vfc/components/vfc-vnfres/requirements.yaml b/kubernetes/vfc/components/vfc-vnfres/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -0,0 +1,21 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+
+dependencies:
+  - name: common
+    version: ~6.x-0
+    repository: '@local'
+  - name: repositoryGenerator
+    version: ~6.x-0
+    repository: '@local'
@@ -49,7 +49,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
       containers:
@@ -59,7 +59,7 @@ spec:
           args:
             - -c
             - 'MYSQL_AUTH=root:${MYSQL_ROOT_PASSWORD} ./docker-entrypoint.sh'
-          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+          image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports:
           - containerPort: {{ .Values.service.internalPort }}
@@ -116,7 +116,7 @@ spec:
 
         # side car containers
         - name: {{ include "common.name" . }}-filebeat-onap
-          image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+          image: {{ include "repositoryGenerator.image.logging" . }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           volumeMounts:
           - name: {{ include "common.fullname" . }}-filebeat-conf
@@ -17,9 +17,8 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
+  config:
+    ssl_enabled: false
 
 #################################################################
 # Secrets metaconfig
@@ -37,7 +36,6 @@ secrets:
 # application image
 flavor: small
 
-repository: nexus3.onap.org:10001
 image: onap/vfc/vnfres:1.3.8
 pullPolicy: Always
 
@@ -51,7 +49,7 @@ debugEnabled: false
 config:
   mariadbService: vfc-mariadb
   mariadbPort: 3306
-  mariadbRootPassword: secretpassword
+  mariadbRootPassword: secretpassword
   # mariadbRootPasswordExternalSecret: some secret
 
 
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml
new file mode 100644 (file)
index 0000000..fbe5155
--- /dev/null
@@ -0,0 +1,21 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+
+dependencies:
+  - name: common
+    version: ~6.x-0
+    repository: '@local'
+  - name: repositoryGenerator
+    version: ~6.x-0
+    repository: '@local'
@@ -37,25 +37,9 @@ spec:
       annotations:
         sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
     spec:
-      initContainers:
-#Example init container for dependency checking
-#      - command:
-#        - /app/ready.py
-#        args:
-#        - --container-name
-#        - mariadb
-#        env:
-#        - name: NAMESPACE
-#          valueFrom:
-#            fieldRef:
-#              apiVersion: v1
-#              fieldPath: metadata.namespace
-#        image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
-#        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.internalPort }}
@@ -102,7 +86,7 @@ spec:
 
         # side car containers
         - name: {{ include "common.name" . }}-filebeat-onap
-          image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+          image: {{ include "repositoryGenerator.image.logging" . }}
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           volumeMounts:
           - name: {{ include "common.fullname" . }}-filebeat-conf
@@ -17,9 +17,8 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
+  config:
+    ssl_enabled: false
 
 #################################################################
 # Application configuration defaults.
@@ -27,7 +26,6 @@ global:
 # application image
 flavor: small
 
-repository: nexus3.onap.org:10001
 image: onap/vfc/ztevnfmdriver:1.3.8
 pullPolicy: Always
 
index 8d6c559..1ac82cb 100644 (file)
@@ -19,3 +19,38 @@ dependencies:
   - name: mariadb-galera
     version: ~6.x-0
     repository: '@local'
+  - name: repositoryGenerator
+    version: ~6.x-0
+    repository: '@local'
+  - name: vfc-generic-vnfm-driver
+    version: ~6.x-0
+    repository: 'file://components/vfc-generic-vnfm-driver'
+    condition: vfc-generic-vnfm-driver.enabled
+  - name: vfc-huawei-vnfm-driver
+    version: ~6.x-0
+    repository: 'file://components/vfc-huawei-vnfm-driver'
+    condition: vfc-huawei-vnfm-driver.enabled
+  - name: vfc-nslcm
+    version: ~6.x-0
+    repository: 'file://components/vfc-nslcm'
+    condition: vfc-nslcm.enabled
+  - name: vfc-redis
+    version: ~6.x-0
+    repository: 'file://components/vfc-redis'
+    condition: vfc-redis.enabled
+  - name: vfc-vnflcm
+    version: ~6.x-0
+    repository: 'file://components/vfc-vnflcm'
+    condition: vfc-vnflcm.enabled
+  - name: vfc-vnfmgr
+    version: ~6.x-0
+    repository: 'file://components/vfc-vnfmgr'
+    condition: vfc-vnfmgr.enabled
+  - name: vfc-vnfres
+    version: ~6.x-0
+    repository: 'file://components/vfc-vnfres'
+    condition: vfc-vnfres.enabled
+  - name: vfc-zte-vnfm-driver
+    version: ~6.x-0
+    repository: 'file://components/vfc-zte-vnfm-driver'
+    condition: vfc-zte-vnfm-driver.enabled
index 05e8c64..28cee56 100644 (file)
@@ -62,19 +62,32 @@ db: &dbConfig
   mariadbPort: 3306
   mariadbRootPasswordExternalSecret: *dbRootPassSecret
 
+vfc-generic-vnfm-driver:
+  enabled: true
+
+vfc-huawei-vnfm-driver:
+  enabled: true
+
 vfc-nslcm:
+  enabled: true
   config:
     << : *dbConfig
 
+vfc-redis:
+  enabled: true
+
 vfc-vnflcm:
+  enabled: true
   config:
     << : *dbConfig
 
 vfc-vnfmgr:
+  enabled: true
   config:
     << : *dbConfig
 
 vfc-vnfres:
+  enabled: true
   config:
     << : *dbConfig
 
@@ -86,3 +99,6 @@ vfc-workflow:
 vfc-workflow-engine:
   config:
     workflowPort: 10550
+
+vfc-zte-vnfm-driver:
+  enabled: true
\ No newline at end of file