Merge pull request kubernetes-retired#927 from mumoshu/drop-worker-count

Drop the deprecated key `workerCount` in cluster.yaml
iflix · Sep 6, 2017 · 3e19289 · 3e19289
2 parents 19ec1e1 + 5f8d397
commit 3e19289
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/core/controlplane/config/config.go b/core/controlplane/config/config.go
@@ -157,7 +157,6 @@ func NewDefaultCluster() *Cluster {
 			DNSServiceIP: "10.3.0.10",
 		},
 		DefaultWorkerSettings: DefaultWorkerSettings{
-			WorkerCount:            0,
 			WorkerCreateTimeout:    "PT15M",
 			WorkerInstanceType:     "t2.medium",
 			WorkerRootVolumeType:   "gp2",
@@ -468,7 +467,6 @@ type DeploymentSettings struct {
 
 // Part of configuration which is specific to worker nodes
 type DefaultWorkerSettings struct {
-	WorkerCount            int      `yaml:"workerCount,omitempty"`
 	WorkerCreateTimeout    string   `yaml:"workerCreateTimeout,omitempty"`
 	WorkerInstanceType     string   `yaml:"workerInstanceType,omitempty"`
 	WorkerRootVolumeType   string   `yaml:"workerRootVolumeType,omitempty"`
@@ -1334,10 +1332,6 @@ func (c DefaultWorkerSettings) Validate() error {
 		}
 	}
 
-	if c.WorkerCount != 0 {
-		return errors.New("`workerCount` is removed. Set worker.nodePools[].count per node pool instead")
-	}
-
 	return nil
 }
 

diff --git a/core/controlplane/config/templates/cluster.yaml b/core/controlplane/config/templates/cluster.yaml
@@ -221,9 +221,6 @@ kmsKeyArn: "{{.KMSKeyARN}}"
 #        [Service]
 #        ExecStart=/bin/rkt run --set-env TAGS=Controller ...
 
-# Default number of worker nodes per node pool to create, for more control use `worker.nodePools[].count` and/or `worker.autoScalingGroup` and do not use this setting
-#workerCount: 1
-
 worker:
 #
 #  # Settings that apply to all worker node pools
@@ -320,6 +317,7 @@ worker:
 #      #
 #
 #      # Number of worker nodes to create for an autoscaling group based pool
+#      # Specify `worker.autoScalingGroup` instead for more control over its min/max/desired capacity.
 #      count: 1
 #
 #      # Instance type for worker nodes

diff --git a/test/integration/maincluster_test.go b/test/integration/maincluster_test.go
@@ -4064,13 +4064,6 @@ worker:
 `,
 			expectedErrorMessage: `internet gateway id can't be omitted when there're one or more managed public subnets in an existing VPC`,
 		},
-		{
-			context: "WithNonZeroWorkerCount",
-			configYaml: minimalValidConfigYaml + `
-workerCount: 1
-`,
-			expectedErrorMessage: "`workerCount` is removed. Set worker.nodePools[].count per node pool instead",
-		},
 		{
 			context: "WithVpcIdAndVPCCIDRSpecified",
 			configYaml: minimalValidConfigYaml + `