aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/common/etcd/templates
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-01-24 23:49:11 +0100
committerKrzysztof Opasiak <k.opasiak@samsung.com>2020-02-01 00:10:01 +0100
commit137d7ccd2597a6492e926818eebab2f6067fb382 (patch)
tree75aab2669ecb57a7008c7156fded0678e6ea9fba /kubernetes/common/etcd/templates
parent03b1009c7b791ea3252237f79367ff0501460f16 (diff)
[ONAP-wide] Replace .Release.Name with common.release
ONAP is too big to be deployed using helm install so we need to use a custom helm plugin helm deploy. This script deloys onap component by component instead of deploying evrything at once. Unfortunately this script also modifies the helm release by appending component name to it. As a result of this behavior our objects are called for example: onap-mariadb-galera-mariadb-galera-0 instead of just being called onap-mariadb-galera-0. This patch simplifies this naming convention by replacing all direct usages of .Release.Name with common.release macro which strips the component specific part from the release name. Issue-ID: OOM-2275 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: Ia8cead50d305adb00eef666d0a1ace74479b5183
Diffstat (limited to 'kubernetes/common/etcd/templates')
-rw-r--r--kubernetes/common/etcd/templates/pv.yaml4
-rw-r--r--kubernetes/common/etcd/templates/service.yaml4
-rw-r--r--kubernetes/common/etcd/templates/statefulset.yaml6
3 files changed, 7 insertions, 7 deletions
diff --git a/kubernetes/common/etcd/templates/pv.yaml b/kubernetes/common/etcd/templates/pv.yaml
index da8dfb8a22..ed1344d4c1 100644
--- a/kubernetes/common/etcd/templates/pv.yaml
+++ b/kubernetes/common/etcd/templates/pv.yaml
@@ -25,7 +25,7 @@ metadata:
labels:
app: {{ include "common.fullname" $global }}
chart: "{{ $global.Chart.Name }}-{{ $global.Chart.Version | replace "+" "_" }}"
- release: "{{ $global.Release.Name }}"
+ release: "{{ include "common.release" $global }}"
heritage: "{{ $global.Release.Service }}"
name: {{ include "common.fullname" $global }}
spec:
@@ -36,7 +36,7 @@ spec:
persistentVolumeReclaimPolicy: {{ $global.Values.persistence.volumeReclaimPolicy }}
storageClassName: "{{ include "common.fullname" $global }}-data"
hostPath:
- path: {{ $global.Values.persistence.mountPath }}/{{ $global.Release.Name }}/{{ $global.Values.persistence.mountSubPath }}-{{ $i }}
+ path: {{ $global.Values.persistence.mountPath }}/{{ include "common.release" $global }}/{{ $global.Values.persistence.mountSubPath }}-{{ $i }}
{{if ne $i (int $global.Values.replicaCount) }}
---
{{- end -}}
diff --git a/kubernetes/common/etcd/templates/service.yaml b/kubernetes/common/etcd/templates/service.yaml
index 692faa9f2d..4268dd6d2c 100644
--- a/kubernetes/common/etcd/templates/service.yaml
+++ b/kubernetes/common/etcd/templates/service.yaml
@@ -21,7 +21,7 @@ metadata:
name: {{ include "common.servicename" . }}
labels:
heritage: "{{ .Release.Service }}"
- release: "{{ .Release.Name }}"
+ release: "{{ include "common.release" . }}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: {{ include "common.name" . }}
spec:
@@ -33,5 +33,5 @@ spec:
clusterIP: None
selector:
app: {{ include "common.name" . }}
- release: "{{ .Release.Name }}"
+ release: "{{ include "common.release" . }}"
diff --git a/kubernetes/common/etcd/templates/statefulset.yaml b/kubernetes/common/etcd/templates/statefulset.yaml
index cef1a48c2a..96cda89c1f 100644
--- a/kubernetes/common/etcd/templates/statefulset.yaml
+++ b/kubernetes/common/etcd/templates/statefulset.yaml
@@ -17,7 +17,7 @@ metadata:
name: {{ include "common.fullname" . }}
labels:
heritage: "{{ .Release.Service }}"
- release: "{{ .Release.Name }}"
+ release: "{{ include "common.release" . }}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: {{ include "common.name" . }}
spec:
@@ -27,7 +27,7 @@ spec:
metadata:
labels:
heritage: "{{ .Release.Service }}"
- release: "{{ .Release.Name }}"
+ release: "{{ include "common.release" . }}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: {{ include "common.name" . }}
spec:
@@ -216,7 +216,7 @@ spec:
labels:
name: {{ include "common.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
- release: "{{ .Release.Name }}"
+ release: "{{ include "common.release" . }}"
heritage: "{{ .Release.Service }}"
spec:
accessModes: