diff --git a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_instancegroup.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_instancegroup.go index e8b37526221..46c58792b68 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_instancegroup.go +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_instancegroup.go @@ -52,11 +52,11 @@ func (g *Cloud) DeleteInstanceGroup(name string, zone string) error { // FilterInstanceGroupsByName lists all InstanceGroups in the project and // zone that match the name regexp. -func (g *Cloud) FilterInstanceGroupsByName(name, zone string) ([]*compute.InstanceGroup, error) { +func (g *Cloud) FilterInstanceGroupsByNamePrefix(namePrefix, zone string) ([]*compute.InstanceGroup, error) { ctx, cancel := cloud.ContextWithCallTimeout() defer cancel() mc := newInstanceGroupMetricContext("filter", zone) - v, err := g.c.InstanceGroups().List(ctx, zone, filter.Regexp("name", name)) + v, err := g.c.InstanceGroups().List(ctx, zone, filter.Regexp("name", namePrefix+".*")) return v, mc.Observe(err) } diff --git a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go index 3a40d5cba16..3fca2d76397 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go @@ -626,9 +626,9 @@ func (g *Cloud) ensureInternalInstanceGroups(name string, nodes []*v1.Node) ([]s var igLinks []string for zone, nodes := range zonedNodes { if g.AlphaFeatureGate.Enabled(AlphaFeatureSkipIGsManagement) { - igs, err := g.FilterInstanceGroupsByName(name, zone) + igs, err := g.FilterInstanceGroupsByNamePrefix(name, zone) if err != nil { - return []string{}, err + return nil, err } for _, ig := range igs { igLinks = append(igLinks, ig.SelfLink) @@ -636,7 +636,7 @@ func (g *Cloud) ensureInternalInstanceGroups(name string, nodes []*v1.Node) ([]s } else { igLink, err := g.ensureInternalInstanceGroup(name, zone, nodes) if err != nil { - return []string{}, err + return nil, err } igLinks = append(igLinks, igLink) }