Group values for node

kubernetes-sigs · Apr 7, 2021 · d82d4d4 · d82d4d4
1 parent ea25928
commit d82d4d4
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 47 deletions.
diff --git a/charts/aws-efs-csi-driver/templates/node-daemonset.yaml b/charts/aws-efs-csi-driver/templates/node-daemonset.yaml
@@ -21,9 +21,9 @@ spec:
       annotations: {{ toYaml .Values.node.podAnnotations | nindent 8 }}
       {{- end }}
     spec:
-    {{- if .Values.hostAliases }}
+    {{- if .Values.node.hostAliases }}
       hostAliases:
-      {{- range $k, $v := .Values.hostAliases }}
+      {{- range $k, $v := .Values.node.hostAliases }}
         - ip: {{ $v.ip }}
           hostnames:
             - {{ $k }}.efs.{{ $v.region }}.amazonaws.com
@@ -37,7 +37,7 @@ spec:
     {{- end }}
       nodeSelector:
         beta.kubernetes.io/os: linux
-        {{- with .Values.nodeSelector }}
+        {{- with .Values.node.nodeSelector }}
         {{- . | toYaml | nindent 8 }}
         {{- end }}
       affinity:
@@ -50,10 +50,10 @@ spec:
                 values:
                 - fargate
       hostNetwork: true
-      {{- if .Values.dnsPolicy }}
-      dnsPolicy: "{{ .Values.dnsPolicy }}"
+      {{- if .Values.node.dnsPolicy }}
+      dnsPolicy: "{{ .Values.node.dnsPolicy }}"
       {{- end }}
-      {{- with .Values.dnsConfig }}
+      {{- with .Values.node.dnsConfig }}
       dnsConfig:
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -107,7 +107,7 @@ spec:
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-            - --v={{ .Values.logLevel }}
+            - --v={{ .Values.node.logLevel }}
           env:
             - name: ADDRESS
               value: /csi/csi.sock
@@ -130,7 +130,7 @@ spec:
           args:
             - --csi-address=/csi/csi.sock
             - --health-port=9809
-            - --v={{ .Values.logLevel }}
+            - --v={{ .Values.node.logLevel }}
           volumeMounts:
             - name: plugin-dir
               mountPath: /csi

diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml
@@ -34,60 +34,63 @@ sidecars:
 
 imagePullSecrets: []
 
+## Controller deployment variables
+
 controller:
   # Specifies whether a deployment should be created
   create: true
   podAnnotations: {}
-  resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
+  resources:
+    {}
+    # We usually recommend not to specify default resources and to leave this as a conscious
+    # choice for the user. This also increases chances charts run on environments with little
+    # resources, such as Minikube. If you do want to specify resources, uncomment the following
+    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
   nodeSelector: {}
   tolerations: []
   affinity: {}
 
-node:
-  podAnnotations: {}
-  resources: {}
-  tolerations: []
-
-logLevel: 5
-
-hostAliases:
-  {}
-  # for cross VPC EFS, you need to poison or overwrite the DNS for the efs volume as per
-  # https://docs.aws.amazon.com/efs/latest/ug/efs-different-vpc.html#wt6-efs-utils-step3
-  # implementing the suggested solution found here:
-  # https://github.com/kubernetes-sigs/aws-efs-csi-driver/issues/240#issuecomment-676849346
-  # EFS Vol ID, IP, Region
-  # "fs-01234567":
-  #   ip: 10.10.2.2
-  #   region: us-east-2
-
-dnsPolicy: ""
-dnsConfig:
-  {}
-  # Example config which uses the AWS nameservers
-  # dnsPolicy: "None"
-  # dnsConfig:
-  #   nameservers:
-  #     - 169.254.169.253
-
 serviceAccount:
   controller:
     # Specifies whether a service account should be created
     create: true
-    annotations: {}
     ## Enable if EKS IAM for SA is used
     #  eks.amazonaws.com/role-arn: arn:aws:iam::111122223333:role/efs-csi-role
     name: efs-csi-controller-sa
+    annotations: {}
+
+## Node daemonset variables
+
+node:
+  logLevel: 5
+  hostAliases:
+    {}
+    # for cross VPC EFS, you need to poison or overwrite the DNS for the efs volume as per
+    # https://docs.aws.amazon.com/efs/latest/ug/efs-different-vpc.html#wt6-efs-utils-step3
+    # implementing the suggested solution found here:
+    # https://github.com/kubernetes-sigs/aws-efs-csi-driver/issues/240#issuecomment-676849346
+    # EFS Vol ID, IP, Region
+    # "fs-01234567":
+    #   ip: 10.10.2.2
+    #   region: us-east-2
+  dnsPolicy: ""
+  dnsConfig:
+    {}
+    # Example config which uses the AWS nameservers
+    # dnsPolicy: "None"
+    # dnsConfig:
+    #   nameservers:
+    #     - 169.254.169.253
+  podAnnotations: {}
+  resources: {}
+  nodeSelector: {}
+  tolerations: []
 
 storageClasses: []
 # Add StorageClass resources like: