finalize helpers

charts/zesty/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.7
+version: 1.1.8
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/zesty/templates/_helpers.tpl

@@ -10,7 +10,7 @@ Helper Templates for zesty-admission-controller and zesty-k8s
 Expand the name of the chart.
 */}}
 {{- define "zesty-admission-controller.name" -}}
-{{- default "zesty-admission-controller" .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- default "zesty-admission-controller" .Values.admissionController.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
@@ -19,10 +19,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "zesty-admission-controller.fullname" -}}
-  {{- if .Values.fullnameOverride }}
-    {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+  {{- if .Values.admissionController.fullnameOverride }}
+    {{- .Values.admissionController.fullnameOverride | trunc 63 | trimSuffix "-" }}
   {{- else }}
-    {{- $name := default "zesty-admission-controller" .Values.nameOverride }}
+    {{- $name := default "zesty-admission-controller" .Values.admissionController.nameOverride }}
     {{- if contains $name .Release.Name }}
       {{- .Release.Name | trunc 63 | trimSuffix "-" }}
     {{- else }}
@@ -42,7 +42,7 @@ Create chart name and version as used by the chart label.
 Create a namespace name used by the chart.
 */}}
 {{- define "zesty-admission-controller.namespace" -}}
-  {{ default .Release.Namespace .Values.namespaceOverride }}
+  {{ default .Release.Namespace .Values.admissionController.namespaceOverride }}
 {{- end -}}
 
 {{/*