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

Always set the paginated instance group field

This commit is contained in:
Peter Rifel 2023-12-20 20:05:48 -06:00
parent 40ec87b0f7
commit 6e337da7f0
No known key found for this signature in database
2 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/model/gcemodel/autoscalinggroup.go
View File

@ -301,12 +301,13 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.CloudupModelBuilderContext) e
name := gce.NameForInstanceGroupManager(b.Cluster.ObjectMeta.Name, ig.ObjectMeta.Name, zone)
t := &gcetasks.InstanceGroupManager{
Name: s(name),
Lifecycle: b.Lifecycle,
Zone: s(zone),
TargetSize: fi.PtrTo(int64(targetSize)),
BaseInstanceName: s(ig.ObjectMeta.Name),
InstanceTemplate: instanceTemplate,
Name: s(name),
Lifecycle: b.Lifecycle,
Zone: s(zone),
TargetSize: fi.PtrTo(int64(targetSize)),
BaseInstanceName: s(ig.ObjectMeta.Name),
InstanceTemplate: instanceTemplate,
ListManagedInstancesResults: "PAGINATED",
}
// Attach masters to load balancer if we're using one

43
upup/pkg/fi/cloudup/gcetasks/instancegroupmanager.go
View File

@ -32,10 +32,11 @@ type InstanceGroupManager struct {
Name *string
Lifecycle fi.Lifecycle
Zone *string
BaseInstanceName *string
InstanceTemplate *InstanceTemplate
TargetSize *int64
Zone *string
BaseInstanceName *string
InstanceTemplate *InstanceTemplate
ListManagedInstancesResults string
TargetSize *int64
TargetPools []*TargetPool
}
@ -63,6 +64,7 @@ func (e *InstanceGroupManager) Find(c *fi.CloudupContext) (*InstanceGroupManager
actual.BaseInstanceName = &r.BaseInstanceName
actual.TargetSize = &r.TargetSize
actual.InstanceTemplate = &InstanceTemplate{ID: fi.PtrTo(lastComponent(r.InstanceTemplate))}
actual.ListManagedInstancesResults = r.ListManagedInstancesResults
for _, targetPool := range r.TargetPools {
actual.TargetPools = append(actual.TargetPools, &TargetPool{
@ -94,11 +96,12 @@ func (_ *InstanceGroupManager) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Ins
}
i := &compute.InstanceGroupManager{
Name: *e.Name,
Zone: *e.Zone,
BaseInstanceName: *e.BaseInstanceName,
TargetSize: *e.TargetSize,
InstanceTemplate: instanceTemplateURL,
Name: *e.Name,
Zone: *e.Zone,
BaseInstanceName: *e.BaseInstanceName,
TargetSize: *e.TargetSize,
InstanceTemplate: instanceTemplateURL,
ListManagedInstancesResults: e.ListManagedInstancesResults,
}
for _, targetPool := range e.TargetPools {
@ -172,12 +175,13 @@ func (_ *InstanceGroupManager) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Ins
}
type terraformInstanceGroupManager struct {
Name *string `cty:"name"`
Zone *string `cty:"zone"`
BaseInstanceName *string `cty:"base_instance_name"`
Version *terraformVersion `cty:"version"`
TargetSize *int64 `cty:"target_size"`
TargetPools []*terraformWriter.Literal `cty:"target_pools"`
Name *string `cty:"name"`
Zone *string `cty:"zone"`
BaseInstanceName *string `cty:"base_instance_name"`
ListManagedInstancesResults string `cty:"list_managed_instances_results"`
Version *terraformVersion `cty:"version"`
TargetSize *int64 `cty:"target_size"`
TargetPools []*terraformWriter.Literal `cty:"target_pools"`
}
type terraformVersion struct {
@ -186,10 +190,11 @@ type terraformVersion struct {
func (_ *InstanceGroupManager) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *InstanceGroupManager) error {
tf := &terraformInstanceGroupManager{
Name: e.Name,
Zone: e.Zone,
BaseInstanceName: e.BaseInstanceName,
TargetSize: e.TargetSize,
Name: e.Name,
Zone: e.Zone,
BaseInstanceName: e.BaseInstanceName,
TargetSize: e.TargetSize,
ListManagedInstancesResults: e.ListManagedInstancesResults,
}
tf.Version = &terraformVersion{
InstanceTemplate: e.InstanceTemplate.TerraformLink(),