aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/common/music/charts
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/music/charts
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/music/charts')
-rw-r--r--kubernetes/common/music/charts/music-cassandra-job/templates/job.yaml4
-rw-r--r--kubernetes/common/music/charts/music-cassandra/templates/pv.yaml4
-rw-r--r--kubernetes/common/music/charts/music-cassandra/templates/service.yaml4
-rw-r--r--kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml6
-rwxr-xr-xkubernetes/common/music/charts/music-tomcat/templates/deployment.yaml6
-rwxr-xr-xkubernetes/common/music/charts/music-tomcat/templates/service.yaml4
-rw-r--r--kubernetes/common/music/charts/zookeeper/templates/config-jmx-exporter.yaml4
-rw-r--r--kubernetes/common/music/charts/zookeeper/templates/job-chroots.yaml4
-rw-r--r--kubernetes/common/music/charts/zookeeper/templates/poddisruptionbudget.yaml4
-rw-r--r--kubernetes/common/music/charts/zookeeper/templates/pv.yaml4
-rw-r--r--kubernetes/common/music/charts/zookeeper/templates/service-headless.yaml4
-rw-r--r--kubernetes/common/music/charts/zookeeper/templates/service.yaml4
-rw-r--r--kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml10
13 files changed, 31 insertions, 31 deletions
diff --git a/kubernetes/common/music/charts/music-cassandra-job/templates/job.yaml b/kubernetes/common/music/charts/music-cassandra-job/templates/job.yaml
index 88f0c7465f..46310fb0fb 100644
--- a/kubernetes/common/music/charts/music-cassandra-job/templates/job.yaml
+++ b/kubernetes/common/music/charts/music-cassandra-job/templates/job.yaml
@@ -22,14 +22,14 @@ metadata:
labels:
app: {{ include "common.name" . }}-job
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
template:
metadata:
labels:
app: {{ include "common.name" . }}-job
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
restartPolicy: Never
initContainers:
diff --git a/kubernetes/common/music/charts/music-cassandra/templates/pv.yaml b/kubernetes/common/music/charts/music-cassandra/templates/pv.yaml
index fb815400da..8399bff77d 100644
--- a/kubernetes/common/music/charts/music-cassandra/templates/pv.yaml
+++ b/kubernetes/common/music/charts/music-cassandra/templates/pv.yaml
@@ -26,7 +26,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:
@@ -37,7 +37,7 @@ spec:
persistentVolumeReclaimPolicy: {{ $global.Values.persistence.volumeReclaimPolicy }}
storageClassName: "{{ include "common.fullname" $global }}-data"
hostPath:
- path: {{ $global.Values.global.persistence.mountPath | default $global.Values.persistence.mountPath }}/{{ $global.Release.Name }}/{{ $global.Values.persistence.mountSubPath }}-{{$i}}
+ path: {{ $global.Values.global.persistence.mountPath | default $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/music/charts/music-cassandra/templates/service.yaml b/kubernetes/common/music/charts/music-cassandra/templates/service.yaml
index 818c70e8f3..5a26d6701c 100644
--- a/kubernetes/common/music/charts/music-cassandra/templates/service.yaml
+++ b/kubernetes/common/music/charts/music-cassandra/templates/service.yaml
@@ -21,7 +21,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
annotations:
service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
@@ -50,5 +50,5 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
clusterIP: None
diff --git a/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml b/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml
index c3c56f2282..58866495db 100644
--- a/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml
+++ b/kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml
@@ -23,7 +23,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
podAntiAffinity:
@@ -46,7 +46,7 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
name: {{ include "common.name" . }}
spec:
containers:
@@ -120,7 +120,7 @@ spec:
labels:
name: {{ include "common.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
- release: "{{ .Release.Name }}"
+ release: "{{ include "common.release" . }}"
heritage: "{{ .Release.Service }}"
spec:
accessModes:
diff --git a/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml b/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
index 2a38a6aad0..dcbd4e2d88 100755
--- a/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
+++ b/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
@@ -22,7 +22,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
@@ -30,7 +30,7 @@ spec:
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
spec:
initContainers:
- name: {{ include "common.name" . }}-zookeeper-readiness
@@ -54,7 +54,7 @@ spec:
- /root/job_complete.py
args:
- -j
- - "{{ .Release.Name }}-music-cassandra-job-config"
+ - "{{ include "common.release" . }}-music-cassandra-job-config"
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/common/music/charts/music-tomcat/templates/service.yaml b/kubernetes/common/music/charts/music-tomcat/templates/service.yaml
index f6a086cc99..d808bf957a 100755
--- a/kubernetes/common/music/charts/music-tomcat/templates/service.yaml
+++ b/kubernetes/common/music/charts/music-tomcat/templates/service.yaml
@@ -22,7 +22,7 @@ metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
annotations:
spec:
@@ -39,4 +39,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
diff --git a/kubernetes/common/music/charts/zookeeper/templates/config-jmx-exporter.yaml b/kubernetes/common/music/charts/zookeeper/templates/config-jmx-exporter.yaml
index aeb9a2c031..72fedbcbbb 100644
--- a/kubernetes/common/music/charts/zookeeper/templates/config-jmx-exporter.yaml
+++ b/kubernetes/common/music/charts/zookeeper/templates/config-jmx-exporter.yaml
@@ -2,11 +2,11 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ .Release.Name }}-jmx-exporter
+ name: {{ include "common.release" . }}-jmx-exporter
labels:
app: {{ template "common.name" . }}
chart: {{ .Chart.Name }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
data:
config.yml: |-
diff --git a/kubernetes/common/music/charts/zookeeper/templates/job-chroots.yaml b/kubernetes/common/music/charts/zookeeper/templates/job-chroots.yaml
index b5b97233a0..b857a0d7b1 100644
--- a/kubernetes/common/music/charts/zookeeper/templates/job-chroots.yaml
+++ b/kubernetes/common/music/charts/zookeeper/templates/job-chroots.yaml
@@ -12,7 +12,7 @@ metadata:
labels:
app: {{ template "common.name" . }}
chart: {{ .Chart.Name }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
component: jobs
job: chroots
@@ -25,7 +25,7 @@ spec:
metadata:
labels:
app: {{ template "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
component: jobs
job: chroots
spec:
diff --git a/kubernetes/common/music/charts/zookeeper/templates/poddisruptionbudget.yaml b/kubernetes/common/music/charts/zookeeper/templates/poddisruptionbudget.yaml
index 7a9f3fe105..a4bc322a31 100644
--- a/kubernetes/common/music/charts/zookeeper/templates/poddisruptionbudget.yaml
+++ b/kubernetes/common/music/charts/zookeeper/templates/poddisruptionbudget.yaml
@@ -5,13 +5,13 @@ metadata:
labels:
app: {{ template "common.name" . }}
chart: {{ .Chart.Name }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
component: server
spec:
selector:
matchLabels:
app: {{ template "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
component: server
{{ toYaml .Values.podDisruptionBudget | indent 2 }}
diff --git a/kubernetes/common/music/charts/zookeeper/templates/pv.yaml b/kubernetes/common/music/charts/zookeeper/templates/pv.yaml
index 795ad3188b..6e53a9543d 100644
--- a/kubernetes/common/music/charts/zookeeper/templates/pv.yaml
+++ b/kubernetes/common/music/charts/zookeeper/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.global.persistence.mountPath | default $global.Values.persistence.mountPath }}/{{ $global.Release.Name }}/{{ $global.Values.persistence.mountSubPath }}-{{$i}}
+ path: {{ $global.Values.global.persistence.mountPath | default $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/music/charts/zookeeper/templates/service-headless.yaml b/kubernetes/common/music/charts/zookeeper/templates/service-headless.yaml
index 70ebf6013e..31475a1c76 100644
--- a/kubernetes/common/music/charts/zookeeper/templates/service-headless.yaml
+++ b/kubernetes/common/music/charts/zookeeper/templates/service-headless.yaml
@@ -5,7 +5,7 @@ metadata:
labels:
app: {{ template "common.name" . }}
chart: {{ .Chart.Name }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
clusterIP: None
@@ -18,4 +18,4 @@ spec:
{{- end }}
selector:
app: {{ template "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
diff --git a/kubernetes/common/music/charts/zookeeper/templates/service.yaml b/kubernetes/common/music/charts/zookeeper/templates/service.yaml
index 6ac3066ecf..0ef3a28b27 100644
--- a/kubernetes/common/music/charts/zookeeper/templates/service.yaml
+++ b/kubernetes/common/music/charts/zookeeper/templates/service.yaml
@@ -5,7 +5,7 @@ metadata:
labels:
app: {{ template "common.name" . }}
chart: {{ .Chart.Name }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
annotations:
{{- with .Values.service.annotations }}
@@ -20,4 +20,4 @@ spec:
{{- end }}
selector:
app: {{ template "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
diff --git a/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml b/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml
index 580042d090..73224addef 100644
--- a/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml
+++ b/kubernetes/common/music/charts/zookeeper/templates/statefulset.yaml
@@ -5,7 +5,7 @@ metadata:
labels:
app: {{ template "common.name" . }}
chart: {{ .Chart.Name }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
component: server
spec:
@@ -25,7 +25,7 @@ spec:
selector:
matchLabels:
app: {{ template "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
component: server
updateStrategy:
{{ toYaml .Values.updateStrategy | indent 4 }}
@@ -33,7 +33,7 @@ spec:
metadata:
labels:
app: {{ template "common.name" . }}
- release: {{ .Release.Name }}
+ release: {{ include "common.release" . }}
component: server
{{- if .Values.podLabels }}
## Custom pod labels
@@ -160,7 +160,7 @@ spec:
{{- if .Values.exporters.jmx.enabled }}
- name: config-jmx-exporter
configMap:
- name: {{ .Release.Name }}-jmx-exporter
+ name: {{ include "common.release" . }}-jmx-exporter
{{- end }}
{{- end }}
{{- if .Values.persistence.enabled }}
@@ -170,7 +170,7 @@ spec:
labels:
name: {{ include "common.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
- release: "{{ .Release.Name }}"
+ release: "{{ include "common.release" . }}"
heritage: "{{ .Release.Service }}"
spec:
accessModes: