From 6ca2d32a7dc8a5f96218e6473fcc884782be70ac Mon Sep 17 00:00:00 2001
From: Ruslan Gainanov <gromrx1@gmail.com>
Date: Tue, 6 Dec 2022 19:24:48 +0300
Subject: [PATCH] fix generic params in defines

---
 charts/universal-chart/Chart.yaml                 | 2 +-
 charts/universal-chart/templates/helpers/_app.tpl | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/universal-chart/Chart.yaml b/charts/universal-chart/Chart.yaml
index 47c12d5..08fdecf 100644
--- a/charts/universal-chart/Chart.yaml
+++ b/charts/universal-chart/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Nixys universal Helm chart for deploy your apps to Kubernetes
 name: universal-chart
-version: 2.1.6
+version: 2.1.7
 maintainers:
 - name: Roman Andreev
   email: r.andreev@nixys.ru
diff --git a/charts/universal-chart/templates/helpers/_app.tpl b/charts/universal-chart/templates/helpers/_app.tpl
index cdcb7e6..bc7737d 100644
--- a/charts/universal-chart/templates/helpers/_app.tpl
+++ b/charts/universal-chart/templates/helpers/_app.tpl
@@ -45,7 +45,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
-{{- with .Values.generic.labels }}
+{{- with ((.Values).generic).labels }}
 {{ include "helpers.tplvalues.render" (dict "value" . "context" $) }}
 {{- end }}
 {{- end }}
@@ -57,13 +57,13 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{- define "helpers.app.genericSelectorLabels" -}}
-{{- with .Values.generic.extraSelectorLabels }}
+{{- with ((.Values).generic).extraSelectorLabels }}
 {{- include "helpers.tplvalues.render" (dict "value" . "context" .) }}
 {{- end }}
 {{- end }}
 
 {{- define "helpers.app.genericAnnotations" -}}
-{{- with .Values.generic.annotations }}
+{{- with ((.Values).generic).annotations }}
 {{ include "helpers.tplvalues.render" (dict "value" . "context" $) }}
 {{- end }}
 {{- end }}