diff --git a/charts/accumulo/templates/accumulo-compactor-deployment.yaml b/charts/accumulo/templates/accumulo-compactor-deployment.yaml
index 1f338d0ff45..231ac902949 100644
--- a/charts/accumulo/templates/accumulo-compactor-deployment.yaml
+++ b/charts/accumulo/templates/accumulo-compactor-deployment.yaml
@@ -15,16 +15,16 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 
 {{- if .Values.accumulo.compactor.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "accumulo.fullname" . }}-compactor
+  name: {{include "accumulo.fullname" .}}-compactor
   labels:
     {{- $component := "compactor" }}
-    {{- include "accumulo.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
+  {{- include "accumulo.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
   {{- with .Values.global.commonAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -34,12 +34,12 @@ spec:
   selector:
     matchLabels:
       {{- include "accumulo.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: compactor
+    app.kubernetes.io/component: compactor
   template:
     metadata:
       labels:
         {{- include "accumulo.selectorLabels" . | nindent 8 }}
-        app.kubernetes.io/component: compactor
+      app.kubernetes.io/component: compactor
       {{- with .Values.global.commonAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
@@ -51,7 +51,7 @@ spec:
         {{- $podAntiAffinity := .Values.accumulo.compactor.podAntiAffinity }}
         {{- include "accumulo.podAntiAffinity" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component "podAntiAffinity" $podAntiAffinity) | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "accumulo.serviceAccountName" . }}
+      serviceAccountName: {{include "accumulo.serviceAccountName" .}}
       initContainers:
       - name: wait-for-manager
         image: busybox:1.35
@@ -60,7 +60,7 @@ spec:
         - -c
         - |
           echo "Waiting for Accumulo manager to be ready..."
-          until nc -z {{ include "accumulo.fullname" . }}-manager 9999; do
+          until nc -z {{include "accumulo.fullname" .}}-manager 9999; do
             echo "Waiting for manager..."
             sleep 5
           done
@@ -97,8 +97,8 @@ spec:
       volumes:
       - name: accumulo-config
         configMap:
-          name: {{ include "accumulo.fullname" . }}-config
+          name: {{include "accumulo.fullname" .}}-config
           defaultMode: 0755
       - name: logs
         emptyDir: {}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/accumulo/templates/accumulo-gc-deployment.yaml b/charts/accumulo/templates/accumulo-gc-deployment.yaml
index 58dfc9ffe7a..245a564c4b5 100644
--- a/charts/accumulo/templates/accumulo-gc-deployment.yaml
+++ b/charts/accumulo/templates/accumulo-gc-deployment.yaml
@@ -15,16 +15,16 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 
 {{- if .Values.accumulo.gc.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "accumulo.fullname" . }}-gc
+  name: {{include "accumulo.fullname" .}}-gc
   labels:
     {{- $component := "gc" }}
-    {{- include "accumulo.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
+  {{- include "accumulo.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
   {{- with .Values.global.commonAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -34,18 +34,18 @@ spec:
   selector:
     matchLabels:
       {{- include "accumulo.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: gc
+    app.kubernetes.io/component: gc
   template:
     metadata:
       labels:
         {{- include "accumulo.selectorLabels" . | nindent 8 }}
-        app.kubernetes.io/component: gc
+      app.kubernetes.io/component: gc
       {{- with .Values.global.commonAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
-      serviceAccountName: {{ include "accumulo.serviceAccountName" . }}
+      serviceAccountName: {{include "accumulo.serviceAccountName" .}}
       initContainers:
       - name: wait-for-manager
         image: busybox:1.35
@@ -54,7 +54,7 @@ spec:
         - -c
         - |
           echo "Waiting for Accumulo manager to be ready..."
-          until nc -z {{ include "accumulo.fullname" . }}-manager 9999; do
+          until nc -z {{include "accumulo.fullname" .}}-manager 9999; do
             echo "Waiting for manager..."
             sleep 5
           done
@@ -89,8 +89,8 @@ spec:
       volumes:
       - name: accumulo-config
         configMap:
-          name: {{ include "accumulo.fullname" . }}-config
+          name: {{include "accumulo.fullname" .}}-config
           defaultMode: 0755
       - name: logs
         emptyDir: {}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/accumulo/templates/accumulo-manager-deployment.yaml b/charts/accumulo/templates/accumulo-manager-deployment.yaml
index 734cca07146..e21d16769f9 100644
--- a/charts/accumulo/templates/accumulo-manager-deployment.yaml
+++ b/charts/accumulo/templates/accumulo-manager-deployment.yaml
@@ -15,16 +15,16 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 
 {{- if .Values.accumulo.manager.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "accumulo.fullname" . }}-manager
+  name: {{include "accumulo.fullname" .}}-manager
   labels:
     {{- $component := "manager" }}
-    {{- include "accumulo.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
+  {{- include "accumulo.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
   {{- with .Values.global.commonAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -34,12 +34,12 @@ spec:
   selector:
     matchLabels:
       {{- include "accumulo.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: manager
+    app.kubernetes.io/component: manager
   template:
     metadata:
       labels:
         {{- include "accumulo.selectorLabels" . | nindent 8 }}
-        app.kubernetes.io/component: manager
+      app.kubernetes.io/component: manager
       {{- with .Values.global.commonAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
@@ -51,7 +51,7 @@ spec:
         {{- $podAntiAffinity := .Values.accumulo.manager.podAntiAffinity }}
         {{- include "accumulo.podAntiAffinity" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component "podAntiAffinity" $podAntiAffinity) | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "accumulo.serviceAccountName" . }}
+      serviceAccountName: {{include "accumulo.serviceAccountName" .}}
       initContainers:
       - name: wait-for-zookeeper
         image: busybox:1.35
@@ -72,7 +72,7 @@ spec:
         - -c
         - |
           echo "Waiting for Alluxio master to be ready..."
-          until nc -z {{ include "accumulo.fullname" . }}-alluxio-master 19998; do
+          until nc -z {{include "accumulo.fullname" .}}-alluxio-master 19998; do
             echo "Waiting for Alluxio master..."
             sleep 5
           done
@@ -89,7 +89,7 @@ spec:
             echo "Accumulo instance '{{ .Values.accumulo.instance.name }}' already exists"
             exit 0
           fi
-          
+
           echo "Initializing Accumulo instance '{{ .Values.accumulo.instance.name }}'"
           /opt/accumulo/bin/accumulo init \
             --instance-name {{ .Values.accumulo.instance.name }} \
@@ -157,8 +157,8 @@ spec:
       volumes:
       - name: accumulo-config
         configMap:
-          name: {{ include "accumulo.fullname" . }}-config
+          name: {{include "accumulo.fullname" .}}-config
           defaultMode: 0755
       - name: logs
         emptyDir: {}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/accumulo/templates/accumulo-manager-service.yaml b/charts/accumulo/templates/accumulo-manager-service.yaml
index ea26e4791e2..aa47ef7d8c7 100644
--- a/charts/accumulo/templates/accumulo-manager-service.yaml
+++ b/charts/accumulo/templates/accumulo-manager-service.yaml
@@ -15,16 +15,16 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 
 {{- if .Values.accumulo.manager.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "accumulo.fullname" . }}-manager
+  name: {{include "accumulo.fullname" .}}-manager
   labels:
-    {{- include "accumulo.labels" . | nindent 4 }}
-    app.kubernetes.io/component: manager
+    {{- include "accumulo.labels" . | nindent 4}}
+  app.kubernetes.io/component: manager
   {{- with .Values.global.commonAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -42,5 +42,5 @@ spec:
     protocol: TCP
   selector:
     {{- include "accumulo.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: manager
-{{- end }}
\ No newline at end of file
+  app.kubernetes.io/component: manager
+{{- end }}
diff --git a/charts/accumulo/templates/accumulo-monitor-deployment.yaml b/charts/accumulo/templates/accumulo-monitor-deployment.yaml
index 498a71abaaf..69fd66c378d 100644
--- a/charts/accumulo/templates/accumulo-monitor-deployment.yaml
+++ b/charts/accumulo/templates/accumulo-monitor-deployment.yaml
@@ -15,16 +15,16 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 
 {{- if .Values.accumulo.monitor.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "accumulo.fullname" . }}-monitor
+  name: {{include "accumulo.fullname" .}}-monitor
   labels:
     {{- $component := "monitor" }}
-    {{- include "accumulo.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
+  {{- include "accumulo.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
   {{- with .Values.global.commonAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -34,18 +34,18 @@ spec:
   selector:
     matchLabels:
       {{- include "accumulo.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: monitor
+    app.kubernetes.io/component: monitor
   template:
     metadata:
       labels:
         {{- include "accumulo.selectorLabels" . | nindent 8 }}
-        app.kubernetes.io/component: monitor
+      app.kubernetes.io/component: monitor
       {{- with .Values.global.commonAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
-      serviceAccountName: {{ include "accumulo.serviceAccountName" . }}
+      serviceAccountName: {{include "accumulo.serviceAccountName" .}}
       initContainers:
       - name: wait-for-manager
         image: busybox:1.35
@@ -54,7 +54,7 @@ spec:
         - -c
         - |
           echo "Waiting for Accumulo manager to be ready..."
-          until nc -z {{ include "accumulo.fullname" . }}-manager 9999; do
+          until nc -z {{include "accumulo.fullname" .}}-manager 9999; do
             echo "Waiting for manager..."
             sleep 5
           done
@@ -107,8 +107,8 @@ spec:
       volumes:
       - name: accumulo-config
         configMap:
-          name: {{ include "accumulo.fullname" . }}-config
+          name: {{include "accumulo.fullname" .}}-config
           defaultMode: 0755
       - name: logs
         emptyDir: {}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/accumulo/templates/accumulo-monitor-service.yaml b/charts/accumulo/templates/accumulo-monitor-service.yaml
index d11c86f41d8..4f42ce66cb0 100644
--- a/charts/accumulo/templates/accumulo-monitor-service.yaml
+++ b/charts/accumulo/templates/accumulo-monitor-service.yaml
@@ -15,16 +15,16 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 
 {{- if .Values.accumulo.monitor.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "accumulo.fullname" . }}-monitor
+  name: {{include "accumulo.fullname" .}}-monitor
   labels:
-    {{- include "accumulo.labels" . | nindent 4 }}
-    app.kubernetes.io/component: monitor
+    {{- include "accumulo.labels" . | nindent 4}}
+  app.kubernetes.io/component: monitor
   {{- with .Values.global.commonAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -38,5 +38,5 @@ spec:
     protocol: TCP
   selector:
     {{- include "accumulo.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: monitor
-{{- end }}
\ No newline at end of file
+  app.kubernetes.io/component: monitor
+{{- end }}
diff --git a/charts/accumulo/templates/accumulo-tserver-deployment.yaml b/charts/accumulo/templates/accumulo-tserver-deployment.yaml
index 0d37f4de2bc..ebf898dc7c0 100644
--- a/charts/accumulo/templates/accumulo-tserver-deployment.yaml
+++ b/charts/accumulo/templates/accumulo-tserver-deployment.yaml
@@ -15,16 +15,16 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 
 {{- if .Values.accumulo.tserver.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "accumulo.fullname" . }}-tserver
+  name: {{include "accumulo.fullname" .}}-tserver
   labels:
     {{- $component := "tserver" }}
-    {{- include "accumulo.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
+  {{- include "accumulo.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
   {{- with .Values.global.commonAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -34,12 +34,12 @@ spec:
   selector:
     matchLabels:
       {{- include "accumulo.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: tserver
+    app.kubernetes.io/component: tserver
   template:
     metadata:
       labels:
         {{- include "accumulo.selectorLabels" . | nindent 8 }}
-        app.kubernetes.io/component: tserver
+      app.kubernetes.io/component: tserver
       {{- with .Values.global.commonAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
@@ -51,7 +51,7 @@ spec:
         {{- $podAntiAffinity := .Values.accumulo.tserver.podAntiAffinity }}
         {{- include "accumulo.podAntiAffinity" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component "podAntiAffinity" $podAntiAffinity) | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "accumulo.serviceAccountName" . }}
+      serviceAccountName: {{include "accumulo.serviceAccountName" .}}
       initContainers:
       - name: wait-for-manager
         image: busybox:1.35
@@ -60,7 +60,7 @@ spec:
         - -c
         - |
           echo "Waiting for Accumulo manager to be ready..."
-          until nc -z {{ include "accumulo.fullname" . }}-manager 9999; do
+          until nc -z {{include "accumulo.fullname" .}}-manager 9999; do
             echo "Waiting for manager..."
             sleep 5
           done
@@ -114,8 +114,8 @@ spec:
       volumes:
       - name: accumulo-config
         configMap:
-          name: {{ include "accumulo.fullname" . }}-config
+          name: {{include "accumulo.fullname" .}}-config
           defaultMode: 0755
       - name: logs
         emptyDir: {}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/accumulo/templates/accumulo-tserver-service.yaml b/charts/accumulo/templates/accumulo-tserver-service.yaml
index 46fc2327cfc..8eb2f6360bd 100644
--- a/charts/accumulo/templates/accumulo-tserver-service.yaml
+++ b/charts/accumulo/templates/accumulo-tserver-service.yaml
@@ -15,16 +15,16 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 
 {{- if .Values.accumulo.tserver.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "accumulo.fullname" . }}-tserver
+  name: {{include "accumulo.fullname" .}}-tserver
   labels:
-    {{- include "accumulo.labels" . | nindent 4 }}
-    app.kubernetes.io/component: tserver
+    {{- include "accumulo.labels" . | nindent 4}}
+  app.kubernetes.io/component: tserver
   {{- with .Values.global.commonAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -42,5 +42,5 @@ spec:
     protocol: TCP
   selector:
     {{- include "accumulo.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: tserver
-{{- end }}
\ No newline at end of file
+  app.kubernetes.io/component: tserver
+{{- end }}
diff --git a/charts/accumulo/templates/alluxio-master-deployment.yaml b/charts/accumulo/templates/alluxio-master-deployment.yaml
index 6a3c726f968..9c2fb62b0e0 100644
--- a/charts/accumulo/templates/alluxio-master-deployment.yaml
+++ b/charts/accumulo/templates/alluxio-master-deployment.yaml
@@ -15,16 +15,16 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 
 {{- if .Values.alluxio.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "accumulo.fullname" . }}-alluxio-master
+  name: {{include "accumulo.fullname" .}}-alluxio-master
   labels:
     {{- $component := "alluxio-master" }}
-    {{- include "accumulo.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
+  {{- include "accumulo.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
   {{- with .Values.global.commonAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -34,18 +34,18 @@ spec:
   selector:
     matchLabels:
       {{- include "accumulo.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: alluxio-master
+    app.kubernetes.io/component: alluxio-master
   template:
     metadata:
       labels:
         {{- include "accumulo.selectorLabels" . | nindent 8 }}
-        app.kubernetes.io/component: alluxio-master
+      app.kubernetes.io/component: alluxio-master
       {{- with .Values.global.commonAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
-      serviceAccountName: {{ include "accumulo.serviceAccountName" . }}
+      serviceAccountName: {{include "accumulo.serviceAccountName" .}}
       containers:
       - name: alluxio-master
         image: {{ include "alluxio.image" . }}
@@ -56,16 +56,16 @@ spec:
         - |
           # Create journal directory
           mkdir -p /opt/alluxio/journal
-          
+
           # Format journal if it doesn't exist
           if [ ! -f /opt/alluxio/journal/.formatted ]; then
             /opt/alluxio/bin/alluxio formatJournal
             touch /opt/alluxio/journal/.formatted
           fi
-          
+
           # Start master
           /opt/alluxio/bin/alluxio-start.sh master
-          
+
           # Keep container running and monitor process
           while true; do
             if ! pgrep -f "alluxio.master.AlluxioMaster" > /dev/null; then
@@ -90,23 +90,23 @@ spec:
         - name: AWS_ACCESS_KEY_ID
           valueFrom:
             secretKeyRef:
-              name: {{ include "accumulo.fullname" . }}-secret
+              name: {{include "accumulo.fullname" .}}-secret
               key: s3-access-key
         - name: AWS_SECRET_ACCESS_KEY
           valueFrom:
             secretKeyRef:
-              name: {{ include "accumulo.fullname" . }}-secret
+              name: {{include "accumulo.fullname" .}}-secret
               key: s3-secret-key
         {{- else if eq .Values.storage.provider "minio" }}
         - name: AWS_ACCESS_KEY_ID
           valueFrom:
             secretKeyRef:
-              name: {{ include "accumulo.fullname" . }}-secret
+              name: {{include "accumulo.fullname" .}}-secret
               key: minio-access-key
         - name: AWS_SECRET_ACCESS_KEY
           valueFrom:
             secretKeyRef:
-              name: {{ include "accumulo.fullname" . }}-secret
+              name: {{include "accumulo.fullname" .}}-secret
               key: minio-secret-key
         {{- end }}
         volumeMounts:
@@ -139,28 +139,28 @@ spec:
       volumes:
       - name: alluxio-config
         configMap:
-          name: {{ include "accumulo.fullname" . }}-alluxio-config
+          name: {{include "accumulo.fullname" .}}-alluxio-config
       - name: journal
         {{- if .Values.alluxio.master.journal.storageClass }}
         persistentVolumeClaim:
-          claimName: {{ include "accumulo.fullname" . }}-alluxio-master-journal
+          claimName: {{include "accumulo.fullname" .}}-alluxio-master-journal
         {{- else }}
         emptyDir: {}
         {{- end }}
       {{- if and (eq .Values.storage.provider "gcs") .Values.storage.gcs.keyFile }}
       - name: gcs-secret
         secret:
-          secretName: {{ include "accumulo.fullname" . }}-gcs-secret
+          secretName: {{include "accumulo.fullname" .}}-gcs-secret
       {{- end }}
 ---
 {{- if .Values.alluxio.master.journal.storageClass }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "accumulo.fullname" . }}-alluxio-master-journal
+  name: {{include "accumulo.fullname" .}}-alluxio-master-journal
   labels:
     {{- include "accumulo.labels" . | nindent 4 }}
-    app.kubernetes.io/component: alluxio-master
+  app.kubernetes.io/component: alluxio-master
   {{- with .Values.global.commonAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -177,4 +177,4 @@ spec:
     requests:
       storage: {{ .Values.alluxio.master.journal.size }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/accumulo/templates/alluxio-master-service.yaml b/charts/accumulo/templates/alluxio-master-service.yaml
index 50db2bc300f..012b3048616 100644
--- a/charts/accumulo/templates/alluxio-master-service.yaml
+++ b/charts/accumulo/templates/alluxio-master-service.yaml
@@ -15,16 +15,16 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 
 {{- if .Values.alluxio.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "accumulo.fullname" . }}-alluxio-master
+  name: {{include "accumulo.fullname" .}}-alluxio-master
   labels:
-    {{- include "accumulo.labels" . | nindent 4 }}
-    app.kubernetes.io/component: alluxio-master
+    {{- include "accumulo.labels" . | nindent 4}}
+  app.kubernetes.io/component: alluxio-master
   {{- with .Values.global.commonAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -42,5 +42,5 @@ spec:
     protocol: TCP
   selector:
     {{- include "accumulo.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: alluxio-master
-{{- end }}
\ No newline at end of file
+  app.kubernetes.io/component: alluxio-master
+{{- end }}
diff --git a/charts/accumulo/templates/alluxio-worker-daemonset.yaml b/charts/accumulo/templates/alluxio-worker-daemonset.yaml
index 62612b186f9..c91b255b952 100644
--- a/charts/accumulo/templates/alluxio-worker-daemonset.yaml
+++ b/charts/accumulo/templates/alluxio-worker-daemonset.yaml
@@ -15,16 +15,16 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 
 {{- if .Values.alluxio.enabled }}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: {{ include "accumulo.fullname" . }}-alluxio-worker
+  name: {{include "accumulo.fullname" .}}-alluxio-worker
   labels:
     {{- $component := "alluxio-worker" }}
-    {{- include "accumulo.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
+  {{- include "accumulo.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
   {{- with .Values.global.commonAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -33,18 +33,18 @@ spec:
   selector:
     matchLabels:
       {{- include "accumulo.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: alluxio-worker
+    app.kubernetes.io/component: alluxio-worker
   template:
     metadata:
       labels:
         {{- include "accumulo.selectorLabels" . | nindent 8 }}
-        app.kubernetes.io/component: alluxio-worker
+      app.kubernetes.io/component: alluxio-worker
       {{- with .Values.global.commonAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
-      serviceAccountName: {{ include "accumulo.serviceAccountName" . }}
+      serviceAccountName: {{include "accumulo.serviceAccountName" .}}
       hostNetwork: false
       containers:
       - name: alluxio-worker
@@ -56,21 +56,21 @@ spec:
         - |
           # Wait for master to be ready
           echo "Waiting for Alluxio master to be ready..."
-          until nc -z {{ include "accumulo.fullname" . }}-alluxio-master 19998; do
+          until nc -z {{include "accumulo.fullname" .}}-alluxio-master 19998; do
             echo "Waiting for master..."
             sleep 5
           done
-          
+
           # Create directories
           mkdir -p /opt/ramdisk
           mkdir -p /opt/alluxio/logs
-          
+
           # Mount ramdisk for memory tier
           mount -t tmpfs -o size={{ .Values.alluxio.properties.alluxio.worker.memory.size }} tmpfs /opt/ramdisk
-          
+
           # Start worker
           /opt/alluxio/bin/alluxio-start.sh worker
-          
+
           # Keep container running and monitor process
           while true; do
             if ! pgrep -f "alluxio.worker.AlluxioWorker" > /dev/null; then
@@ -95,28 +95,28 @@ spec:
             fieldRef:
               fieldPath: status.podIP
         - name: ALLUXIO_MASTER_HOSTNAME
-          value: {{ include "accumulo.fullname" . }}-alluxio-master
+          value: {{include "accumulo.fullname" .}}-alluxio-master
         {{- if eq .Values.storage.provider "s3" }}
         - name: AWS_ACCESS_KEY_ID
           valueFrom:
             secretKeyRef:
-              name: {{ include "accumulo.fullname" . }}-secret
+              name: {{include "accumulo.fullname" .}}-secret
               key: s3-access-key
         - name: AWS_SECRET_ACCESS_KEY
           valueFrom:
             secretKeyRef:
-              name: {{ include "accumulo.fullname" . }}-secret
+              name: {{include "accumulo.fullname" .}}-secret
               key: s3-secret-key
         {{- else if eq .Values.storage.provider "minio" }}
         - name: AWS_ACCESS_KEY_ID
           valueFrom:
             secretKeyRef:
-              name: {{ include "accumulo.fullname" . }}-secret
+              name: {{include "accumulo.fullname" .}}-secret
               key: minio-access-key
         - name: AWS_SECRET_ACCESS_KEY
           valueFrom:
             secretKeyRef:
-              name: {{ include "accumulo.fullname" . }}-secret
+              name: {{include "accumulo.fullname" .}}-secret
               key: minio-secret-key
         {{- end }}
         volumeMounts:
@@ -153,11 +153,11 @@ spec:
       volumes:
       - name: alluxio-config
         configMap:
-          name: {{ include "accumulo.fullname" . }}-alluxio-config
+          name: {{include "accumulo.fullname" .}}-alluxio-config
       - name: storage
         {{- if .Values.alluxio.worker.storage.storageClass }}
         persistentVolumeClaim:
-          claimName: {{ include "accumulo.fullname" . }}-alluxio-worker-storage
+          claimName: {{include "accumulo.fullname" .}}-alluxio-worker-storage
         {{- else }}
         emptyDir: {}
         {{- end }}
@@ -167,17 +167,17 @@ spec:
       {{- if and (eq .Values.storage.provider "gcs") .Values.storage.gcs.keyFile }}
       - name: gcs-secret
         secret:
-          secretName: {{ include "accumulo.fullname" . }}-gcs-secret
+          secretName: {{include "accumulo.fullname" .}}-gcs-secret
       {{- end }}
 ---
 {{- if .Values.alluxio.worker.storage.storageClass }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "accumulo.fullname" . }}-alluxio-worker-storage
+  name: {{include "accumulo.fullname" .}}-alluxio-worker-storage
   labels:
     {{- include "accumulo.labels" . | nindent 4 }}
-    app.kubernetes.io/component: alluxio-worker
+  app.kubernetes.io/component: alluxio-worker
   {{- with .Values.global.commonAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -194,4 +194,4 @@ spec:
     requests:
       storage: {{ .Values.alluxio.worker.storage.size }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/accumulo/templates/configmap.yaml b/charts/accumulo/templates/configmap.yaml
index 5664ab4848f..a31379c3e66 100644
--- a/charts/accumulo/templates/configmap.yaml
+++ b/charts/accumulo/templates/configmap.yaml
@@ -20,7 +20,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "accumulo.fullname" . }}-config
+  name: {{include "accumulo.fullname" .}}-config
   labels:
     {{- include "accumulo.labels" . | nindent 4 }}
   {{- with .Values.global.commonAnnotations }}
@@ -30,82 +30,82 @@ metadata:
 data:
   accumulo.properties: |
     # Apache Accumulo Configuration for Kubernetes
-    
+
     ## Instance configuration
     instance.volumes={{ .Values.accumulo.instance.volumes }}
     instance.zookeeper.host={{ include "accumulo.zookeeperHosts" . }}
     instance.secret={{ .Values.accumulo.instance.secret }}
-    
+
     ## Enable native maps for better performance
     tserver.memory.maps.native.enabled=true
-    
+
     ## Manager configuration
     manager.recovery.delay=10s
     manager.lease.recovery.waiting.period=5s
-    
+
     ## Tablet server configuration
     tserver.port.search=true
     tserver.hold.time.max=5m
     tserver.memory.maps.max=1G
-    
-    ## Monitor configuration  
+
+    ## Monitor configuration
     monitor.port.client=9995
     monitor.ssl.port=9995
-    
+
     ## GC configuration
     gc.cycle.start=30s
     gc.cycle.delay=5m
-    
+
     ## Compactor configuration
     compactor.max.open.files=100
-    
+
     ## Performance tuning for Kubernetes
     general.rpc.timeout=120s
     tserver.scan.timeout.enable=true
     tserver.scan.timeout.max=5m
-    
+
     ## Alluxio-specific configuration
     general.vfs.context.class.name=org.apache.accumulo.core.spi.fs.VolumeChooserEnvironment
     general.vfs.cache.dir=/tmp/accumulo-vfs-cache
-    
+
   accumulo-env.sh: |
     #!/usr/bin/env bash
-    
+
     ## Accumulo environment for Kubernetes deployment
-    
+
     ## Required environment variables
     export ACCUMULO_LOG_DIR="${ACCUMULO_LOG_DIR:-/opt/accumulo/logs}"
     export HADOOP_HOME="${HADOOP_HOME:-/opt/hadoop}"
     export HADOOP_CONF_DIR="${HADOOP_CONF_DIR:-/opt/hadoop/etc/hadoop}"
     export ZOOKEEPER_HOME="${ZOOKEEPER_HOME:-/opt/zookeeper}"
-    
+
     ## Build classpath
     if [[ -n $CLASSPATH ]]; then
       CLASSPATH="${CLASSPATH}:${ACCUMULO_CONF_DIR}"
     else
       CLASSPATH="${ACCUMULO_CONF_DIR}"
     fi
-    
+
     # Add Accumulo libraries
     CLASSPATH="${CLASSPATH}:${ACCUMULO_HOME}/lib/*"
-    
+
     # Add Hadoop libraries
     CLASSPATH="${CLASSPATH}:${HADOOP_CONF_DIR}:${HADOOP_HOME}/share/hadoop/client/*"
-    
-    # Add ZooKeeper libraries  
+
+    # Add ZooKeeper libraries
     ZK_JARS=$(find "${ZOOKEEPER_HOME}/lib/" -maxdepth 1 -name '*.jar' -not -name '*slf4j*' -not -name '*log4j*' | paste -sd: -)
     CLASSPATH="${CLASSPATH}:${ZOOKEEPER_HOME}/*:${ZK_JARS}"
-    
+
     export CLASSPATH
-    
+
     ## JVM options for all processes
     JAVA_OPTS=(
       '-XX:OnOutOfMemoryError=kill -9 %p'
-      '-XX:-OmitStackTraceInFastThrow' 
+      '-XX:-OmitStackTraceInFastThrow'
       '-Djava.net.preferIPv4Stack=true'
       "-Daccumulo.native.lib.path=${ACCUMULO_HOME}/lib/native"
     )
-    
+
     ## Component-specific JVM options
     case "${ACCUMULO_SERVICE_INSTANCE}" in
       manager)
@@ -127,7 +127,7 @@ data:
         JAVA_OPTS=('-Xmx256m' '-Xms64m' "${JAVA_OPTS[@]}")
         ;;
     esac
-    
+
     ## Logging configuration
     JAVA_OPTS=(
       "-Daccumulo.log.dir=${ACCUMULO_LOG_DIR}"
@@ -137,62 +137,62 @@ data:
       "-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
       "${JAVA_OPTS[@]}"
     )
-    
-    ## Service-specific log configuration  
+
+    ## Service-specific log configuration
     case "${ACCUMULO_SERVICE_INSTANCE}" in
       monitor | gc | manager | tserver | compactor)
         JAVA_OPTS=('-Dlog4j.configurationFile=log4j2-service.properties' "${JAVA_OPTS[@]}")
         ;;
     esac
-    
+
     export JAVA_OPTS
     export MALLOC_ARENA_MAX=1
-    
+
   log4j2-service.properties: |
     # Log4j2 configuration for Accumulo services in Kubernetes
-    
+
     status = ERROR
     name = AccumuloServiceConfig
-    
+
     # Console appender for container logs
     appender.console.type = Console
     appender.console.name = STDOUT
     appender.console.layout.type = PatternLayout
     appender.console.layout.pattern = %d{ISO8601} [%c{2}] %-5p: %m%n
-    
+
     # File appender for service logs
-    appender.file.type = File  
+    appender.file.type = File
     appender.file.name = FILE
     appender.file.fileName = ${sys:accumulo.log.dir}/accumulo-${sys:accumulo.application}.log
     appender.file.layout.type = PatternLayout
     appender.file.layout.pattern = %d{ISO8601} [%c{2}] %-5p: %m%n
-    
+
     # Root logger
     rootLogger.level = INFO
     rootLogger.appenderRef.console.ref = STDOUT
     rootLogger.appenderRef.file.ref = FILE
-    
+
     # Accumulo-specific loggers
     logger.accumulo.name = org.apache.accumulo
     logger.accumulo.level = INFO
     logger.accumulo.additivity = false
     logger.accumulo.appenderRef.console.ref = STDOUT
     logger.accumulo.appenderRef.file.ref = FILE
-    
+
     # Hadoop/Alluxio loggers (reduce verbosity)
     logger.hadoop.name = org.apache.hadoop
     logger.hadoop.level = WARN
-    
+
     logger.alluxio.name = alluxio
     logger.alluxio.level = INFO
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "accumulo.fullname" . }}-alluxio-config
+  name: {{include "accumulo.fullname" .}}-alluxio-config
   labels:
     {{- include "accumulo.labels" . | nindent 4 }}
-    app.kubernetes.io/component: alluxio
+  app.kubernetes.io/component: alluxio
   {{- with .Values.global.commonAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -200,21 +200,21 @@ metadata:
 data:
   alluxio-site.properties: |
     # Alluxio configuration for Accumulo storage
-    
+
     ## Master configuration
-    alluxio.master.hostname={{ include "accumulo.fullname" . }}-alluxio-master
+    alluxio.master.hostname={{include "accumulo.fullname" .}}-alluxio-master
     alluxio.master.port=19998
     alluxio.master.web.port=19999
     alluxio.master.journal.type=UFS
     alluxio.master.journal.folder=/opt/alluxio/journal
-    
+
     ## Worker configuration
     alluxio.worker.hostname=${ALLUXIO_WORKER_HOSTNAME}
     alluxio.worker.port=29999
     alluxio.worker.web.port=30000
     alluxio.worker.data.port=29999
     alluxio.worker.rpc.port=29999
-    
+
     ## Memory and storage configuration
     alluxio.worker.memory.size={{ .Values.alluxio.properties.alluxio.worker.memory.size }}
     alluxio.worker.tieredstore.levels=1
@@ -223,10 +223,10 @@ data:
     alluxio.worker.tieredstore.level0.dirs.quota={{ .Values.alluxio.properties.alluxio.worker.memory.size }}
     alluxio.worker.tieredstore.level0.watermark.high.ratio=0.9
     alluxio.worker.tieredstore.level0.watermark.low.ratio=0.7
-    
+
     ## Under storage system configuration
     {{- include "accumulo.storageConfig" . }}
-    
+
     {{- if eq .Values.storage.provider "s3" }}
     # S3 configuration
     alluxio.underfs.s3.endpoint={{ .Values.storage.s3.endpoint }}
@@ -234,7 +234,7 @@ data:
     s3a.access.key={{ .Values.storage.s3.accessKey }}
     s3a.secret.key={{ .Values.storage.s3.secretKey }}
     {{- else if eq .Values.storage.provider "minio" }}
-    # MinIO configuration  
+    # MinIO configuration
     alluxio.underfs.s3.endpoint={{ .Values.storage.minio.endpoint }}
     alluxio.underfs.s3.disable.dns.buckets=true
     alluxio.underfs.s3.inherit.acl=false
@@ -248,7 +248,7 @@ data:
     # Azure configuration
     fs.azure.account.key.{{ .Values.storage.azure.account }}.dfs.core.windows.net={{ .Values.storage.azure.key }}
     {{- end }}
-    
+
     ## Performance and cache settings
     alluxio.user.file.write.location.policy.class={{ .Values.alluxio.properties.alluxio.user.file.write.location.policy.class }}
     alluxio.user.file.write.avoid.eviction.policy.reserved.size.bytes={{ .Values.alluxio.properties.alluxio.user.file.write.avoid.eviction.policy.reserved.size.bytes }}
@@ -257,12 +257,12 @@ data:
     {{- range $path, $mode := .Values.alluxio.pathWriteModes }}
     alluxio.user.file.write.type.{{ $path }}={{ $mode }}
     {{- end }}
-    
+
     ## Network and RPC settings
     alluxio.network.host.resolution.timeout=5s
     alluxio.user.rpc.retry.max.duration=10s
     alluxio.user.rpc.retry.base.sleep=1s
-    
+
     ## Security configuration
     alluxio.security.authentication.type=NOSASL
-    alluxio.security.authorization.permission.enabled=false
\ No newline at end of file
+    alluxio.security.authorization.permission.enabled=false
diff --git a/charts/accumulo/templates/secret.yaml b/charts/accumulo/templates/secret.yaml
index b8541da6242..7ef17f8067c 100644
--- a/charts/accumulo/templates/secret.yaml
+++ b/charts/accumulo/templates/secret.yaml
@@ -15,12 +15,12 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "accumulo.fullname" . }}-secret
+  name: {{include "accumulo.fullname" .}}-secret
   labels:
     {{- include "accumulo.labels" . | nindent 4 }}
   {{- with .Values.global.commonAnnotations }}
@@ -44,7 +44,7 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "accumulo.fullname" . }}-gcs-secret
+  name: {{include "accumulo.fullname" .}}-gcs-secret
   labels:
     {{- include "accumulo.labels" . | nindent 4 }}
   {{- with .Values.global.commonAnnotations }}
@@ -54,4 +54,4 @@ metadata:
 type: Opaque
 data:
   gcs-key.json: {{ .Values.storage.gcs.keyFile | b64enc | quote }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/accumulo/templates/serviceaccount.yaml b/charts/accumulo/templates/serviceaccount.yaml
index d64fbee42ab..c1828eeaf7c 100644
--- a/charts/accumulo/templates/serviceaccount.yaml
+++ b/charts/accumulo/templates/serviceaccount.yaml
@@ -15,13 +15,13 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 
 {{- if .Values.auth.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "accumulo.serviceAccountName" . }}
+  name: {{include "accumulo.serviceAccountName" .}}
   labels:
     {{- include "accumulo.labels" . | nindent 4 }}
   {{- with .Values.auth.serviceAccount.annotations }}
@@ -29,4 +29,4 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 automountServiceAccountToken: true
-{{- end }}
\ No newline at end of file
+{{- end }}