[UUI] Update image version 16.0.1 of components of UUI

[oom.git] / kubernetes / common / common / templates / _labels.tpl

diff --git a/kubernetes/common/common/templates/_labels.tpl b/kubernetes/common/common/templates/_labels.tpl
index da8f00f..97e2e7f 100644 (file)
--- a/kubernetes/common/common/templates/_labels.tpl
+++ b/kubernetes/common/common/templates/_labels.tpl
@@ -1,5 +1,7 @@
 {{/*
 # Copyright © 2019 Orange
 {{/*
 # Copyright © 2019 Orange

+# Modifications Copyright © 2022 Bell Canada
+# Modifications Copyright © 2025 Deutsche Telekom

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -21,11 +23,23 @@ Common labels
 The function takes several arguments (inside a dictionary):
      - .dot : environment (.)
      - .labels : labels to add (dict)
 The function takes several arguments (inside a dictionary):
      - .dot : environment (.)
      - .labels : labels to add (dict)

+     - .suffix : name suffix
+     - .prefix : name prefix

 */}}
 {{- define "common.labels" -}}
 {{- $dot := default . .dot -}}
 */}}
 {{- define "common.labels" -}}
 {{- $dot := default . .dot -}}

-app.kubernetes.io/name: {{ include "common.name" $dot }}
+{{- $suffix := default "" .suffix -}}
+{{- $prefix := default "" .prefix -}}
+app.kubernetes.io/name: {{ include "common.name" (dict "dot" $dot "suffix" $suffix "prefix" $prefix) }}
+app: {{ include "common.name" (dict "dot" $dot "suffix" $suffix "prefix" $prefix) }}
+{{- 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 }}
 helm.sh/chart: {{ include "common.chart" $dot }}

+{{- end }}

 app.kubernetes.io/instance: {{ include "common.release" $dot }}
 app.kubernetes.io/managed-by: {{ $dot.Release.Service }}
 {{ if .labels }}
 app.kubernetes.io/instance: {{ include "common.release" $dot }}
 app.kubernetes.io/managed-by: {{ $dot.Release.Service }}
 {{ if .labels }}


@@ -65,9 +79,14 @@ app.kubernetes.io/instance: {{ include "common.release" $dot }}
 {{- $suffix := default "" .suffix -}}
 {{- $labels := default (dict) .labels -}}
 {{- $annotations := default (dict) .annotations -}}
 {{- $suffix := default "" .suffix -}}
 {{- $labels := default (dict) .labels -}}
 {{- $annotations := default (dict) .annotations -}}

+{{- $includeFullname := default "true" .includeFullname -}}
+{{- if eq ($includeFullname | lower) "true" -}}

 name: {{ include "common.fullname" (dict "suffix" $suffix "dot" $dot )}}
 name: {{ include "common.fullname" (dict "suffix" $suffix "dot" $dot )}}

+{{- else -}}
+name: {{ include "common.name" (dict "suffix" $suffix "dot" $dot )}}
+{{- end }}

 namespace: {{ include "common.namespace" $dot }}
 namespace: {{ include "common.namespace" $dot }}

-labels: {{- include "common.labels" (dict "labels" $labels "dot" $dot ) | nindent 2 }}
+labels: {{- include "common.labels" (dict "labels" $labels "ignoreHelmChart" .ignoreHelmChart "dot" $dot ) | nindent 2 }}

 {{- if $annotations }}
 annotations:  {{- include "common.tplValue" (dict "value" $annotations "context" $dot) | nindent 2}}
 {{- end }}
 {{- if $annotations }}
 annotations:  {{- include "common.tplValue" (dict "value" $annotations "context" $dot) | nindent 2}}
 {{- end }}


@@ -90,13 +109,16 @@ matchLabels: {{- include "common.matchLabels" (dict "matchLabels" $matchLabels "
     The function takes several arguments (inside a dictionary)
      - .dot : environment (.)
      - .labels: labels to add (dict)
     The function takes several arguments (inside a dictionary)
      - .dot : environment (.)
      - .labels: labels to add (dict)

+     - .annotations: annotation to add (dict)

 */}}
 {{- define "common.templateMetadata" -}}
 {{- $dot := default . .dot -}}
 {{- $labels := default (dict) .labels -}}
 */}}
 {{- define "common.templateMetadata" -}}
 {{- $dot := default . .dot -}}
 {{- $labels := default (dict) .labels -}}

-{{- if $dot.Values.podAnnotations }}
-annotations: {{- include "common.tplValue" (dict "value" $dot.Values.podAnnotations "context" $dot) | nindent 2 }}
+{{- $suffix := default "" .suffix -}}
+{{- $annotations := default $dot.Values.podAnnotations .annotations -}}
+{{- if $annotations}}
+annotations: {{- include "common.tplValue" (dict "value" $annotations "context" $dot) | nindent 2 }}

 {{- end }}
 {{- end }}

-labels: {{- include "common.labels" (dict "labels" $labels "dot" $dot) | nindent 2 }}
-name: {{ include "common.name" $dot }}
+labels: {{- include "common.labels" (dict "labels" $labels "ignoreHelmChart" .ignoreHelmChart "dot" $dot) | nindent 2 }}
+name: {{ include "common.name" (dict "suffix" $suffix "dot" $dot )}}

 {{- end -}}
 {{- end -}}