Delete the membership after unregistration failure (#175) (#193)

e2e/testcases/csr_auth_test.go

@@ -173,8 +173,10 @@ func cleanMembershipInfo(nt *nomostest.NT, fleetMembership, gcpProject, gkeURI s
 		}
 		nt.T.Logf("The membership exits, unregistering the cluster from project %q to clean up the membership", fleetProject)
 		if err = unregisterCluster(fleetMembership, fleetProject, gkeURI); err != nil {
-			nt.T.Errorf("failed to unregister the cluster: %v", err)
-			nt.T.Skip("Skip the test because unable to unregister the cluster")
+			nt.T.Logf("failed to unregister the cluster: %v", err)
+			if err = deleteMembership(fleetMembership, fleetProject); err != nil {
+				nt.T.Logf("failed to delete the membership %q: %v", fleetMembership, err)
+			}
 			membershipExists, _, err = getMembershipIdentityProvider(nt)
 			if err != nil {
 				nt.T.Error(err)
@@ -348,6 +350,15 @@ func unregisterCluster(fleetMembership, gcpProject, gkeURI string) error {
 	return nil
 }
 
+// deleteMembership deletes the membership from the cluster.
+func deleteMembership(fleetMembership, gcpProject string) error {
+	out, err := exec.Command("gcloud", "container", "hub", "memberships", "delete", fleetMembership, "--quiet", "--project", gcpProject).CombinedOutput()
+	if err != nil {
+		return fmt.Errorf("%s: %v", string(out), err)
+	}
+	return nil
+}
+
 // registerCluster registers a cluster in a fleet.
 func registerCluster(fleetMembership, gcpProject, gkeURI string) error {
 	out, err := exec.Command("gcloud", "container", "hub", "memberships", "register", fleetMembership, "--project", gcpProject, "--gke-uri", gkeURI, "--enable-workload-identity").CombinedOutput()