prune internal informer from kubeapiserver constructor

cmd/kube-apiserver/app/BUILD

@@ -13,8 +13,6 @@ go_library(
         "//cmd/kube-apiserver/app/options:go_default_library",
         "//pkg/api/legacyscheme:go_default_library",
         "//pkg/capabilities:go_default_library",
-        "//pkg/client/clientset_generated/internalclientset:go_default_library",
-        "//pkg/client/informers/informers_generated/internalversion:go_default_library",
         "//pkg/controller/serviceaccount:go_default_library",
         "//pkg/features:go_default_library",
         "//pkg/generated/openapi:go_default_library",

cmd/kube-apiserver/app/server.go

@@ -63,8 +63,6 @@ import (
 	"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	"k8s.io/kubernetes/pkg/capabilities"
-	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
-	informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion"
 	serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount"
 	"k8s.io/kubernetes/pkg/features"
 	generatedopenapi "k8s.io/kubernetes/pkg/generated/openapi"
@@ -281,9 +279,8 @@ func CreateKubeAPIServerConfig(
 ) {
 	var genericConfig *genericapiserver.Config
 	var storageFactory *serverstorage.DefaultStorageFactory
-	var sharedInformers informers.SharedInformerFactory
 	var versionedInformers clientgoinformers.SharedInformerFactory
-	genericConfig, sharedInformers, versionedInformers, insecureServingInfo, serviceResolver, pluginInitializers, admissionPostStartHook, storageFactory, lastErr = buildGenericConfig(s.ServerRunOptions, proxyTransport)
+	genericConfig, versionedInformers, insecureServingInfo, serviceResolver, pluginInitializers, admissionPostStartHook, storageFactory, lastErr = buildGenericConfig(s.ServerRunOptions, proxyTransport)
 	if lastErr != nil {
 		return
 	}
@@ -399,7 +396,6 @@ func CreateKubeAPIServerConfig(
 			APIAudiences:                apiAudiences,
 			ServiceAccountMaxExpiration: maxExpiration,
 
-			InternalInformers:  sharedInformers,
 			VersionedInformers: versionedInformers,
 		},
 	}
@@ -418,7 +414,6 @@ func buildGenericConfig(
 	proxyTransport *http.Transport,
 ) (
 	genericConfig *genericapiserver.Config,
-	sharedInformers informers.SharedInformerFactory,
 	versionedInformers clientgoinformers.SharedInformerFactory,
 	insecureServingInfo *genericapiserver.DeprecatedInsecureServingInfo,
 	serviceResolver aggregatorapiserver.ServiceResolver,
@@ -486,14 +481,7 @@ func buildGenericConfig(
 	// set it in kube-apiserver.
 	genericConfig.LoopbackClientConfig.ContentConfig.ContentType = "application/vnd.kubernetes.protobuf"
 
-	client, err := internalclientset.NewForConfig(genericConfig.LoopbackClientConfig)
-	if err != nil {
-		lastErr = fmt.Errorf("failed to create clientset: %v", err)
-		return
-	}
-
 	kubeClientConfig := genericConfig.LoopbackClientConfig
-	sharedInformers = informers.NewSharedInformerFactory(client, 10*time.Minute)
 	clientgoExternalClient, err := clientgoclientset.NewForConfig(kubeClientConfig)
 	if err != nil {
 		lastErr = fmt.Errorf("failed to create real external clientset: %v", err)

pkg/BUILD

@@ -55,26 +55,7 @@ filegroup(
         "//pkg/capabilities:all-srcs",
         "//pkg/client/clientset_generated/internalclientset:all-srcs",
         "//pkg/client/conditions:all-srcs",
-        "//pkg/client/informers/informers_generated/internalversion:all-srcs",
         "//pkg/client/leaderelectionconfig:all-srcs",
-        "//pkg/client/listers/admissionregistration/internalversion:all-srcs",
-        "//pkg/client/listers/apps/internalversion:all-srcs",
-        "//pkg/client/listers/auditregistration/internalversion:all-srcs",
-        "//pkg/client/listers/authentication/internalversion:all-srcs",
-        "//pkg/client/listers/authorization/internalversion:all-srcs",
-        "//pkg/client/listers/autoscaling/internalversion:all-srcs",
-        "//pkg/client/listers/batch/internalversion:all-srcs",
-        "//pkg/client/listers/certificates/internalversion:all-srcs",
-        "//pkg/client/listers/coordination/internalversion:all-srcs",
-        "//pkg/client/listers/core/internalversion:all-srcs",
-        "//pkg/client/listers/extensions/internalversion:all-srcs",
-        "//pkg/client/listers/imagepolicy/internalversion:all-srcs",
-        "//pkg/client/listers/networking/internalversion:all-srcs",
-        "//pkg/client/listers/policy/internalversion:all-srcs",
-        "//pkg/client/listers/rbac/internalversion:all-srcs",
-        "//pkg/client/listers/scheduling/internalversion:all-srcs",
-        "//pkg/client/listers/settings/internalversion:all-srcs",
-        "//pkg/client/listers/storage/internalversion:all-srcs",
         "//pkg/client/metrics/prometheus:all-srcs",
         "//pkg/client/testdata:all-srcs",
         "//pkg/client/tests:all-srcs",

pkg/kubeapiserver/admission/config.go

@@ -43,7 +43,6 @@ type AdmissionConfig struct {
 	CloudConfigFile      string
 	LoopbackClientConfig *rest.Config
 	ExternalInformers    externalinformers.SharedInformerFactory
-	InternalInformers    internalinformers.SharedInformerFactory
 }
 
 func (c *AdmissionConfig) buildAuthnInfoResolver(proxyTransport *http.Transport) webhook.AuthenticationInfoResolverWrapper {

pkg/master/BUILD

@@ -36,7 +36,6 @@ go_library(
         "//pkg/apis/settings/install:go_default_library",
         "//pkg/apis/storage/install:go_default_library",
         "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library",
-        "//pkg/client/informers/informers_generated/internalversion:go_default_library",
         "//pkg/features:go_default_library",
         "//pkg/kubeapiserver/options:go_default_library",
         "//pkg/kubelet/client:go_default_library",

pkg/master/master.go

@@ -69,7 +69,6 @@ import (
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
 	api "k8s.io/kubernetes/pkg/apis/core"
 	coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
-	internalinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion"
 	kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
 	kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
 	"k8s.io/kubernetes/pkg/master/reconcilers"
@@ -175,7 +174,6 @@ type ExtraConfig struct {
 	APIAudiences authenticator.Audiences
 
 	VersionedInformers informers.SharedInformerFactory
-	InternalInformers  internalinformers.SharedInformerFactory
 }
 
 type Config struct {
@@ -377,12 +375,6 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
 	}
 
 	m.GenericAPIServer.AddPostStartHookOrDie("ca-registration", c.ExtraConfig.ClientCARegistrationHook.PostStartHook)
-	m.GenericAPIServer.AddPostStartHookOrDie("start-kube-apiserver-informers", func(context genericapiserver.PostStartHookContext) error {
-		if c.ExtraConfig.InternalInformers != nil {
-			c.ExtraConfig.InternalInformers.Start(context.StopCh)
-		}
-		return nil
-	})
 
 	return m, nil
 }