Address review comments

Detach namespace from endpoint during DEL call. Signed-off-by: mansikulkarni96 <[email protected]> Signed-off-by: mansikulkarni96 <[email protected]>
containernetworking · Apr 12, 2022 · 3d95ada · 3d95ada
1 parent f30799f
commit 3d95ada
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/pkg/hns/endpoint_windows.go b/pkg/hns/endpoint_windows.go
@@ -282,6 +282,16 @@ func RemoveHcnEndpoint(epName string) error {
 		}
 		return errors.Annotatef(err, "failed to find HostComputeEndpoint %s", epName)
 	}
+	epNamespace, err := hcn.GetNamespaceByID(hcnEndpoint.HostComputeNamespace)
+	if err != nil && !hcn.IsNotFoundError(err) {
+		return errors.Annotatef(err, "failed to get HostComputeNamespace %s", epName)
+	}
+	if epNamespace != nil {
+		err = hcn.RemoveNamespaceEndpoint(hcnEndpoint.HostComputeNamespace, hcnEndpoint.Id)
+		if err != nil && !hcn.IsNotFoundError(err) {
+			return errors.Annotatef(err,"error removing endpoint: %s from namespace: %s", epName, epNamespace)
+		}
+	}
 
 	err = hcnEndpoint.Delete()
 	if err != nil {