Merge pull request #2790 from abhinavdahiya/gcp_iam_binding_new_value…

…_type Bug 1782583: destroy/gcp/policybinding.go: identity deleted service accounts belonging to the cluster
openshift · Dec 11, 2019 · e261445 · e261445
2 parents 61a4060 + e580a61
commit e261445
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/destroy/gcp/policybinding.go b/pkg/destroy/gcp/policybinding.go
@@ -39,7 +39,7 @@ func clearIAMPolicyBindings(policy *resourcemanager.Policy, clusterID string, lo
 	for _, binding := range policy.Bindings {
 		members := []string{}
 		for _, member := range binding.Members {
-			if strings.HasPrefix(member, fmt.Sprintf("serviceAccount:%s", clusterID)) {
+			if strings.HasPrefix(strings.TrimPrefix(member, "deleted:"), fmt.Sprintf("serviceAccount:%s", clusterID)) {
 				logger.Debugf("IAM: removing %s from role %s", member, binding.Role)
 				removedBindings = true
 				continue