From ade167e53af84914e0d3b502e7f0bd7f5bd315d0 Mon Sep 17 00:00:00 2001 From: chenyw1990 Date: Mon, 10 May 2021 10:33:28 +0800 Subject: [PATCH] Delete AvailableResources judgment for GA features --- cmd/kube-controller-manager/app/apps.go | 13 ------------- cmd/kube-controller-manager/app/batch.go | 7 ------- cmd/kube-controller-manager/app/certificates.go | 12 ------------ 3 files changed, 32 deletions(-) diff --git a/cmd/kube-controller-manager/app/apps.go b/cmd/kube-controller-manager/app/apps.go index 88727a1977e..7a4e3a670b1 100644 --- a/cmd/kube-controller-manager/app/apps.go +++ b/cmd/kube-controller-manager/app/apps.go @@ -25,7 +25,6 @@ import ( "net/http" "time" - "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/util/flowcontrol" "k8s.io/kubernetes/pkg/controller/daemon" "k8s.io/kubernetes/pkg/controller/deployment" @@ -34,9 +33,6 @@ import ( ) func startDaemonSetController(ctx ControllerContext) (http.Handler, bool, error) { - if !ctx.AvailableResources[schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "daemonsets"}] { - return nil, false, nil - } dsc, err := daemon.NewDaemonSetsController( ctx.InformerFactory.Apps().V1().DaemonSets(), ctx.InformerFactory.Apps().V1().ControllerRevisions(), @@ -53,9 +49,6 @@ func startDaemonSetController(ctx ControllerContext) (http.Handler, bool, error) } func startStatefulSetController(ctx ControllerContext) (http.Handler, bool, error) { - if !ctx.AvailableResources[schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "statefulsets"}] { - return nil, false, nil - } go statefulset.NewStatefulSetController( ctx.InformerFactory.Core().V1().Pods(), ctx.InformerFactory.Apps().V1().StatefulSets(), @@ -67,9 +60,6 @@ func startStatefulSetController(ctx ControllerContext) (http.Handler, bool, erro } func startReplicaSetController(ctx ControllerContext) (http.Handler, bool, error) { - if !ctx.AvailableResources[schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "replicasets"}] { - return nil, false, nil - } go replicaset.NewReplicaSetController( ctx.InformerFactory.Apps().V1().ReplicaSets(), ctx.InformerFactory.Core().V1().Pods(), @@ -80,9 +70,6 @@ func startReplicaSetController(ctx ControllerContext) (http.Handler, bool, error } func startDeploymentController(ctx ControllerContext) (http.Handler, bool, error) { - if !ctx.AvailableResources[schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "deployments"}] { - return nil, false, nil - } dc, err := deployment.NewDeploymentController( ctx.InformerFactory.Apps().V1().Deployments(), ctx.InformerFactory.Apps().V1().ReplicaSets(), diff --git a/cmd/kube-controller-manager/app/batch.go b/cmd/kube-controller-manager/app/batch.go index 20696fefe89..55fc05419dd 100644 --- a/cmd/kube-controller-manager/app/batch.go +++ b/cmd/kube-controller-manager/app/batch.go @@ -24,7 +24,6 @@ import ( "fmt" "net/http" - "k8s.io/apimachinery/pkg/runtime/schema" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/controller/cronjob" "k8s.io/kubernetes/pkg/controller/job" @@ -32,9 +31,6 @@ import ( ) func startJobController(ctx ControllerContext) (http.Handler, bool, error) { - if !ctx.AvailableResources[schema.GroupVersionResource{Group: "batch", Version: "v1", Resource: "jobs"}] { - return nil, false, nil - } go job.NewController( ctx.InformerFactory.Core().V1().Pods(), ctx.InformerFactory.Batch().V1().Jobs(), @@ -44,9 +40,6 @@ func startJobController(ctx ControllerContext) (http.Handler, bool, error) { } func startCronJobController(ctx ControllerContext) (http.Handler, bool, error) { - if !ctx.AvailableResources[schema.GroupVersionResource{Group: "batch", Version: "v1", Resource: "cronjobs"}] { - return nil, false, nil - } if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.CronJobControllerV2) { cj2c, err := cronjob.NewControllerV2(ctx.InformerFactory.Batch().V1().Jobs(), ctx.InformerFactory.Batch().V1().CronJobs(), diff --git a/cmd/kube-controller-manager/app/certificates.go b/cmd/kube-controller-manager/app/certificates.go index ab269aca236..ebb3c777671 100644 --- a/cmd/kube-controller-manager/app/certificates.go +++ b/cmd/kube-controller-manager/app/certificates.go @@ -24,7 +24,6 @@ import ( "fmt" "net/http" - "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/controller/certificates/approver" "k8s.io/kubernetes/pkg/controller/certificates/cleaner" @@ -34,11 +33,6 @@ import ( ) func startCSRSigningController(ctx ControllerContext) (http.Handler, bool, error) { - gvr := schema.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1", Resource: "certificatesigningrequests"} - if !ctx.AvailableResources[gvr] { - klog.Warningf("Resource %s is not available now", gvr.String()) - return nil, false, nil - } missingSingleSigningFile := ctx.ComponentConfig.CSRSigningController.ClusterSigningCertFile == "" || ctx.ComponentConfig.CSRSigningController.ClusterSigningKeyFile == "" if missingSingleSigningFile && !anySpecificFilesSet(ctx.ComponentConfig.CSRSigningController) { klog.V(2).Info("skipping CSR signer controller because no csr cert/key was specified") @@ -154,12 +148,6 @@ func getLegacyUnknownSignerFiles(config csrsigningconfig.CSRSigningControllerCon } func startCSRApprovingController(ctx ControllerContext) (http.Handler, bool, error) { - gvr := schema.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1", Resource: "certificatesigningrequests"} - if !ctx.AvailableResources[gvr] { - klog.Warningf("Resource %s is not available now", gvr.String()) - return nil, false, nil - } - approver := approver.NewCSRApprovingController( ctx.ClientBuilder.ClientOrDie("certificate-controller"), ctx.InformerFactory.Certificates().V1().CertificateSigningRequests(),