Allow setting vpcName(s) without enabling route controller

Author: cbbond

deploy/chart/templates/daemonset.yaml

@@ -46,24 +46,24 @@ spec:
             {{- end }}
             {{- if .Values.routeController }}
             - --enable-route-controller=true
-            {{- if and .Values.routeController.vpcName .Values.routeController.vpcNames }}
-            {{- fail "Both vpcName and vpcNames are set. Please use only vpcNames." }}
-            {{- end }}
-            {{- if not (or .Values.routeController.vpcName .Values.routeController.vpcNames) }}
+            {{- if not (or .Values.vpcName .Values.vpcNames) }}
             {{- fail "Neither vpcName nor vpcNames is set. Please set one of them." }}
             {{- end }}
-            {{- with .Values.routeController.vpcName }}
-            - --vpc-name={{ . }}
-            {{- end }}
-            {{- with .Values.routeController.vpcNames }}
-            - --vpc-names={{ . }}
-            {{- end }}
             - --configure-cloud-routes={{ default true .Values.routeController.configureCloudRoutes }}
             - --cluster-cidr={{ required "A valid .Values.routeController.clusterCIDR is required" .Values.routeController.clusterCIDR }}
             {{- with .Values.routeController.routeReconciliationPeriod }}
             - --route-reconciliation-period={{ . }}
             {{- end }}
             {{- end }}
+            {{- if and .Values.vpcName .Values.vpcNames }}
+            {{- fail "Both vpcName and vpcNames are set. Please use only vpcNames." }}
+            {{- end }}
+            {{- with .Values.vpcName }}
+            - --vpc-name={{ . }}
+            {{- end }}
+            {{- with .Values.vpcNames }}
+            - --vpc-names={{ . }}
+            {{- end }}
             {{- if .Values.sharedIPLoadBalancing }}
             {{- with .Values.sharedIPLoadBalancing.bgpNodeSelector }}
             - --bgp-node-selector={{ . }}

deploy/chart/values.yaml

@@ -69,11 +69,13 @@ tolerations:
 
 # This section adds ability to enable route-controller for ccm
 # routeController:
-#   vpcName: <name of VPC> [Deprecated: use vpcNames instead]
-#   vpcNames: <comma separated list of vpc names>
 #   clusterCIDR: 10.0.0.0/8
 #   configureCloudRoutes: true
 
+# VPCs that will be managed by the CCM
+# vpcName: <name of VPC> [Deprecated: use vpcNames instead]
+# vpcNames: <comma separated list of vpc names>
+
 # Enable Linode token health checker
 # tokenHealthChecker: true