diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2023-07-19 11:57:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2023-07-19 11:57:53 +0000 |
| commit | ea924c1925e1defb454c3af53245a84ef7ec060e (patch) | |
| tree | 75ca37f6fa3c55e0cef9049148a54024d39e821f | |
| parent | afd83333558d7b9240bec6836d13ca73fd494493 (diff) | |
| parent | 95ea136d97f812b0946b03f8d9b2df4cdf3673d3 (diff) | |
Merge "[COMMON] Add version label to be Istio ready"
| -rw-r--r-- | kubernetes/common/common/templates/_labels.tpl | 5 | ||||
| -rw-r--r-- | kubernetes/cps/components/ncmp-dmi-plugin/templates/deployment.yaml | 5 |
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" . ) }} |