kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9126 from johngmyers/validate-target-size 

Fail cluster validation if too few nodes for ig's target size
This commit is contained in:
Kubernetes Prow Robot 2020-05-13 09:10:26 -07:00 committed by GitHub
parent d7d61c683d 154833e652
commit e4a0a3b903
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kops/rollingupdatecluster.go
View File

@ -369,6 +369,9 @@ func RunRollingUpdateCluster(ctx context.Context, f *util.Factory, out io.Writer
t.AddColumn("MIN", func(r *cloudinstances.CloudInstanceGroup) string {
return strconv.Itoa(r.MinSize)
})
t.AddColumn("TARGET", func(r *cloudinstances.CloudInstanceGroup) string {
return strconv.Itoa(r.TargetSize)
})
t.AddColumn("MAX", func(r *cloudinstances.CloudInstanceGroup) string {
return strconv.Itoa(r.MaxSize)
})
@ -391,7 +394,7 @@ func RunRollingUpdateCluster(ctx context.Context, f *util.Factory, out io.Writer
l = append(l, v)
}
columns := []string{"NAME", "STATUS", "NEEDUPDATE", "READY", "MIN", "MAX"}
columns := []string{"NAME", "STATUS", "NEEDUPDATE", "READY", "MIN", "TARGET", "MAX"}
if !options.CloudOnly {
columns = append(columns, "NODES")
}

1
pkg/cloudinstances/cloud_instance_group.go
View File

@ -33,6 +33,7 @@ type CloudInstanceGroup struct {
Ready []*CloudInstanceGroupMember
NeedUpdate []*CloudInstanceGroupMember
MinSize int
TargetSize int
MaxSize int
// Raw allows for the implementer to attach an object, for tracking additional state

1
pkg/resources/spotinst/resources.go
View File

@ -279,6 +279,7 @@ func buildCloudInstanceGroupFromInstanceGroup(cloud Cloud, ig *kops.InstanceGrou
HumanName: group.Name(),
InstanceGroup: ig,
MinSize: group.MinSize(),
TargetSize: group.MinSize(), // TODO: Retrieve the target size from the cloud provider
MaxSize: group.MaxSize(),
Raw: group,
}

4
pkg/validation/validate_cluster.go
View File

@ -299,14 +299,14 @@ func (v *ValidationCluster) validateNodes(cloudGroups map[string]*cloudinstances
numNodes++
}
}
if numNodes < cloudGroup.MinSize {
if numNodes < cloudGroup.TargetSize {
v.addError(&ValidationError{
Kind: "InstanceGroup",
Name: cloudGroup.InstanceGroup.Name,
Message: fmt.Sprintf("InstanceGroup %q did not have enough nodes %d vs %d",
cloudGroup.InstanceGroup.Name,
numNodes,
cloudGroup.MinSize),
cloudGroup.TargetSize),
})
}

18
pkg/validation/validate_cluster_test.go
View File

@ -124,7 +124,8 @@ func Test_ValidateNodesNotEnough(t *testing.T) {
Role: kopsapi.InstanceGroupRoleNode,
},
},
MinSize: 3,
MinSize: 2,
TargetSize: 3,
Ready: []*cloudinstances.CloudInstanceGroupMember{
{
ID: "i-00001",
@ -176,7 +177,8 @@ func Test_ValidateDetachedNodesDontCount(t *testing.T) {
Role: kopsapi.InstanceGroupRoleNode,
},
},
MinSize: 2,
MinSize: 2,
TargetSize: 2,
Ready: []*cloudinstances.CloudInstanceGroupMember{
{
ID: "i-00001",
@ -229,7 +231,8 @@ func Test_ValidateNodeNotReady(t *testing.T) {
Role: kopsapi.InstanceGroupRoleNode,
},
},
MinSize: 2,
MinSize: 2,
TargetSize: 2,
Ready: []*cloudinstances.CloudInstanceGroupMember{
{
ID: "i-00001",
@ -281,7 +284,8 @@ func Test_ValidateMastersNotEnough(t *testing.T) {
Role: kopsapi.InstanceGroupRoleMaster,
},
},
MinSize: 3,
MinSize: 2,
TargetSize: 3,
Ready: []*cloudinstances.CloudInstanceGroupMember{
{
ID: "i-00001",
@ -333,7 +337,8 @@ func Test_ValidateMasterNotReady(t *testing.T) {
Role: kopsapi.InstanceGroupRoleMaster,
},
},
MinSize: 2,
MinSize: 2,
TargetSize: 2,
Ready: []*cloudinstances.CloudInstanceGroupMember{
{
ID: "i-00001",
@ -385,7 +390,8 @@ func Test_ValidateMasterStaticPods(t *testing.T) {
Role: kopsapi.InstanceGroupRoleMaster,
},
},
MinSize: 1,
MinSize: 1,
TargetSize: 1,
Ready: []*cloudinstances.CloudInstanceGroupMember{
{
ID: "i-00001",

1
upup/pkg/fi/cloudup/aliup/status.go
View File

@ -246,6 +246,7 @@ func buildCloudInstanceGroup(c ALICloud, ig *kops.InstanceGroup, g ess.ScalingGr
HumanName: g.ScalingGroupName,
InstanceGroup: ig,
MinSize: g.MinSize,
TargetSize: g.MinSize, // TODO: Which is the appropriate field? Need to add DesiredCapacity field to ScalingGroupItemType?
MaxSize: g.MaxSize,
Raw: g,
}

1
upup/pkg/fi/cloudup/awsup/aws_cloud.go
View File

@ -713,6 +713,7 @@ func awsBuildCloudInstanceGroup(c AWSCloud, cluster *kops.Cluster, ig *kops.Inst
HumanName: aws.StringValue(g.AutoScalingGroupName),
InstanceGroup: ig,
MinSize: int(aws.Int64Value(g.MinSize)),
TargetSize: int(aws.Int64Value(g.DesiredCapacity)),
MaxSize: int(aws.Int64Value(g.MaxSize)),
Raw: g,
}

1
upup/pkg/fi/cloudup/gce/instancegroups.go
View File

@ -169,6 +169,7 @@ func getCloudGroups(c GCECloud, cluster *kops.Cluster, instancegroups []*kops.In
HumanName: mig.Name,
InstanceGroup: ig,
MinSize: int(mig.TargetSize),
TargetSize: int(mig.TargetSize),
MaxSize: int(mig.TargetSize),
Raw: mig,
}

1
upup/pkg/fi/cloudup/openstack/server_group.go
View File

@ -107,6 +107,7 @@ func (c *openstackCloud) osBuildCloudInstanceGroup(cluster *kops.Cluster, ig *ko
HumanName: newLaunchConfigName,
InstanceGroup: ig,
MinSize: int(fi.Int32Value(ig.Spec.MinSize)),
TargetSize: int(fi.Int32Value(ig.Spec.MinSize)), // TODO: Retrieve the target size from OpenStack?
MaxSize: int(fi.Int32Value(ig.Spec.MaxSize)),
Raw: g,
}