From abbe9d710a327fc0314d85c565ee1512bec9da25 Mon Sep 17 00:00:00 2001 From: BorislavG Date: Tue, 12 Sep 2017 18:00:28 +0300 Subject: [PATCH] Fix persistent volumes for multiple onap instances Deploy multiple namespaces fails due to existing persistence volumes. "persistent-volume "appc-db" already exists" Need to change all persistent volume names to include namespace. Change-Id: I40a3048bef14f813b133ea75e2f664f669183e82 Issue-ID: OOM-294 Signed-off-by: BorislavG --- kubernetes/appc/templates/appc-pv-pvc.yaml | 6 +++--- .../message-router/templates/message-router-pv-pvc.yaml | 12 ++++++------ kubernetes/mso/templates/mso-pv-pvc.yaml | 6 +++--- kubernetes/policy/templates/policy-pv-pvc.yaml | 6 +++--- kubernetes/portal/templates/portal-pv-pvc.yaml | 6 +++--- kubernetes/sdc/templates/sdc-pv-pvc.yaml | 6 +++--- kubernetes/sdnc/templates/sdnc-pv-pvc.yaml | 6 +++--- kubernetes/vid/templates/vid-pv-pvc.yaml | 6 +++--- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/kubernetes/appc/templates/appc-pv-pvc.yaml b/kubernetes/appc/templates/appc-pv-pvc.yaml index 51392f7c30..2ce6228953 100644 --- a/kubernetes/appc/templates/appc-pv-pvc.yaml +++ b/kubernetes/appc/templates/appc-pv-pvc.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: appc-db + name: "{{ .Values.nsPrefix }}-appc-db" namespace: "{{ .Values.nsPrefix }}-appc" labels: - name: appc-db + name: "{{ .Values.nsPrefix }}-appc-db" spec: capacity: storage: 2Gi @@ -27,4 +27,4 @@ spec: storage: 2Gi selector: matchLabels: - name: appc-db + name: "{{ .Values.nsPrefix }}-appc-db" diff --git a/kubernetes/message-router/templates/message-router-pv-pvc.yaml b/kubernetes/message-router/templates/message-router-pv-pvc.yaml index 16d6fcd446..e31e78c1fd 100644 --- a/kubernetes/message-router/templates/message-router-pv-pvc.yaml +++ b/kubernetes/message-router/templates/message-router-pv-pvc.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: message-router-kafka + name: "{{ .Values.nsPrefix }}-message-router-kafka" namespace: "{{ .Values.nsPrefix }}-message-router" labels: - name: message-router-kafka + name: "{{ .Values.nsPrefix }}-message-router-kafka" spec: capacity: storage: 2Gi @@ -27,15 +27,15 @@ spec: storage: 2Gi selector: matchLabels: - name: message-router-kafka + name: "{{ .Values.nsPrefix }}-message-router-kafka" --- apiVersion: v1 kind: PersistentVolume metadata: - name: message-router-zookeeper + name: "{{ .Values.nsPrefix }}-message-router-zookeeper" namespace: "{{ .Values.nsPrefix }}-message-router" labels: - name: message-router-zookeeper + name: "{{ .Values.nsPrefix }}-message-router-zookeeper" spec: capacity: storage: 2Gi @@ -58,4 +58,4 @@ spec: storage: 2Gi selector: matchLabels: - name: message-router-zookeeper + name: "{{ .Values.nsPrefix }}-message-router-zookeeper" diff --git a/kubernetes/mso/templates/mso-pv-pvc.yaml b/kubernetes/mso/templates/mso-pv-pvc.yaml index c195980841..47389e3ff0 100644 --- a/kubernetes/mso/templates/mso-pv-pvc.yaml +++ b/kubernetes/mso/templates/mso-pv-pvc.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: mso-db + name: "{{ .Values.nsPrefix }}-mso-db" namespace: "{{ .Values.nsPrefix }}-mso" labels: - name: mso-db + name: "{{ .Values.nsPrefix }}-mso-db" spec: capacity: storage: 2Gi @@ -27,4 +27,4 @@ spec: storage: 2Gi selector: matchLabels: - name: mso-db + name: "{{ .Values.nsPrefix }}-mso-db" diff --git a/kubernetes/policy/templates/policy-pv-pvc.yaml b/kubernetes/policy/templates/policy-pv-pvc.yaml index dda9820c06..71cf3d8a48 100644 --- a/kubernetes/policy/templates/policy-pv-pvc.yaml +++ b/kubernetes/policy/templates/policy-pv-pvc.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: policy-db + name: "{{ .Values.nsPrefix }}-policy-db" namespace: "{{ .Values.nsPrefix }}-policy" labels: - name: policy-db + name: "{{ .Values.nsPrefix }}-policy-db" spec: capacity: storage: 2Gi @@ -27,4 +27,4 @@ spec: storage: 2Gi selector: matchLabels: - name: policy-db + name: "{{ .Values.nsPrefix }}-policy-db" diff --git a/kubernetes/portal/templates/portal-pv-pvc.yaml b/kubernetes/portal/templates/portal-pv-pvc.yaml index 5d41e4febe..11b3dbb4e1 100644 --- a/kubernetes/portal/templates/portal-pv-pvc.yaml +++ b/kubernetes/portal/templates/portal-pv-pvc.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: portal-db + name: "{{ .Values.nsPrefix }}-portal-db" namespace: "{{ .Values.nsPrefix }}-portal" labels: - name: portal-db + name: "{{ .Values.nsPrefix }}-portal-db" spec: capacity: storage: 2Gi @@ -27,4 +27,4 @@ spec: storage: 2Gi selector: matchLabels: - name: portal-db + name: "{{ .Values.nsPrefix }}-portal-db" diff --git a/kubernetes/sdc/templates/sdc-pv-pvc.yaml b/kubernetes/sdc/templates/sdc-pv-pvc.yaml index 41f85e9465..d84d8f4a93 100644 --- a/kubernetes/sdc/templates/sdc-pv-pvc.yaml +++ b/kubernetes/sdc/templates/sdc-pv-pvc.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: sdc-cs-db + name: "{{ .Values.nsPrefix }}-sdc-cs-db" namespace: "{{ .Values.nsPrefix }}-sdc" labels: - name: sdc-cs-db + name: "{{ .Values.nsPrefix }}-sdc-cs-db" spec: capacity: storage: 2Gi @@ -27,4 +27,4 @@ spec: storage: 2Gi selector: matchLabels: - name: sdc-cs-db + name: "{{ .Values.nsPrefix }}-sdc-cs-db" diff --git a/kubernetes/sdnc/templates/sdnc-pv-pvc.yaml b/kubernetes/sdnc/templates/sdnc-pv-pvc.yaml index ac890c62b9..f8fe394907 100644 --- a/kubernetes/sdnc/templates/sdnc-pv-pvc.yaml +++ b/kubernetes/sdnc/templates/sdnc-pv-pvc.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: sdnc-db + name: "{{ .Values.nsPrefix }}-sdnc-db" namespace: "{{ .Values.nsPrefix }}-sdnc" labels: - name: sdnc-db + name: "{{ .Values.nsPrefix }}-sdnc-db" spec: capacity: storage: 2Gi @@ -27,4 +27,4 @@ spec: storage: 2Gi selector: matchLabels: - name: sdnc-db + name: "{{ .Values.nsPrefix }}-sdnc-db" diff --git a/kubernetes/vid/templates/vid-pv-pvc.yaml b/kubernetes/vid/templates/vid-pv-pvc.yaml index 71c5d733dc..f568c7a74b 100644 --- a/kubernetes/vid/templates/vid-pv-pvc.yaml +++ b/kubernetes/vid/templates/vid-pv-pvc.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: vid-db + name: "{{ .Values.nsPrefix }}-vid-db" namespace: "{{ .Values.nsPrefix }}-vid" labels: - name: vid-db + name: "{{ .Values.nsPrefix }}-vid-db" spec: capacity: storage: 2Gi @@ -27,4 +27,4 @@ spec: storage: 2Gi selector: matchLabels: - name: vid-db + name: "{{ .Values.nsPrefix }}-vid-db" -- 2.16.6