Allow running without worker nodes

Author: hakman

cmd/kops/create_cluster.go

@@ -175,6 +175,7 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command {
 	sshPublicKey := ""
 	associatePublicIP := false
 	encryptEtcdStorage := false
+	nodeCount := int32(0)
 
 	cmd := &cobra.Command{
 		Use:               "cluster [CLUSTER]",
@@ -194,6 +195,10 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command {
 				options.EncryptEtcdStorage = &encryptEtcdStorage
 			}
 
+			if cmd.Flag("node-count").Changed {
+				options.NodeCount = &nodeCount
+			}
+
 			if sshPublicKey != "" {
 				options.SSHPublicKeys, err = loadSSHPublicKeys(sshPublicKey)
 				if err != nil {
@@ -268,7 +273,7 @@ func NewCmdCreateCluster(f *util.Factory, out io.Writer) *cobra.Command {
 	cmd.Flags().Int32Var(&options.ControlPlaneCount, "master-count", options.ControlPlaneCount, "Number of control-plane nodes. Defaults to one control-plane node per control-plane-zone")
 	cmd.Flags().MarkDeprecated("master-count", "use --control-plane-count instead")
 	cmd.Flags().Int32Var(&options.ControlPlaneCount, "control-plane-count", options.ControlPlaneCount, "Number of control-plane nodes. Defaults to one control-plane node per control-plane-zone")
-	cmd.Flags().Int32Var(&options.NodeCount, "node-count", options.NodeCount, "Total number of worker nodes. Defaults to one node per zone")
+	cmd.Flags().Int32Var(&nodeCount, "node-count", 0, "Total number of worker nodes. Defaults to one node per zone")
 
 	cmd.Flags().StringVar(&options.Image, "image", options.Image, "Machine image for all instances")
 	cmd.RegisterFlagCompletionFunc("image", completeInstanceImage)

pkg/apis/kops/validation/legacy.go

@@ -274,10 +274,6 @@ func DeepValidate(c *kops.Cluster, groups []*kops.InstanceGroup, strict bool, vf
 		return fmt.Errorf("must configure at least one ControlPlane InstanceGroup")
 	}
 
-	if nodeGroupCount == 0 {
-		return fmt.Errorf("must configure at least one Node InstanceGroup")
-	}
-
 	for _, g := range groups {
 		errs := CrossValidateInstanceGroup(g, c, cloud, strict)
 

upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template

@@ -138,7 +138,7 @@ spec:
         - key: "CriticalAddonsOnly"
           operator: "Exists"
         {{- end }}
-        {{- if KarpenterEnabled }}
+        {{- if or IsControlPlaneOnly KarpenterEnabled }}
         - key: node-role.kubernetes.io/master
           operator: Exists
         - key: node-role.kubernetes.io/control-plane

upup/pkg/fi/cloudup/deepvalidate_test.go

@@ -44,7 +44,10 @@ func TestDeepValidate_NoNodeZones(t *testing.T) {
 	c := buildDefaultCluster(t)
 	var groups []*kopsapi.InstanceGroup
 	groups = append(groups, buildMinimalMasterInstanceGroup("subnet-us-test-1a"))
-	expectErrorFromDeepValidate(t, c, groups, "must configure at least one Node InstanceGroup")
+	err := validation.DeepValidate(c, groups, true, vfs.Context, nil)
+	if err != nil {
+		t.Fatalf("Expected no error from DeepValidate, got %v", err)
+	}
 }
 
 func TestDeepValidate_NoMasterZones(t *testing.T) {

upup/pkg/fi/cloudup/new_cluster.go

@@ -134,7 +134,7 @@ type NewClusterOptions struct {
 
 	// NodeCount is the number of nodes to create. Defaults to leaving the count unspecified
 	// on the InstanceGroup, which results in a count of 2.
-	NodeCount int32
+	NodeCount *int32
 	// Bastion enables the creation of a Bastion instance.
 	Bastion bool
 	// BastionLoadBalancerType is the bastion loadbalancer type to use; "public" or "internal".
@@ -1040,9 +1040,14 @@ func setupNodes(opt *NewClusterOptions, cluster *api.Cluster, zoneToSubnetsMap m
 	var nodes []*api.InstanceGroup
 
 	if featureflag.AWSSingleNodesInstanceGroup.Enabled() && cloudProvider == api.CloudProviderAWS && len(opt.SubnetIDs) == 0 {
-		nodeCount := opt.NodeCount
-		if nodeCount == 0 {
+		var nodeCount int32
+		if opt.NodeCount == nil {
 			nodeCount = 1
+		} else {
+			nodeCount = fi.ValueOf(opt.NodeCount)
+			if nodeCount == 0 {
+				return nil, nil
+			}
 		}
 
 		g := &api.InstanceGroup{}
@@ -1078,19 +1083,24 @@ func setupNodes(opt *NewClusterOptions, cluster *api.Cluster, zoneToSubnetsMap m
 
 	// The node count is the number of zones unless explicitly set
 	// We then divvy up amongst the zones
-	numZones := len(opt.Zones)
-	nodeCount := opt.NodeCount
-	if nodeCount == 0 {
-		// If node count is not specified, default to the number of zones
-		nodeCount = int32(numZones)
+	numZones := int32(len(opt.Zones))
+	var nodeCount int32
+	if opt.NodeCount == nil {
+		// If the node count is not specified, default to the number of zones
+		nodeCount = numZones
+	} else {
+		nodeCount = fi.ValueOf(opt.NodeCount)
+		if nodeCount == 0 {
+			return nil, nil
+		}
 	}
 
 	countPerIG := nodeCount / int32(numZones)
-	remainder := int(nodeCount) % numZones
+	remainder := nodeCount % numZones
 
 	for i, zone := range opt.Zones {
 		count := countPerIG
-		if i < remainder {
+		if i < int(remainder) {
 			count++
 		}
 

upup/pkg/fi/cloudup/template_functions.go

@@ -399,6 +399,8 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
 
 	dest["ParseTaint"] = util.ParseTaint
 
+	dest["IsControlPlaneOnly"] = tf.IsControlPlaneOnly
+
 	dest["KarpenterEnabled"] = func() bool {
 		return cluster.Spec.Karpenter != nil && cluster.Spec.Karpenter.Enabled
 	}
@@ -511,6 +513,22 @@ func (tf *TemplateFunctions) HasHighlyAvailableControlPlane() bool {
 	return false
 }
 
+// IsControlPlaneOnly returns true if the cluster has only control plane node(s). False otherwise.
+func (tf *TemplateFunctions) IsControlPlaneOnly() bool {
+	var cp, wn int
+	for _, ig := range tf.InstanceGroups {
+		switch ig.Spec.Role {
+		case kops.InstanceGroupRoleControlPlane:
+			cp++
+		case kops.InstanceGroupRoleNode:
+			wn++
+		default:
+			// Ignore Bastion and APIServer
+		}
+	}
+	return cp > 0 && wn == 0
+}
+
 // CloudControllerConfigArgv returns the args to external cloud controller
 func (tf *TemplateFunctions) CloudControllerConfigArgv() ([]string, error) {
 	cluster := tf.Cluster