X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fcommon%2Ftemplates%2F_labels.tpl;h=993fb7dfac6c28e4070b4d70d8dbeb900627e088;hb=79a0a147fc7a0f660498bd3479e9aa4beb028672;hp=66727629ef167c05eed4b55de0fe1cbbe967aedf;hpb=8b0a6c11bb7c82411efdea28615320c1fbf24019;p=oom.git diff --git a/kubernetes/common/common/templates/_labels.tpl b/kubernetes/common/common/templates/_labels.tpl index 66727629ef..993fb7dfac 100644 --- a/kubernetes/common/common/templates/_labels.tpl +++ b/kubernetes/common/common/templates/_labels.tpl @@ -1,5 +1,6 @@ {{/* # Copyright © 2019 Orange +# Modifications Copyright (C) 2022 Bell Canada # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,12 +26,14 @@ The function takes several arguments (inside a dictionary): {{- define "common.labels" -}} {{- $dot := default . .dot -}} app.kubernetes.io/name: {{ include "common.name" $dot }} +{{ if not .ignoreHelmChart }} 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 }} {{- include "common.tplValue" (dict "value" .labels "context" $dot) }} -{{- end -}} +{{- end }} {{- end -}} {{/* @@ -41,14 +44,15 @@ The function takes several arguments (inside a dictionary): */}} {{- define "common.matchLabels" -}} {{- $dot := default . .dot -}} -{{- if not .matchLabels.nameNoMatch -}} +{{- $matchLabels := default (dict) .matchLabels -}} +{{- if not $matchLabels.nameNoMatch -}} app.kubernetes.io/name: {{ include "common.name" $dot }} {{- end }} app.kubernetes.io/instance: {{ include "common.release" $dot }} -{{ if .matchLabels }} -{{$_ := unset .matchLabels "nameNoMatch"}} -{{- include "common.tplValue" (dict "value" .matchLabels "context" $dot) }} -{{- end -}} +{{- if $matchLabels }} +{{$_ := unset $matchLabels "nameNoMatch"}} +{{- include "common.tplValue" (dict "value" $matchLabels "context" $dot) }} +{{- end }} {{- end -}} {{/* @@ -66,10 +70,10 @@ app.kubernetes.io/instance: {{ include "common.release" $dot }} {{- $annotations := default (dict) .annotations -}} name: {{ include "common.fullname" (dict "suffix" $suffix "dot" $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 -}} +{{- end }} {{- end -}} {{/* @@ -94,8 +98,8 @@ matchLabels: {{- include "common.matchLabels" (dict "matchLabels" $matchLabels " {{- $dot := default . .dot -}} {{- $labels := default (dict) .labels -}} {{- if $dot.Values.podAnnotations }} -annotations: {{- include "common.tplValue" (dict "value" $dot.Values.podAnnotations "context" $) | nindent 2 }} +annotations: {{- include "common.tplValue" (dict "value" $dot.Values.podAnnotations "context" $dot) | nindent 2 }} {{- end }} -labels: {{- include "common.labels" (dict "labels" $labels "dot" $dot) | nindent 2 }} +labels: {{- include "common.labels" (dict "labels" $labels "ignoreHelmChart" .ignoreHelmChart "dot" $dot) | nindent 2 }} name: {{ include "common.name" $dot }} {{- end -}}