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

Merge pull request #13907 from hakman/gce_fix_cleanup_by_hash 

Fix cleanup of firewall rules that contain targets with the cluster name hash
This commit is contained in:
Kubernetes Prow Robot 2022-06-29 02:50:06 -07:00 committed by GitHub
parent 2d4b75da6b bdb1f509f0
commit 36aa0920df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/resources/gce/gce.go
View File

@ -540,7 +540,7 @@ nextFirewallRule:
// We consider only firewall rules that target our cluster tags, which include the cluster name or hash // We consider only firewall rules that target our cluster tags, which include the cluster name or hash
tagPrefix := gce.SafeClusterName(d.clusterName) + "-" tagPrefix := gce.SafeClusterName(d.clusterName) + "-"
clusterNameHash := truncate.HashString(d.clusterName, 6) clusterNameHash := truncate.HashString(gce.SafeClusterName(d.clusterName), 6)
if len(firewallRule.TargetTags) != 0 { if len(firewallRule.TargetTags) != 0 {
tagMatchCount := 0 tagMatchCount := 0
for _, target := range firewallRule.TargetTags { for _, target := range firewallRule.TargetTags {
@ -1241,12 +1241,9 @@ func (d *clusterDiscoveryGCE) matchesClusterNameMultipart(name string, maxParts
} }
safeName := gce.SafeObjectName(id, d.clusterName) safeName := gce.SafeObjectName(id, d.clusterName)
suffixedName, err := gce.ClusterSuffixedName(id, d.clusterName, 63) clusterNameHash := truncate.HashString(gce.SafeClusterName(d.clusterName), 6)
if err != nil {
return false
}
if name == safeName || name == suffixedName { if name == safeName || strings.Contains(name, clusterNameHash) {
return true return true
} }
} }