From e5140a4237ee5fe818651ee16048e3eadce5bbc5 Mon Sep 17 00:00:00 2001 From: yangyanyj Date: Sun, 5 May 2019 23:44:23 +0800 Subject: [PATCH 1/1] fix vfc chart issue Issue-ID: VFC-1374 Change-Id: I7075ea58836d5a1dafb72eeaf99f90c52d909db6 Signed-off-by: yangyanyj --- .../vfc/charts/vfc-catalog/templates/deployment.yaml | 2 +- .../vfc-generic-vnfm-driver/templates/deployment.yaml | 16 ---------------- .../vfc/charts/vfc-nslcm/templates/deployment.yaml | 2 +- kubernetes/vfc/charts/{vfc-db => vfc-redis}/.helmignore | 0 kubernetes/vfc/charts/{vfc-db => vfc-redis}/Chart.yaml | 2 +- .../{vfc-db => vfc-redis}/templates/deployment.yaml | 0 .../charts/{vfc-db => vfc-redis}/templates/service.yaml | 0 kubernetes/vfc/charts/{vfc-db => vfc-redis}/values.yaml | 2 +- .../vfc/charts/vfc-vnflcm/templates/deployment.yaml | 2 +- .../vfc/charts/vfc-vnfmgr/templates/deployment.yaml | 2 +- .../vfc/charts/vfc-vnfres/templates/deployment.yaml | 2 +- 11 files changed, 7 insertions(+), 23 deletions(-) rename kubernetes/vfc/charts/{vfc-db => vfc-redis}/.helmignore (100%) rename kubernetes/vfc/charts/{vfc-db => vfc-redis}/Chart.yaml (97%) rename kubernetes/vfc/charts/{vfc-db => vfc-redis}/templates/deployment.yaml (100%) rename kubernetes/vfc/charts/{vfc-db => vfc-redis}/templates/service.yaml (100%) rename kubernetes/vfc/charts/{vfc-db => vfc-redis}/values.yaml (97%) diff --git a/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml index 1849c46ea1..c3c6151f55 100644 --- a/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-catalog/templates/deployment.yaml @@ -37,7 +37,7 @@ spec: - /root/ready.py args: - --container-name - - vfc-db + - vfc-mariadb env: - name: NAMESPACE valueFrom: diff --git a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml index a25a497df5..e529f47bd1 100644 --- a/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-generic-vnfm-driver/templates/deployment.yaml @@ -32,22 +32,6 @@ spec: annotations: sidecar.istio.io/inject: "{{.Values.istioSidecar}}" spec: - initContainers: -#Example init container for dependency checking -# - command: -# - /root/ready.py -# args: -# - --container-name -# - mariadb -# env: -# - name: NAMESPACE -# valueFrom: -# fieldRef: -# apiVersion: v1 -# fieldPath: metadata.namespace -# image: "{{ .Values.global.readinessRepository }}/{{ .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 }}" diff --git a/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml index 24a42fe5f1..217759e6ab 100644 --- a/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-nslcm/templates/deployment.yaml @@ -37,7 +37,7 @@ spec: - /root/ready.py args: - --container-name - - vfc-db + - vfc-mariadb env: - name: NAMESPACE valueFrom: diff --git a/kubernetes/vfc/charts/vfc-db/.helmignore b/kubernetes/vfc/charts/vfc-redis/.helmignore similarity index 100% rename from kubernetes/vfc/charts/vfc-db/.helmignore rename to kubernetes/vfc/charts/vfc-redis/.helmignore diff --git a/kubernetes/vfc/charts/vfc-db/Chart.yaml b/kubernetes/vfc/charts/vfc-redis/Chart.yaml similarity index 97% rename from kubernetes/vfc/charts/vfc-db/Chart.yaml rename to kubernetes/vfc/charts/vfc-redis/Chart.yaml index 64e6c29f5e..90ffba90b0 100644 --- a/kubernetes/vfc/charts/vfc-db/Chart.yaml +++ b/kubernetes/vfc/charts/vfc-redis/Chart.yaml @@ -14,5 +14,5 @@ apiVersion: v1 description: ONAP VFC - DB -name: vfc-db +name: vfc-redis version: 4.0.0 diff --git a/kubernetes/vfc/charts/vfc-db/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-redis/templates/deployment.yaml similarity index 100% rename from kubernetes/vfc/charts/vfc-db/templates/deployment.yaml rename to kubernetes/vfc/charts/vfc-redis/templates/deployment.yaml diff --git a/kubernetes/vfc/charts/vfc-db/templates/service.yaml b/kubernetes/vfc/charts/vfc-redis/templates/service.yaml similarity index 100% rename from kubernetes/vfc/charts/vfc-db/templates/service.yaml rename to kubernetes/vfc/charts/vfc-redis/templates/service.yaml diff --git a/kubernetes/vfc/charts/vfc-db/values.yaml b/kubernetes/vfc/charts/vfc-redis/values.yaml similarity index 97% rename from kubernetes/vfc/charts/vfc-db/values.yaml rename to kubernetes/vfc/charts/vfc-redis/values.yaml index 6991f36adf..a134190412 100644 --- a/kubernetes/vfc/charts/vfc-db/values.yaml +++ b/kubernetes/vfc/charts/vfc-redis/values.yaml @@ -29,7 +29,7 @@ global: flavor: small repository: nexus3.onap.org:10001 -image: onap/vfc/db:1.3.0 +image: onap/vfc/db:1.3.0-STAGING-latest pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml index f941ae866e..67f57e88ed 100644 --- a/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-vnflcm/templates/deployment.yaml @@ -37,7 +37,7 @@ spec: - /root/ready.py args: - --container-name - - vfc-db + - vfc-mariadb env: - name: NAMESPACE valueFrom: diff --git a/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml index d197da6a75..5169f79585 100644 --- a/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-vnfmgr/templates/deployment.yaml @@ -37,7 +37,7 @@ spec: - /root/ready.py args: - --container-name - - vfc-db + - vfc-mariadb env: - name: NAMESPACE valueFrom: diff --git a/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml index f2a8b055c0..7982fecf53 100644 --- a/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml +++ b/kubernetes/vfc/charts/vfc-vnfres/templates/deployment.yaml @@ -37,7 +37,7 @@ spec: - /root/ready.py args: - --container-name - - vfc-db + - vfc-mariadb env: - name: NAMESPACE valueFrom: -- 2.16.6