From 9d3f2c65a8013fcc13022a56d287991d2e253021 Mon Sep 17 00:00:00 2001
From: Naseem Ullah <naseemkullah@gmail.com>
Date: Fri, 11 Jan 2019 10:26:29 -0500
Subject: [PATCH] Cleaning template

Signed-off-by: Naseem Ullah <naseemkullah@gmail.com>
---
 pkg/chartutil/create.go | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go
index b1a4c516a..8a09a4bea 100644
--- a/pkg/chartutil/create.go
+++ b/pkg/chartutil/create.go
@@ -243,39 +243,35 @@ spec:
     {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.deployment.image.repository }}:{{ .Values.deployment.image.tag }}"
-          imagePullPolicy: {{ .Values.deployment.image.pullPolicy }}
+{{- with .Values.deployment }}
+          image: "{{ .image.repository }}:{{ .image.tag }}"
+          imagePullPolicy: {{ .image.pullPolicy }}
           ports:
             - name: http
               containerPort: 80
               protocol: TCP
           livenessProbe:
             httpGet:
-              path: {{ .Values.deployment.livenessProbe.httpGet.path }}
-              port: {{ .Values.deployment.livenessProbe.httpGet.port }}
+              path: {{ .livenessProbe.httpGet.path }}
+              port: {{ .livenessProbe.httpGet.port }}
           readinessProbe:
             httpGet:
-              path: {{ .Values.deployment.readinessProbe.httpGet.path }}
-              port: {{ .Values.deployment.readinessProbe.httpGet.port }}
+              path: {{ .readinessProbe.httpGet.path }}
+              port: {{ .readinessProbe.httpGet.port }}
           resources:
-            {{- toYaml .Values.deployment.resources | nindent 12 }}
+            {{- toYaml .resources | nindent 12 }}
           env:
-            {{- toYaml .Values.deployment.env | nindent 12 }}
+            {{- toYaml .env | nindent 12 }}
           volumeMounts:
-            {{- toYaml .Values.deployment.volumeMounts | nindent 12 }}
+            {{- toYaml .volumeMounts | nindent 12 }}
           securityContext:
-            {{- toYaml .Values.deployment.securityContext | nindent 12 }}
-    {{- with .Values.deployment.nodeSelector }}
+            {{- toYaml .securityContext | nindent 12 }}
       nodeSelector:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.deployment.affinity }}
+        {{- toYaml .nodeSelector | nindent 8 }}
       affinity:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.deployment.tolerations }}
+        {{- toYaml .affinity | nindent 8 }}
       tolerations:
-        {{- toYaml . | nindent 8 }}
+        {{- toYaml .tolerations | nindent 8 }}
     {{- end }}
 `
 const defaultHorizontalPodAutoscaler = `{{- if .Values.deployment.hpa.enabled }}