github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101860 from chenyw1990/deleteAvailableResourceJudgment

Browse Source 
Delete AvailableResources judgment for GA features
This commit is contained in:
Kubernetes Prow Robot 2021-06-03 13:24:42 -07:00 committed by GitHub
commit c658441a73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/kube-controller-manager/app/apps.go
View File

@ -25,7 +25,6 @@ import (
"net/http" "net/http"
"time" "time"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/util/flowcontrol" "k8s.io/client-go/util/flowcontrol"
"k8s.io/kubernetes/pkg/controller/daemon" "k8s.io/kubernetes/pkg/controller/daemon"
"k8s.io/kubernetes/pkg/controller/deployment" "k8s.io/kubernetes/pkg/controller/deployment"
@ -34,9 +33,6 @@ import (
) )
func startDaemonSetController(ctx ControllerContext) (http.Handler, bool, error) { 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( dsc, err := daemon.NewDaemonSetsController(
ctx.InformerFactory.Apps().V1().DaemonSets(), ctx.InformerFactory.Apps().V1().DaemonSets(),
ctx.InformerFactory.Apps().V1().ControllerRevisions(), 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) { 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( go statefulset.NewStatefulSetController(
ctx.InformerFactory.Core().V1().Pods(), ctx.InformerFactory.Core().V1().Pods(),
ctx.InformerFactory.Apps().V1().StatefulSets(), 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) { 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( go replicaset.NewReplicaSetController(
ctx.InformerFactory.Apps().V1().ReplicaSets(), ctx.InformerFactory.Apps().V1().ReplicaSets(),
ctx.InformerFactory.Core().V1().Pods(), 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) { 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( dc, err := deployment.NewDeploymentController(
ctx.InformerFactory.Apps().V1().Deployments(), ctx.InformerFactory.Apps().V1().Deployments(),
ctx.InformerFactory.Apps().V1().ReplicaSets(), ctx.InformerFactory.Apps().V1().ReplicaSets(),

7
cmd/kube-controller-manager/app/batch.go
View File

@ -24,7 +24,6 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"k8s.io/apimachinery/pkg/runtime/schema"
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/kubernetes/pkg/controller/cronjob" "k8s.io/kubernetes/pkg/controller/cronjob"
"k8s.io/kubernetes/pkg/controller/job" "k8s.io/kubernetes/pkg/controller/job"
@ -32,9 +31,6 @@ import (
) )
func startJobController(ctx ControllerContext) (http.Handler, bool, error) { 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( go job.NewController(
ctx.InformerFactory.Core().V1().Pods(), ctx.InformerFactory.Core().V1().Pods(),
ctx.InformerFactory.Batch().V1().Jobs(), 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) { 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) { if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.CronJobControllerV2) {
cj2c, err := cronjob.NewControllerV2(ctx.InformerFactory.Batch().V1().Jobs(), cj2c, err := cronjob.NewControllerV2(ctx.InformerFactory.Batch().V1().Jobs(),
ctx.InformerFactory.Batch().V1().CronJobs(), ctx.InformerFactory.Batch().V1().CronJobs(),

12
cmd/kube-controller-manager/app/certificates.go
View File

@ -24,7 +24,6 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/controller/certificates/approver" "k8s.io/kubernetes/pkg/controller/certificates/approver"
"k8s.io/kubernetes/pkg/controller/certificates/cleaner" "k8s.io/kubernetes/pkg/controller/certificates/cleaner"
@ -34,11 +33,6 @@ import (
) )
func startCSRSigningController(ctx ControllerContext) (http.Handler, bool, error) { 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 == "" missingSingleSigningFile := ctx.ComponentConfig.CSRSigningController.ClusterSigningCertFile == "" || ctx.ComponentConfig.CSRSigningController.ClusterSigningKeyFile == ""
if missingSingleSigningFile && !anySpecificFilesSet(ctx.ComponentConfig.CSRSigningController) { if missingSingleSigningFile && !anySpecificFilesSet(ctx.ComponentConfig.CSRSigningController) {
klog.V(2).Info("skipping CSR signer controller because no csr cert/key was specified") 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) { 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( approver := approver.NewCSRApprovingController(
ctx.ClientBuilder.ClientOrDie("certificate-controller"), ctx.ClientBuilder.ClientOrDie("certificate-controller"),
ctx.InformerFactory.Certificates().V1().CertificateSigningRequests(), ctx.InformerFactory.Certificates().V1().CertificateSigningRequests(),