github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 09:52:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #112833 from andrewsykim/revert-112821-avoid-tainting-with-noschedule-when-cloud-providers-are-disabled

Browse Source 
Revert "Avoid tainting with NoSchedule when DisableCloudProviders feature is on"
This commit is contained in:
Kubernetes Prow Robot 2022-10-03 23:04:14 -07:00 committed by GitHub
commit ff4e517add
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/kubelet_node_status.go
View File

@ -32,14 +32,12 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
utilfeature "k8s.io/apiserver/pkg/util/feature"
cloudprovider "k8s.io/cloud-provider"
cloudproviderapi "k8s.io/cloud-provider/api"
nodeutil "k8s.io/component-helpers/node/util"
"k8s.io/klog/v2"
kubeletapis "k8s.io/kubelet/pkg/apis"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/kubelet/events"
"k8s.io/kubernetes/pkg/kubelet/nodestatus"
"k8s.io/kubernetes/pkg/kubelet/util"
@ -330,13 +328,7 @@ func (kl *Kubelet) initialNode(ctx context.Context) (*v1.Node, error) {
Effect: v1.TaintEffectNoSchedule,
}
// Disable functionality in kubelet related to the `--cloud-provider` component flag.
if !utilfeature.DefaultFeatureGate.Enabled(features.DisableCloudProviders) {
klog.InfoS("feature DisableCloudProviders is on, disabling taint",
"taint", cloudproviderapi.TaintExternalCloudProvider,
"effect", v1.TaintEffectNoSchedule)
nodeTaints = append(nodeTaints, taint)
}
nodeTaints = append(nodeTaints, taint)
}
if len(nodeTaints) > 0 {
node.Spec.Taints = nodeTaints