check if the namespace is terminating (#46)

horis233 · web-flow · commit 215d8c58fb0e · 2020-11-20T02:33:45.000+08:00
diff --git a/controllers/namespacescope_controller.go b/controllers/namespacescope_controller.go
@@ -683,6 +683,10 @@ func (r *NamespaceScopeReconciler) getValidatedNamespaces(instance *operatorv1.N
 				return nil, err
 			}
 		}
+		if ns.Status.Phase == corev1.NamespaceTerminating {
+			klog.Infof("Namespace %s is terminating. Ignore this namespace ", nsMem)
+			continue
+		}
 		validatedNs = append(validatedNs, nsMem)
 	}
 	return validatedNs, nil

Original file line number	Diff line number	Diff line change
`@@ -683,6 +683,10 @@ func (r NamespaceScopeReconciler) getValidatedNamespaces(instance operatorv1.N`
`683`	`683`	`return nil, err`
`684`	`684`	`}`
`685`	`685`	`}`
	`686`	`+ if ns.Status.Phase == corev1.NamespaceTerminating {`
	`687`	`+ klog.Infof("Namespace %s is terminating. Ignore this namespace ", nsMem)`
	`688`	`+ continue`
	`689`	`+ }`
`686`	`690`	`validatedNs = append(validatedNs, nsMem)`
`687`	`691`	`}`
`688`	`692`	`return validatedNs, nil`