Merge "[VFC] Uses new tpls for repos / images"

70 files changed, 358 insertions, 87 deletions

diff --git a/kubernetes/vfc/Makefile b/kubernetes/vfc/Makefile
new file mode 100644
index 0000000000..4c79718d02
--- /dev/null
+++ b/kubernetes/vfc/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/vfc/components/Makefile b/kubernetes/vfc/components/Makefile
new file mode 100644
index 0000000000..bf267b7720
--- /dev/null
+++ b/kubernetes/vfc/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 :=
+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/charts/vfc-generic-vnfm-driver/.helmignore b/kubernetes/vfc/components/vfc-generic-vnfm-driver/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/.helmignore
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/.helmignore
diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
index 42e4691899..42e4691899 100644
--- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
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
index 0000000000..fbe51550f0
--- /dev/null
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml
@@ -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'
diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/resources/config/logging/log.yml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/resources/config/logging/log.yml
index 844f993df1..844f993df1 100644
--- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/resources/config/logging/log.yml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/configmap.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/configmap.yaml
index 83f658f751..83f658f751 100644
--- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/configmap.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/configmap.yaml
diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
index 12fdd084ac..c910f4786f 100644
--- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/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 }}
@@ -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
diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/service.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/service.yaml
index df7fe3149a..df7fe3149a 100644
--- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/service.yaml
diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
index 96736f6c66..df5d830bf7 100644
--- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
@@ -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/charts/vfc-huawei-vnfm-driver/.helmignore b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/.helmignore
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/.helmignore
diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
index 6f5734f8f8..6f5734f8f8 100644
--- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
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
index 0000000000..fbe51550f0
--- /dev/null
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml
@@ -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'
diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/resources/config/logging/log4j.properties b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/resources/config/logging/log4j.properties
index e2036398fe..e2036398fe 100644
--- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/resources/config/logging/log4j.properties
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/resources/config/logging/log4j.properties
diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/configmap.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/configmap.yaml
index 83f658f751..83f658f751 100644
--- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/configmap.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/configmap.yaml
diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml
index a4c8d716e1..4f74d1ddd5 100644
--- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml
@@ -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
diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/service.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/service.yaml
index 95a84cff02..95a84cff02 100644
--- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/service.yaml
diff --git a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml
index cc8d682acd..8718aff291 100644
--- a/kubernetes/vfc/charts/vfc-huawei-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml
@@ -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/charts/vfc-nslcm/.helmignore b/kubernetes/vfc/components/vfc-nslcm/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/vfc/charts/vfc-nslcm/.helmignore
+++ b/kubernetes/vfc/components/vfc-nslcm/.helmignore
diff --git a/kubernetes/vfc/charts/vfc-nslcm/Chart.yaml b/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
index a58118f3df..a58118f3df 100644
--- a/kubernetes/vfc/charts/vfc-nslcm/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-nslcm/requirements.yaml b/kubernetes/vfc/components/vfc-nslcm/requirements.yaml
new file mode 100644
index 0000000000..fbe51550f0
--- /dev/null
+++ b/kubernetes/vfc/components/vfc-nslcm/requirements.yaml
@@ -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'
diff --git a/kubernetes/vfc/charts/vfc-nslcm/resources/config/logging/log.yml b/kubernetes/vfc/components/vfc-nslcm/resources/config/logging/log.yml
index c88606239e..c88606239e 100644
--- a/kubernetes/vfc/charts/vfc-nslcm/resources/config/logging/log.yml
+++ b/kubernetes/vfc/components/vfc-nslcm/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/charts/vfc-nslcm/templates/configmap.yaml b/kubernetes/vfc/components/vfc-nslcm/templates/configmap.yaml
index 83f658f751..83f658f751 100644
--- a/kubernetes/vfc/charts/vfc-nslcm/templates/configmap.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/templates/configmap.yaml
diff --git a/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
index e1d43668e9..40ca646e0f 100644
--- a/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
@@ -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
diff --git a/kubernetes/vfc/charts/vfc-nslcm/templates/secrets.yaml b/kubernetes/vfc/components/vfc-nslcm/templates/secrets.yaml
index 246928825e..246928825e 100644
--- a/kubernetes/vfc/charts/vfc-nslcm/templates/secrets.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/templates/secrets.yaml
diff --git a/kubernetes/vfc/charts/vfc-nslcm/templates/service.yaml b/kubernetes/vfc/components/vfc-nslcm/templates/service.yaml
index f46530ded9..f46530ded9 100644
--- a/kubernetes/vfc/charts/vfc-nslcm/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/templates/service.yaml
diff --git a/kubernetes/vfc/charts/vfc-nslcm/values.yaml b/kubernetes/vfc/components/vfc-nslcm/values.yaml
index 14a216079b..6b23913a51 100644
--- a/kubernetes/vfc/charts/vfc-nslcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/values.yaml
@@ -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/charts/vfc-redis/.helmignore b/kubernetes/vfc/components/vfc-redis/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/vfc/charts/vfc-redis/.helmignore
+++ b/kubernetes/vfc/components/vfc-redis/.helmignore
diff --git a/kubernetes/vfc/charts/vfc-redis/Chart.yaml b/kubernetes/vfc/components/vfc-redis/Chart.yaml
index ede374f88b..ede374f88b 100644
--- a/kubernetes/vfc/charts/vfc-redis/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-redis/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-redis/requirements.yaml b/kubernetes/vfc/components/vfc-redis/requirements.yaml
new file mode 100644
index 0000000000..fbe51550f0
--- /dev/null
+++ b/kubernetes/vfc/components/vfc-redis/requirements.yaml
@@ -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'
diff --git a/kubernetes/vfc/charts/vfc-redis/templates/deployment.yaml b/kubernetes/vfc/components/vfc-redis/templates/deployment.yaml
index 9db543b3c2..787c62c3c5 100644
--- a/kubernetes/vfc/charts/vfc-redis/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-redis/templates/deployment.yaml
@@ -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 }}
diff --git a/kubernetes/vfc/charts/vfc-redis/templates/service.yaml b/kubernetes/vfc/components/vfc-redis/templates/service.yaml
index b20f3f8880..b20f3f8880 100644
--- a/kubernetes/vfc/charts/vfc-redis/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-redis/templates/service.yaml
diff --git a/kubernetes/vfc/charts/vfc-redis/values.yaml b/kubernetes/vfc/components/vfc-redis/values.yaml
index 2761d05999..6ea05d72a6 100644
--- a/kubernetes/vfc/charts/vfc-redis/values.yaml
+++ b/kubernetes/vfc/components/vfc-redis/values.yaml
@@ -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/charts/vfc-vnflcm/.helmignore b/kubernetes/vfc/components/vfc-vnflcm/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/vfc/charts/vfc-vnflcm/.helmignore
+++ b/kubernetes/vfc/components/vfc-vnflcm/.helmignore
diff --git a/kubernetes/vfc/charts/vfc-vnflcm/Chart.yaml b/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
index 5bde32a97c..5bde32a97c 100644
--- a/kubernetes/vfc/charts/vfc-vnflcm/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml b/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml
new file mode 100644
index 0000000000..fbe51550f0
--- /dev/null
+++ b/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml
@@ -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'
diff --git a/kubernetes/vfc/charts/vfc-vnflcm/resources/config/logging/log.yml b/kubernetes/vfc/components/vfc-vnflcm/resources/config/logging/log.yml
index 9dbf475beb..9dbf475beb 100644
--- a/kubernetes/vfc/charts/vfc-vnflcm/resources/config/logging/log.yml
+++ b/kubernetes/vfc/components/vfc-vnflcm/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/charts/vfc-vnflcm/templates/configmap.yaml b/kubernetes/vfc/components/vfc-vnflcm/templates/configmap.yaml
index 83f658f751..83f658f751 100644
--- a/kubernetes/vfc/charts/vfc-vnflcm/templates/configmap.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/templates/configmap.yaml
diff --git a/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
index 93bb7a4544..b93d7af02b 100644
--- a/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
@@ -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
diff --git a/kubernetes/vfc/charts/vfc-vnflcm/templates/secrets.yaml b/kubernetes/vfc/components/vfc-vnflcm/templates/secrets.yaml
index 246928825e..246928825e 100644
--- a/kubernetes/vfc/charts/vfc-vnflcm/templates/secrets.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/templates/secrets.yaml
diff --git a/kubernetes/vfc/charts/vfc-vnflcm/templates/service.yaml b/kubernetes/vfc/components/vfc-vnflcm/templates/service.yaml
index b64740bbe2..b64740bbe2 100644
--- a/kubernetes/vfc/charts/vfc-vnflcm/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/templates/service.yaml
diff --git a/kubernetes/vfc/charts/vfc-vnflcm/values.yaml b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
index fafef0c5f0..a58b4daa68 100644
--- a/kubernetes/vfc/charts/vfc-vnflcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
@@ -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/charts/vfc-vnfmgr/.helmignore b/kubernetes/vfc/components/vfc-vnfmgr/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/vfc/charts/vfc-vnfmgr/.helmignore
+++ b/kubernetes/vfc/components/vfc-vnfmgr/.helmignore
diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/Chart.yaml b/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
index 938ea5d4f1..938ea5d4f1 100644
--- a/kubernetes/vfc/charts/vfc-vnfmgr/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml b/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml
new file mode 100644
index 0000000000..fbe51550f0
--- /dev/null
+++ b/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml
@@ -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'
diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/resources/config/logging/log.yml b/kubernetes/vfc/components/vfc-vnfmgr/resources/config/logging/log.yml
index 9dbf475beb..9dbf475beb 100644
--- a/kubernetes/vfc/charts/vfc-vnfmgr/resources/config/logging/log.yml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/templates/configmap.yaml b/kubernetes/vfc/components/vfc-vnfmgr/templates/configmap.yaml
index 83f658f751..83f658f751 100644
--- a/kubernetes/vfc/charts/vfc-vnfmgr/templates/configmap.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/configmap.yaml
diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
index 7e63478ef2..9c8430c9fc 100644
--- a/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
@@ -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
diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/templates/secrets.yaml b/kubernetes/vfc/components/vfc-vnfmgr/templates/secrets.yaml
index 246928825e..246928825e 100644
--- a/kubernetes/vfc/charts/vfc-vnfmgr/templates/secrets.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/secrets.yaml
diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/templates/service.yaml b/kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml
index 97ef463977..97ef463977 100644
--- a/kubernetes/vfc/charts/vfc-vnfmgr/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml
diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/values.yaml b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
index 67b087fcd0..85de68ea47 100644
--- a/kubernetes/vfc/charts/vfc-vnfmgr/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
@@ -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/charts/vfc-vnfres/.helmignore b/kubernetes/vfc/components/vfc-vnfres/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/vfc/charts/vfc-vnfres/.helmignore
+++ b/kubernetes/vfc/components/vfc-vnfres/.helmignore
diff --git a/kubernetes/vfc/charts/vfc-vnfres/Chart.yaml b/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
index 3002bce3e8..3002bce3e8 100644
--- a/kubernetes/vfc/charts/vfc-vnfres/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
diff --git a/kubernetes/vfc/components/vfc-vnfres/requirements.yaml b/kubernetes/vfc/components/vfc-vnfres/requirements.yaml
new file mode 100644
index 0000000000..fbe51550f0
--- /dev/null
+++ b/kubernetes/vfc/components/vfc-vnfres/requirements.yaml
@@ -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'
diff --git a/kubernetes/vfc/charts/vfc-vnfres/resources/config/logging/log.yml b/kubernetes/vfc/components/vfc-vnfres/resources/config/logging/log.yml
index 7644af1e1b..7644af1e1b 100644
--- a/kubernetes/vfc/charts/vfc-vnfres/resources/config/logging/log.yml
+++ b/kubernetes/vfc/components/vfc-vnfres/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/charts/vfc-vnfres/templates/configmap.yaml b/kubernetes/vfc/components/vfc-vnfres/templates/configmap.yaml
index 83f658f751..83f658f751 100644
--- a/kubernetes/vfc/charts/vfc-vnfres/templates/configmap.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/templates/configmap.yaml
diff --git a/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
index ecd0d2580e..2577887523 100644
--- a/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
@@ -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
diff --git a/kubernetes/vfc/charts/vfc-vnfres/templates/secrets.yaml b/kubernetes/vfc/components/vfc-vnfres/templates/secrets.yaml
index 246928825e..246928825e 100644
--- a/kubernetes/vfc/charts/vfc-vnfres/templates/secrets.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/templates/secrets.yaml
diff --git a/kubernetes/vfc/charts/vfc-vnfres/templates/service.yaml b/kubernetes/vfc/components/vfc-vnfres/templates/service.yaml
index c043913b70..c043913b70 100644
--- a/kubernetes/vfc/charts/vfc-vnfres/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/templates/service.yaml
diff --git a/kubernetes/vfc/charts/vfc-vnfres/values.yaml b/kubernetes/vfc/components/vfc-vnfres/values.yaml
index 1b6fc792a1..fd8b26f387 100644
--- a/kubernetes/vfc/charts/vfc-vnfres/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/values.yaml
@@ -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/charts/vfc-zte-vnfm-driver/.helmignore b/kubernetes/vfc/components/vfc-zte-vnfm-driver/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/.helmignore
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/.helmignore
diff --git a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
index d8cd37921e..d8cd37921e 100644
--- a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
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
index 0000000000..fbe51550f0
--- /dev/null
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml
@@ -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'
diff --git a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/resources/config/logging/log.yml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/resources/config/logging/log.yml
index 6c00048ff7..6c00048ff7 100644
--- a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/resources/config/logging/log.yml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/resources/config/logging/log.yml
diff --git a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/configmap.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/configmap.yaml
index 83f658f751..83f658f751 100644
--- a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/configmap.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/configmap.yaml
diff --git a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml
index f1651d7e1a..8c24dd6c45 100644
--- a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml
@@ -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
diff --git a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/service.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/service.yaml
index 826b6904f9..826b6904f9 100644
--- a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/service.yaml
diff --git a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
index 8c349e0098..4dbdfe9e33 100644
--- a/kubernetes/vfc/charts/vfc-zte-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
@@ -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
 
diff --git a/kubernetes/vfc/requirements.yaml b/kubernetes/vfc/requirements.yaml
index 8d6c55931d..1ac82cbecb 100644
--- a/kubernetes/vfc/requirements.yaml
+++ b/kubernetes/vfc/requirements.yaml
@@ -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
diff --git a/kubernetes/vfc/values.yaml b/kubernetes/vfc/values.yaml
index 05e8c64974..28cee56904 100644
--- a/kubernetes/vfc/values.yaml
+++ b/kubernetes/vfc/values.yaml
@@ -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