aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2019-09-03 07:36:55 +0000
committerGerrit Code Review <gerrit@onap.org>2019-09-03 07:36:55 +0000
commit1366ccb457383e633ca67d2d892706f0784cbdf0 (patch)
tree9bc384c9e4dbf7d6d2a2da97d2d253fb5a78392a
parent9d407f480e9d40460f6f76ffc6a09f61f1d6b85e (diff)
parent21a2b5e67d78ad321e307aa39d5d55aaf37c8353 (diff)
Merge "Modifying dmaap job labels because of inconsistency with other jobs. Mainly adding release label there."
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml2
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml2
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml2
-rw-r--r--kubernetes/dmaap/components/message-router/templates/post-install-job.yaml2
4 files changed, 8 insertions, 0 deletions
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml
index d01987448c..52c5566061 100644
--- a/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml
@@ -6,6 +6,7 @@ metadata:
app.kubernetes.io/managed-by: {{.Release.Service | quote }}
app.kubernetes.io/instance: {{.Release.Name | quote }}
helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+ release: {{ .Release.Name }}
annotations:
# This is what defines this resource as a hook. Without this line, the
# job is considered part of the release.
@@ -20,6 +21,7 @@ spec:
app.kubernetes.io/managed-by: {{.Release.Service | quote }}
app.kubernetes.io/instance: {{.Release.Name | quote }}
helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+ release: {{ .Release.Name }}
spec:
restartPolicy: Never
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
index 92349b8bf2..ede3f4999c 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
@@ -6,6 +6,7 @@ metadata:
app.kubernetes.io/managed-by: {{.Release.Service | quote }}
app.kubernetes.io/instance: {{.Release.Name | quote }}
helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+ release: {{ .Release.Name }}
annotations:
# This is what defines this resource as a hook. Without this line, the
# job is considered part of the release.
@@ -20,6 +21,7 @@ spec:
app.kubernetes.io/managed-by: {{.Release.Service | quote }}
app.kubernetes.io/instance: {{.Release.Name | quote }}
helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+ release: {{ .Release.Name }}
spec:
restartPolicy: Never
containers:
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
index e411b2b4e7..7b71bb03a2 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
@@ -6,6 +6,7 @@ metadata:
app.kubernetes.io/managed-by: {{.Release.Service | quote }}
app.kubernetes.io/instance: {{.Release.Name | quote }}
helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+ release: {{ .Release.Name }}
annotations:
# This is what defines this resource as a hook. Without this line, the
# job is considered part of the release.
@@ -20,6 +21,7 @@ spec:
app.kubernetes.io/managed-by: {{.Release.Service | quote }}
app.kubernetes.io/instance: {{.Release.Name | quote }}
helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+ release: {{ .Release.Name }}
spec:
restartPolicy: Never
containers:
diff --git a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
index b6f75d57cd..f428491127 100644
--- a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
@@ -6,6 +6,7 @@ metadata:
app.kubernetes.io/managed-by: {{.Release.Service | quote }}
app.kubernetes.io/instance: {{.Release.Name | quote }}
helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+ release: {{ .Release.Name }}
annotations:
# This is what defines this resource as a hook. Without this line, the
# job is considered part of the release.
@@ -20,6 +21,7 @@ spec:
app.kubernetes.io/managed-by: {{.Release.Service | quote }}
app.kubernetes.io/instance: {{.Release.Name | quote }}
helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+ release: {{ .Release.Name }}
spec:
restartPolicy: Never
containers: