DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: refactor to fix labels

Browse source 
Signed-off-by: slimm609 <dbrian@vmware.com>
This commit is contained in:
slimm609 2023-11-06 09:51:50 -05:00
parent 85b2e0f858
commit d15bdd153d
3 changed files with 8 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
charts/ingress-nginx/templates/_helpers.tpl
View file

@ -132,47 +132,27 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- printf "%s-%s" (include "ingress-nginx.fullname" .) .Values.defaultBackend.name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Set the version of the Chart to include in the labels mapping
*/}}
{{- define "ingress-nginx.version" -}}
{{- default .Chart.Version .Chart.AppVersion | quote -}}
{{- end -}}
{{/*
Common labels
*/}}
{{- define "ingress-nginx.labels" -}}
{{- if and (hasKey . "customLabels") (hasKey . "context") -}}
{{ merge
(include "tplvalues.render" (dict "value" .customLabels "context" .context) | fromYaml)
(dict
"app.kubernetes.io/version" (include "ingress-nginx.version" .context)
"app.kubernetes.io/name" (include "ingress-nginx.name" .context)
"helm.sh/chart" (include "ingress-nginx.chart" .context)
"app.kubernetes.io/part-of" .context.Release.Name
"app.kubernetes.io/managed-by" .context.Release.Service
)
| toYaml
}}
{{- else -}}
app.kubernetes.io/version: {{ include "ingress-nginx.version" . }}
{{ include "ingress-nginx.selectorLabels" . }}
app.kubernetes.io/name: {{ include "ingress-nginx.name" . }}
helm.sh/chart: {{ include "ingress-nginx.chart" . }}
app.kubernetes.io/part-of: {{ .Release.Name }}
{{ include "ingress-nginx.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/part-of: {{ template "ingress-nginx.name" . }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.commonLabels}}
{{ toYaml .Values.commonLabels }}
{{- end }}
{{- end -}}
{{- end -}}
{{/*
Selector labels
*/}}
{{- define "ingress-nginx.selectorLabels" -}}
app.kubernetes.io/name: {{ include "ingress-nginx.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}

22
charts/ingress-nginx/templates/_tplvalues.tpl
View file

@ -1,22 +0,0 @@
{{/* vim: set filetype=mustache: */}}
{{/*
Renders a value that contains template perhaps with scope if the scope is present.
Usage:
{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $ ) }}
{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $ "scope" $app ) }}
*/}}
{{- define "tplvalues.render" -}}
{{- if .scope }}
{{- if typeIs "string" .value }}
{{- tpl (cat "{{- with $.RelativeScope -}}" .value "{{- end }}") (merge (dict "RelativeScope" .scope) .context) }}
{{- else }}
{{- tpl (cat "{{- with $.RelativeScope -}}" (.value | toYaml) "{{- end }}") (merge (dict "RelativeScope" .scope) .context) }}
{{- end }}
{{- else }}
{{- if typeIs "string" .value }}
{{- tpl .value .context }}
{{- else }}
{{- tpl (.value | toYaml) .context }}
{{- end }}
{{- end -}}
{{- end -}}

2
charts/ingress-nginx/templates/controller-ingressclass.yaml
View file

@ -7,7 +7,7 @@ apiVersion: networking.k8s.io/v1
kind: IngressClass
metadata:
labels:
{{- include "ingress-nginx.labels" ( dict "customLabels" $.Values.commonLabels "context" $ ) | nindent 4 }}
{{- include "ingress-nginx.labels" $ | nindent 4 }}
app.kubernetes.io/component: controller
{{- with $.Values.controller.labels }}
{{- toYaml . | nindent 4 }}