summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2023-07-18 20:27:56 +0200
committerAndreas Geissler <andreas-geissler@telekom.de>2023-07-19 11:14:10 +0200
commit95ea136d97f812b0946b03f8d9b2df4cdf3673d3 (patch)
tree1b6ea3ff7402600663e611911cd8670b4d90fb69
parent1be1c0f7ab523184b4c24cbc934d2bcd4afde69f (diff)
[COMMON] Add version label to be Istio ready
Add the "version" label (Chart.Version or Chart.AppVesrion if exists) Correct the metadata of CPS deployment. Issue-ID: OOM-3230 Change-Id: I0a6907ed95c6b0dfcf7f89fec9c3dafbc2fb1d9b Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
-rw-r--r--kubernetes/common/common/templates/_labels.tpl5
-rw-r--r--kubernetes/cps/components/ncmp-dmi-plugin/templates/deployment.yaml5
2 files changed, 6 insertions, 4 deletions
diff --git a/kubernetes/common/common/templates/_labels.tpl b/kubernetes/common/common/templates/_labels.tpl
index f2bd1a1141..a690acd141 100644
--- a/kubernetes/common/common/templates/_labels.tpl
+++ b/kubernetes/common/common/templates/_labels.tpl
@@ -27,6 +27,11 @@ The function takes several arguments (inside a dictionary):
{{- $dot := default . .dot -}}
app.kubernetes.io/name: {{ include "common.name" $dot }}
app: {{ include "common.name" $dot }}
+{{- if $dot.Chart.AppVersion }}
+version: "{{ $dot.Chart.AppVersion | replace "+" "_" }}"
+{{- else }}
+version: "{{ $dot.Chart.Version | replace "+" "_" }}"
+{{- end }}
{{ if not .ignoreHelmChart }}
helm.sh/chart: {{ include "common.chart" $dot }}
{{- end }}
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/templates/deployment.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/templates/deployment.yaml
index 4ff2851b0c..2d653a1870 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/templates/deployment.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/templates/deployment.yaml
@@ -31,10 +31,7 @@ spec:
maxSurge: {{ index .Values.updateStrategy.maxSurge }}
selector: {{- include "common.selectors" . | nindent 4 }}
template:
- metadata:
- labels:
- app.kubernetes.io/name: {{ include "common.name" . }}
- app.kubernetes.io/instance: {{ include "common.release" . }}
+ metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
{{ include "common.podSecurityContext" . | indent 6 | trim}}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . ) }}