Refactor and clean Helm chart options

traefik · May 22, 2020 · fff1f0b · fff1f0b
1 parent 3f9529d
commit fff1f0b
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 32 deletions.
diff --git a/helm/chart/maesh/templates/controller/controller-deployment.yaml b/helm/chart/maesh/templates/controller/controller-deployment.yaml
@@ -67,7 +67,7 @@ spec:
             {{- if .Values.controller.logLevel }}
             - "--logLevel={{ .Values.controller.logLevel }}"
             {{- end }}
-            {{- if .Values.mesh }}
+            {{- if .Values.mesh.defaultMode }}
             - "--defaultMode={{ .Values.mesh.defaultMode }}"
             {{- end }}
             {{- if .Values.acl }}

diff --git a/helm/chart/maesh/values.yaml b/helm/chart/maesh/values.yaml
@@ -8,46 +8,58 @@ image:
   # (Optional)
   # pullSecret: xxx
 
+# acl: true
+
+# kubedns: true
+
+# clusterDomain: cluster.local
+
+limits:
+  http: 10
+  tcp: 25
+  udp: 25
+
 controller:
+  # logLevel: error
+  # ignoreNamespaces:
+  #  - example
+
   resources:
     limit:
-      mem: "100Mi"
-      cpu: "200m"
+      mem: 100Mi
+      cpu: 200m
     request:
-      mem: "50Mi"
-      cpu: "100m"
-  logLevel: error
-  ignoreNamespaces:
+      mem: 50Mi
+      cpu: 100m
+
   # Added so we can launch on nodes with restrictions
   nodeSelector: {}
   tolerations: []
   affinity: {}
 
-kubedns: false
-#clusterDomain: cluster.local
-
 mesh:
+  pollInterval: 1s
+  pollTimeout: 1s
+  # defaultMode: http
+  # logLevel: error
+  # forwardingTimeouts:
+  #   dialTimeout: 30s
+  #   (Optional)
+  #   responseHeaderTimeout: 0s
+  #   (Optional)
+  #   idleConnTimeout: 1s
+
   resources:
     limit:
-      mem: "100Mi"
-      cpu: "200m"
+      mem: 100Mi
+      cpu: 200m
     request:
-      mem: "50Mi"
-      cpu: "100m"
-  defaultMode: http
-  pollInterval: "1s"
-  pollTimeout: "1s"
-  logLevel: error
+      mem: 50Mi
+      cpu: 100m
+
   # Added so we can launch on nodes with restrictions
   nodeSelector: {}
   tolerations: []
-  # forwardingTimeouts:
-  #   (Optional)
-  #   dialTimeout: "30s"
-  #   (Optional)
-  #   responseHeaderTimeout: "0s"
-  #   (Optional)
-  #   idleConnTimeout: "1s"
 
 #
 # Tracing configuration
@@ -147,10 +159,3 @@ metrics:
     # addServiceLabels: true
     # (Optional)
     # pushInterval: 10s
-
-acl: false
-
-limits:
-  http: 10
-  tcp: 25
-  udp: 25