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

Merge pull request #16112 from zetaab/fix/openstackvalidate 

Check cluster information when filtering instances
This commit is contained in:
Kubernetes Prow Robot 2023-11-19 18:03:02 +01:00 committed by GitHub
parent 0b99ade7a4 c6957314d8
commit d5086a785c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
upup/pkg/fi/cloudup/openstack/cloud.go
View File

@ -603,27 +603,48 @@ func (c *openstackCloud) DeleteGroup(g *cloudinstances.CloudInstanceGroup) error
return deleteGroup(c, g) return deleteGroup(c, g)
} }
// InstanceInClusterAndIG checks if instance is in current cluster and instancegroup
func InstanceInClusterAndIG(instance servers.Server, clusterName string, instanceGroupName string) bool {
value, ok := instance.Metadata[TagKopsInstanceGroup]
if !ok || value != instanceGroupName {
return false
}
cName, clusterok := instance.Metadata["k8s"]
if !clusterok || cName != clusterName {
return false
}
return true
}
func deleteGroup(c OpenstackCloud, g *cloudinstances.CloudInstanceGroup) error { func deleteGroup(c OpenstackCloud, g *cloudinstances.CloudInstanceGroup) error {
instances, err := c.ListInstances(servers.ListOpts{ cluster := g.Raw.(*kops.Cluster)
allInstances, err := c.ListInstances(servers.ListOpts{
Name: fmt.Sprintf("^%s", g.InstanceGroup.Name), Name: fmt.Sprintf("^%s", g.InstanceGroup.Name),
}) })
if err != nil { if err != nil {
return err return err
} }
instances := []servers.Server{}
for _, instance := range allInstances {
if !InstanceInClusterAndIG(instance, cluster.Name, g.InstanceGroup.Name) {
continue
}
instances = append(instances, instance)
}
for _, instance := range instances { for _, instance := range instances {
err := c.DeleteInstanceWithID(instance.ID) err := c.DeleteInstanceWithID(instance.ID)
if err != nil { if err != nil {
return fmt.Errorf("could not delete instance %q: %v", instance.ID, err) return fmt.Errorf("could not delete instance %q: %v", instance.ID, err)
} }
} }
ports, err := c.ListPorts(ports.ListOpts{}) ports, err := c.ListPorts(ports.ListOpts{})
if err != nil { if err != nil {
return fmt.Errorf("could not list ports %v", err) return fmt.Errorf("could not list ports %v", err)
} }
for _, port := range ports { for _, port := range ports {
if strings.HasPrefix(port.Name, fmt.Sprintf("port-%s", g.InstanceGroup.Name)) { if strings.HasPrefix(port.Name, fmt.Sprintf("port-%s", g.InstanceGroup.Name)) && fi.ArrayContains(port.Tags, fmt.Sprintf("%s=%s", TagClusterName, cluster.Name)) {
err := c.DeletePort(port.ID) err := c.DeletePort(port.ID)
if err != nil { if err != nil {
return fmt.Errorf("could not delete port %q: %v", port.ID, err) return fmt.Errorf("could not delete port %q: %v", port.ID, err)
@ -640,7 +661,6 @@ func deleteGroup(c OpenstackCloud, g *cloudinstances.CloudInstanceGroup) error {
return fmt.Errorf("could not list server groups %v", err) return fmt.Errorf("could not list server groups %v", err)
} }
cluster := g.Raw.(*kops.Cluster)
for _, sg := range sgs { for _, sg := range sgs {
if fmt.Sprintf("%s-%s", cluster.Name, sgName) == sg.Name { if fmt.Sprintf("%s-%s", cluster.Name, sgName) == sg.Name {
if len(sg.Members) == 0 { if len(sg.Members) == 0 {

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

@ -101,10 +101,10 @@ func osBuildCloudInstanceGroup(c OpenstackCloud, cluster *kops.Cluster, ig *kops
return nil, err return nil, err
} }
for _, instance := range instances { for _, instance := range instances {
value, ok := instance.Metadata[TagKopsInstanceGroup] if !InstanceInClusterAndIG(instance, cluster.Name, ig.Name) {
if !ok || value != ig.Name {
continue continue
} }
igObservedGeneration := instance.Metadata[INSTANCE_GROUP_GENERATION] igObservedGeneration := instance.Metadata[INSTANCE_GROUP_GENERATION]
clusterObservedGeneration := instance.Metadata[CLUSTER_GENERATION] clusterObservedGeneration := instance.Metadata[CLUSTER_GENERATION]
observedName := fmt.Sprintf("%s-%s", clusterObservedGeneration, igObservedGeneration) observedName := fmt.Sprintf("%s-%s", clusterObservedGeneration, igObservedGeneration)