From d15bdd153dc91c268fcb2b4a5f1c289f52f89fec Mon Sep 17 00:00:00 2001
From: slimm609 <dbrian@vmware.com>
Date: Mon, 6 Nov 2023 09:51:50 -0500
Subject: [PATCH] fix: refactor to fix labels

Signed-off-by: slimm609 <dbrian@vmware.com>
---
 charts/ingress-nginx/templates/_helpers.tpl   | 34 ++++---------------
 charts/ingress-nginx/templates/_tplvalues.tpl | 22 ------------
 .../templates/controller-ingressclass.yaml    |  2 +-
 3 files changed, 8 insertions(+), 50 deletions(-)
 delete mode 100644 charts/ingress-nginx/templates/_tplvalues.tpl

diff --git a/charts/ingress-nginx/templates/_helpers.tpl b/charts/ingress-nginx/templates/_helpers.tpl
index bdd98cc28..f3bd2082f 100644
--- a/charts/ingress-nginx/templates/_helpers.tpl
+++ b/charts/ingress-nginx/templates/_helpers.tpl
@@ -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 }}
+{{- 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 -}}
 
diff --git a/charts/ingress-nginx/templates/_tplvalues.tpl b/charts/ingress-nginx/templates/_tplvalues.tpl
deleted file mode 100644
index 77b4809b2..000000000
--- a/charts/ingress-nginx/templates/_tplvalues.tpl
+++ /dev/null
@@ -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 -}}
\ No newline at end of file
diff --git a/charts/ingress-nginx/templates/controller-ingressclass.yaml b/charts/ingress-nginx/templates/controller-ingressclass.yaml
index 83590fec5..9cbe1b58c 100644
--- a/charts/ingress-nginx/templates/controller-ingressclass.yaml
+++ b/charts/ingress-nginx/templates/controller-ingressclass.yaml
@@ -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 }}