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

Add nil checks for update policy values

This commit is contained in:
Flo Piboubès 2025-06-12 10:01:37 +02:00
parent b43c9cb583
commit a86a0bfa61
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,10 +64,13 @@ func (e *InstanceGroupManager) Find(c *fi.CloudupContext) (*InstanceGroupManager
actual.Zone = fi.PtrTo(lastComponent(r.Zone)) actual.Zone = fi.PtrTo(lastComponent(r.Zone))
actual.BaseInstanceName = &r.BaseInstanceName actual.BaseInstanceName = &r.BaseInstanceName
actual.TargetSize = &r.TargetSize actual.TargetSize = &r.TargetSize
actual.UpdatePolicy = &UpdatePolicy{MinimalAction: r.UpdatePolicy.MinimalAction, Type: r.UpdatePolicy.Type}
actual.InstanceTemplate = &InstanceTemplate{ID: fi.PtrTo(lastComponent(r.InstanceTemplate))} actual.InstanceTemplate = &InstanceTemplate{ID: fi.PtrTo(lastComponent(r.InstanceTemplate))}
actual.ListManagedInstancesResults = r.ListManagedInstancesResults actual.ListManagedInstancesResults = r.ListManagedInstancesResults
if policy := r.UpdatePolicy; policy != nil {
actual.UpdatePolicy = &UpdatePolicy{MinimalAction: r.UpdatePolicy.MinimalAction, Type: r.UpdatePolicy.Type}
}
for _, targetPool := range r.TargetPools { for _, targetPool := range r.TargetPools {
actual.TargetPools = append(actual.TargetPools, &TargetPool{ actual.TargetPools = append(actual.TargetPools, &TargetPool{
Name: fi.PtrTo(lastComponent(targetPool)), Name: fi.PtrTo(lastComponent(targetPool)),
@ -97,21 +100,22 @@ func (_ *InstanceGroupManager) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Ins
return err return err
} }
updatePolicy := &compute.InstanceGroupManagerUpdatePolicy{
MinimalAction: e.UpdatePolicy.MinimalAction,
Type: e.UpdatePolicy.Type,
}
i := &compute.InstanceGroupManager{ i := &compute.InstanceGroupManager{
Name: *e.Name, Name: *e.Name,
Zone: *e.Zone, Zone: *e.Zone,
BaseInstanceName: *e.BaseInstanceName, BaseInstanceName: *e.BaseInstanceName,
TargetSize: *e.TargetSize, TargetSize: *e.TargetSize,
UpdatePolicy: updatePolicy,
InstanceTemplate: instanceTemplateURL, InstanceTemplate: instanceTemplateURL,
ListManagedInstancesResults: e.ListManagedInstancesResults, ListManagedInstancesResults: e.ListManagedInstancesResults,
} }
if policy := e.UpdatePolicy; policy != nil {
i.UpdatePolicy = &compute.InstanceGroupManagerUpdatePolicy{
MinimalAction: e.UpdatePolicy.MinimalAction,
Type: e.UpdatePolicy.Type,
}
}
for _, targetPool := range e.TargetPools { for _, targetPool := range e.TargetPools {
i.TargetPools = append(i.TargetPools, targetPool.URL(t.Cloud)) i.TargetPools = append(i.TargetPools, targetPool.URL(t.Cloud))
} }
@ -210,10 +214,12 @@ func (_ *InstanceGroupManager) RenderTerraform(t *terraform.TerraformTarget, a,
TargetSize: e.TargetSize, TargetSize: e.TargetSize,
ListManagedInstancesResults: e.ListManagedInstancesResults, ListManagedInstancesResults: e.ListManagedInstancesResults,
} }
if policy := e.UpdatePolicy; policy != nil {
tf.UpdatePolicy = &terraformUpdatePolicy{ tf.UpdatePolicy = &terraformUpdatePolicy{
MinimalAction: e.UpdatePolicy.MinimalAction, MinimalAction: e.UpdatePolicy.MinimalAction,
Type: e.UpdatePolicy.Type, Type: e.UpdatePolicy.Type,
} }
}
tf.Version = &terraformVersion{ tf.Version = &terraformVersion{
InstanceTemplate: e.InstanceTemplate.TerraformLink(), InstanceTemplate: e.InstanceTemplate.TerraformLink(),
} }