Merge pull request #20645 from pmorie/namespace-controller-config

Auto commit by PR queue bot
kubernetes · Feb 10, 2016 · afc5564 · afc5564 · k8s-teamcity-mesosphere · Feb 10, 2016
2 parents 86a7a95 + 3a505ac
commit afc5564
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/pkg/controller/namespace/namespace_controller_test.go b/pkg/controller/namespace/namespace_controller_test.go
@@ -108,6 +108,7 @@ func testSyncNamespaceThatIsTerminating(t *testing.T, versions *unversioned.APIV
 		strings.Join([]string{"list", "pods", ""}, "-"),
 		strings.Join([]string{"delete-collection", "resourcequotas", ""}, "-"),
 		strings.Join([]string{"delete-collection", "secrets", ""}, "-"),
+		strings.Join([]string{"delete-collection", "configmaps", ""}, "-"),
 		strings.Join([]string{"delete-collection", "limitranges", ""}, "-"),
 		strings.Join([]string{"delete-collection", "events", ""}, "-"),
 		strings.Join([]string{"delete-collection", "serviceaccounts", ""}, "-"),

diff --git a/pkg/controller/namespace/namespace_controller_utils.go b/pkg/controller/namespace/namespace_controller_utils.go
@@ -128,6 +128,10 @@ func deleteAllContent(kubeClient clientset.Interface, versions *unversioned.APIV
 	if err != nil {
 		return estimate, err
 	}
+	err = deleteConfigMaps(kubeClient, namespace)
+	if err != nil {
+		return estimate, err
+	}
 	err = deletePersistentVolumeClaims(kubeClient, namespace)
 	if err != nil {
 		return estimate, err
@@ -315,6 +319,10 @@ func deleteSecrets(kubeClient clientset.Interface, ns string) error {
 	return kubeClient.Core().Secrets(ns).DeleteCollection(nil, api.ListOptions{})
 }
 
+func deleteConfigMaps(kubeClient clientset.Interface, ns string) error {
+	return kubeClient.Core().ConfigMaps(ns).DeleteCollection(nil, api.ListOptions{})
+}
+
 func deletePersistentVolumeClaims(kubeClient clientset.Interface, ns string) error {
 	return kubeClient.Core().PersistentVolumeClaims(ns).DeleteCollection(nil, api.ListOptions{})
 }