fix cleaning up workloadentry with same ip and network (#43951)

* fix cleaning up workloadentry with same ip and network * release note
istio · Mar 17, 2023 · e2706b1 · e2706b1
1 parent 6fd443c
commit e2706b1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/pilot/pkg/autoregistration/controller.go b/pilot/pkg/autoregistration/controller.go
@@ -608,5 +608,11 @@ func workloadEntryFromGroup(name string, proxy *model.Proxy, groupCfg *config.Co
 }
 
 func makeProxyKey(proxy *model.Proxy) string {
-	return string(proxy.Metadata.Network) + proxy.IPAddresses[0]
+	key := strings.Join([]string{
+		string(proxy.Metadata.Network),
+		proxy.IPAddresses[0],
+		proxy.Metadata.AutoRegisterGroup,
+		proxy.Metadata.Namespace,
+	}, "~")
+	return key
 }
diff --git a/releasenotes/notes/43951.yaml b/releasenotes/notes/43951.yaml
@@ -0,0 +1,11 @@
+apiVersion: release-notes/v2
+kind: bug-fix
+area: traffic-management
+issue:
+  - 43950
+
+releaseNotes:
+- |
+  **Fixed** WorkloadEntry resources never being cleaned up if multiple
+  WorkloadEntries were auto-registered with the same IP and network.
+