From 3a72abed4012f6fcd6da6c1a2be338e8ab37a24b Mon Sep 17 00:00:00 2001
From: Xing Zhou <xingzhou@cn.ibm.com>
Date: Thu, 1 Jun 2017 16:24:48 +0800
Subject: [PATCH] While deleting a namespace, the TPR instances under this ns
 should be deleted.

While deleting a namespace, the TPR instances under this ns should be deleted.
---
 cmd/kube-controller-manager/app/BUILD   |  2 --
 cmd/kube-controller-manager/app/core.go | 24 +-----------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD
index 9b3692b68c3..2a05c6c2d50 100644
--- a/cmd/kube-controller-manager/app/BUILD
+++ b/cmd/kube-controller-manager/app/BUILD
@@ -29,7 +29,6 @@ go_library(
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/batch:go_default_library",
         "//pkg/apis/componentconfig:go_default_library",
-        "//pkg/apis/extensions:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/informers/informers_generated/externalversions:go_default_library",
         "//pkg/client/leaderelection:go_default_library",
@@ -96,7 +95,6 @@ go_library(
         "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
diff --git a/cmd/kube-controller-manager/app/core.go b/cmd/kube-controller-manager/app/core.go
index 69466bbad95..6d02c444c15 100644
--- a/cmd/kube-controller-manager/app/core.go
+++ b/cmd/kube-controller-manager/app/core.go
@@ -23,14 +23,12 @@ package app
 import (
 	"fmt"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	"k8s.io/kubernetes/pkg/controller"
 	endpointcontroller "k8s.io/kubernetes/pkg/controller/endpoint"
@@ -112,27 +110,8 @@ func startNamespaceController(ctx ControllerContext) (bool, error) {
 	namespaceKubeClient := clientset.NewForConfigOrDie(nsKubeconfig)
 	namespaceClientPool := dynamic.NewClientPool(nsKubeconfig, restMapper, dynamic.LegacyAPIPathResolverFunc)
 
-	// Find the list of namespaced resources via discovery that the namespace controller must manage
-	// TODO: consider using a list-watch + cache here rather than polling
-	resources, err := namespaceKubeClient.Discovery().ServerResources()
-	if err != nil {
-		return true, fmt.Errorf("failed to get preferred server resources: %v", err)
-	}
-	gvrs, err := discovery.GroupVersionResources(resources)
-	if err != nil {
-		return true, fmt.Errorf("failed to parse preferred server resources: %v", err)
-	}
 	discoverResourcesFn := namespaceKubeClient.Discovery().ServerPreferredNamespacedResources
-	if _, found := gvrs[extensions.SchemeGroupVersion.WithResource("thirdpartyresource")]; !found {
-		// make discovery static
-		snapshot, err := discoverResourcesFn()
-		if err != nil {
-			return true, fmt.Errorf("failed to get server resources: %v", err)
-		}
-		discoverResourcesFn = func() ([]*metav1.APIResourceList, error) {
-			return snapshot, nil
-		}
-	}
+
 	namespaceController := namespacecontroller.NewNamespaceController(
 		namespaceKubeClient,
 		namespaceClientPool,
@@ -144,7 +123,6 @@ func startNamespaceController(ctx ControllerContext) (bool, error) {
 	go namespaceController.Run(int(ctx.Options.ConcurrentNamespaceSyncs), ctx.Stop)
 
 	return true, nil
-
 }
 
 func startServiceAccountController(ctx ControllerContext) (bool, error) {