From bdb1f509f0d56b7253423035164470f70779f4a4 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Wed, 29 Jun 2022 06:24:07 +0300 Subject: [PATCH] Fix cleanup of firewall rules that contain the cluster name hash --- pkg/resources/gce/gce.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/resources/gce/gce.go b/pkg/resources/gce/gce.go index c3c2ddfe1e..de40be738d 100644 --- a/pkg/resources/gce/gce.go +++ b/pkg/resources/gce/gce.go @@ -540,7 +540,7 @@ nextFirewallRule: // We consider only firewall rules that target our cluster tags, which include the cluster name or hash tagPrefix := gce.SafeClusterName(d.clusterName) + "-" - clusterNameHash := truncate.HashString(d.clusterName, 6) + clusterNameHash := truncate.HashString(gce.SafeClusterName(d.clusterName), 6) if len(firewallRule.TargetTags) != 0 { tagMatchCount := 0 for _, target := range firewallRule.TargetTags { @@ -1241,12 +1241,9 @@ func (d *clusterDiscoveryGCE) matchesClusterNameMultipart(name string, maxParts } safeName := gce.SafeObjectName(id, d.clusterName) - suffixedName, err := gce.ClusterSuffixedName(id, d.clusterName, 63) - if err != nil { - return false - } + clusterNameHash := truncate.HashString(gce.SafeClusterName(d.clusterName), 6) - if name == safeName || name == suffixedName { + if name == safeName || strings.Contains(name, clusterNameHash) { return true } }