kubelet: clean up cloud provider code because cloud provider only supports empty or external and cloud is nil by carlory · Pull Request #130161 · kubernetes/kubernetes

carlory · 2025-02-14T10:23:56Z

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

A follow-up of #124519

the --cloud-provider flag of kubelet only supports empty or external, and cloud is nil

Which issue(s) this PR fixes:

Related to kubernetes/enhancements#2395

Special notes for your reviewer:

Does this PR introduce a user-facing change?

ACTION REQUIRED:
kubelet:  removed the deprecated flag `--cloud-config` from the command line.

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

- [KEP]: https://github.com/kubernetes/enhancements/issues/2395

carlory · 2025-02-14T10:24:19Z

/cc @dims @elmiko

bart0sh · 2025-02-17T09:32:04Z

/triage accepted

elmiko

it looks like this is removing the --cloud-provider flag, how will we know to set the kubelet into external provider mode?

carlory · 2025-02-26T15:17:34Z

@elmiko it only remove the --cloud-config flag, not remove others. I only change the description of those flags.

elmiko · 2025-02-26T16:33:39Z

ah! thank you @carlory , i misread the commit diff.

carlory · 2025-02-27T03:17:34Z

/test pull-kubernetes-cmd

elmiko

i think this is making more sense to me now, i would like to have someone with more experience on the network parts review as well.

also, i have one minor suggestion for the updated flag help text.

elmiko

/lgtm

would like to get another review, especially for the networking related changes.

dims · 2025-05-15T12:41:50Z

@carlory do ping me after the sig-node folks take a shot at it please

carlory · 2025-05-16T01:52:05Z

/cc @tallclair @klueska

Can you have a look?

SergeyKanzhelev

/lgtm
/approve

carlory · 2025-05-17T02:27:29Z

/cc @dims

dims · 2025-05-17T12:15:05Z

/lgtm
/approve

thanks @carlory

k8s-ci-robot · 2025-05-17T12:15:18Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: carlory, dims, SergeyKanzhelev

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~cmd/kubelet/OWNERS~~ [SergeyKanzhelev,dims]
~~pkg/kubelet/OWNERS~~ [SergeyKanzhelev,dims]
~~pkg/kubemark/OWNERS~~ [dims]
~~staging/src/k8s.io/cloud-provider/OWNERS~~ [dims]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-triage-robot · 2025-05-17T15:38:35Z

The Kubernetes project has merge-blocking tests that are currently too flaky to consistently pass.

This bot retests PRs for certain kubernetes repos according to the following rules:

The PR does have any do-not-merge/* labels
The PR does not have the needs-ok-to-test label
The PR is mergeable (does not have a needs-rebase label)
The PR is approved (has cncf-cla: yes, lgtm, approved labels)
The PR is failing tests required for merge

You can:

Review the full test history for this PR
Prevent this bot from retesting with /lgtm cancel or /hold
Help make our tests less flaky by following our Flaky Tests Guide

/retest

k8s-triage-robot · 2025-05-17T19:25:36Z

The Kubernetes project has merge-blocking tests that are currently too flaky to consistently pass.

This bot retests PRs for certain kubernetes repos according to the following rules:

The PR does have any do-not-merge/* labels
The PR does not have the needs-ok-to-test label
The PR is mergeable (does not have a needs-rebase label)
The PR is approved (has cncf-cla: yes, lgtm, approved labels)
The PR is failing tests required for merge

You can:

Review the full test history for this PR
Prevent this bot from retesting with /lgtm cancel or /hold
Help make our tests less flaky by following our Flaky Tests Guide

/retest

pohly · 2025-05-19T07:16:15Z

 	fs.MarkDeprecated("register-schedulable", "will be removed in a future version")
 	fs.StringVar(&f.ExperimentalMounterPath, "experimental-mounter-path", f.ExperimentalMounterPath, "[Experimental] Path of mounter binary. Leave empty to use the default mount.")
 	fs.MarkDeprecated("experimental-mounter-path", "will be removed in 1.25 or later. in favor of using CSI.")
-	fs.StringVar(&f.CloudConfigFile, "cloud-config", f.CloudConfigFile, "The path to the cloud provider configuration file. Empty string for no configuration file.")


In addition to warning in the release notes, please also check for usage in-tree. hack/local-up-cluster.sh still uses it and now fails.

Sorry for that.

Ref: kubernetes/kubernetes#130161 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

kubernetes/kubernetes#130161

* feat: Allow instantiating v1.34 Kubernetes clients * docs: Update supported Kubernetes versions in docs * docs: align docs with usage * feat: Maintain feature gates for v1.34 ./hack/compare-k8s-feature-gates.sh 1.33 1.34 Feature gates added in 1.34 compared to 1.33: ClearingNominatedNodeNameAfterBinding ContainerRestartRules DRAConsumableCapacity DRADeviceBindingConditions DRAExtendedResource DRASchedulerFilterTimeout DetectCacheInconsistency EnvFiles HostnameOverride InPlacePodVerticalScalingExclusiveMemory KubeletPodResourcesListUseActivePods MatchLabelKeysInPodTopologySpreadSelectorMerge NominatedNodeNameForExpectation PodCertificateRequest PreventStaticPodAPIReferences ProbeHostPodSecurityStandards RelaxedServiceNameValidation SchedulerAsyncAPICalls SizeBasedListCostEstimate StructuredAuthenticationConfigurationEgressSelector TokenRequestServiceAccountUIDValidation Feature gates removed in 1.34 compared to 1.33: DevicePluginCDIDevices ElasticIndexedJob LegacySidecarContainers PodDisruptionConditions StatefulSetStartOrdinal Feature gates locked to default true in 1.34 compared to 1.33: AnonymousAuthConfigurableEndpoints APIServerTracing AuthorizeNodeWithSelectors AuthorizeWithSelectors ConsistentListFromCache JobPodReplacementPolicy KubeletCgroupDriverFromCRI KubeletTracing MultiCIDRServiceAllocator NodeSwap OrderedNamespaceDeletion PodLifecycleSleepAction PodLifecycleSleepActionAllowZero ProbeHostPodSecurityStandards RecoverVolumeExpansionFailure RelaxedDNSSearchValidation RelaxedEnvironmentVariableValidation ResilientWatchCacheInitialization SchedulerQueueingHints SeparateTaintEvictionController StreamingCollectionEncodingToJSON StreamingCollectionEncodingToProtobuf StructuredAuthenticationConfiguration WinDSR WinOverlay Feature gates locked to default false in 1.34 compared to 1.33: * feat: Maintain kube-apiserver admission plugins for 1.34 ./hack/compare-k8s-admission-plugins.sh 1.33 1.34 Admission plugins added in 1.34 compared to 1.33: Admission plugins removed in 1.34 compared to 1.33: * feat: Maintain apigroups for 1.34 ./hack/compare-k8s-api-groups.sh 1.33 1.34 Kubernetes API group versions added in 1.34 compared to 1.33: resource.k8s.io/v1 Kubernetes API GVRs added in 1.34 compared to 1.33: admissionregistration.k8s.io/v1beta1/mutatingadmissionpolicies admissionregistration.k8s.io/v1beta1/mutatingadmissionpolicybindings certificates.k8s.io/v1alpha1/podcertificaterequests resource.k8s.io/v1/deviceclasses resource.k8s.io/v1/resourceclaims resource.k8s.io/v1/resourceclaimtemplates resource.k8s.io/v1/resourceslices storage.k8s.io/v1/volumeattributesclasses Kubernetes API group versions removed in 1.34 compared to 1.33: networking.k8s.io/v1alpha1 Kubernetes API GVRs removed in 1.34 compared to 1.33: networking.k8s.io/v1alpha1/ipaddresses networking.k8s.io/v1alpha1/servicecidrs resource.k8s.io/v1alpha3/deviceclasses resource.k8s.io/v1alpha3/resourceclaims resource.k8s.io/v1alpha3/resourceclaimtemplates resource.k8s.io/v1alpha3/resourceslices * feat: Maintain kubernetes-controller-manager controller mappings kube-controller-manager controllers added in 1.34 compared to 1.33: Added Controllers for API Group [certificates/v1alpha1]: podcertificaterequest-cleaner-controller Added Controllers for API Group [resource/v1]: device-taint-eviction-controller resourceclaim-controller Added Controllers for API Group [storage/v1]: volumeattributesclass-protection-controller kube-controller-manager controllers removed in 1.34 compared to 1.33: Removed Controllers for API Group [resource/v1beta1]: device-taint-eviction-controller resourceclaim-controller Removed Controllers for API Group [storage/v1beta1]: volumeattributesclass-protection-controller * feat: Maintain unneeded controllers for workerless Shoots for Kubernetes 1.34 * chore: Update DaemonSet controller comments * chore: Add Kubernetes v1.34.0 to provider-local cloud profile * chore: Bump kindest/node version to 1.34.0 * chore: Change example Shoot to refer CredentialsBinding * Set `trafficDistribution` to `PreferSameZone` for kubernetes versions `>= 1.34` * Adapt charts to new `trafficDistribution` value * Adapt tests to new `trafficDistribution` value * Update TopologyAwareRouting documentation * Address linting findings * Use `PreferClose` for ETCD's clientService trafficDistribution * --- SEPARATOR --- * Align `node-problem-detector` images Co-authored-by: Ismail Alidzhikov <9372594+ialidzhikov@users.noreply.github.com> * Adapt to new labels for metrics kubernetes/kubernetes#130161 * Enable `discovery.k8s.io/v1` API for workerless `Shoot`s Without it, the `kube-apiserver` does not start, because the `EndpointSlice` informers do not sync. * Fix wording / typo Co-authored-by: Marc Vornetran <marc1404@users.noreply.github.com> --------- Co-authored-by: Ismail Alidzhikov <9372594+ialidzhikov@users.noreply.github.com> Co-authored-by: Marc Vornetran <marc1404@users.noreply.github.com>

k8s-ci-robot added area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. labels Feb 14, 2025

k8s-ci-robot requested review from dims and elmiko February 14, 2025 10:24

k8s-ci-robot removed the do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. label Feb 14, 2025

k8s-ci-robot requested a review from ffromani February 14, 2025 10:24

carlory force-pushed the kep-2395-kubelet-cleanup branch from e6ba9e7 to a1fe8fe Compare February 14, 2025 10:30

k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Feb 14, 2025

hashim21223445 approved these changes Feb 14, 2025

View reviewed changes

carlory force-pushed the kep-2395-kubelet-cleanup branch from a1fe8fe to 66000d8 Compare February 17, 2025 03:37

k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Feb 17, 2025

elmiko reviewed Feb 26, 2025

View reviewed changes

elmiko reviewed Feb 27, 2025

View reviewed changes

Comment thread cmd/kubelet/app/options/options.go

carlory force-pushed the kep-2395-kubelet-cleanup branch from 66000d8 to e62734c Compare February 28, 2025 06:31

elmiko reviewed Feb 28, 2025

View reviewed changes

k8s-ci-robot assigned wojtek-t May 14, 2025

k8s-ci-robot requested review from klueska and tallclair May 16, 2025 01:52

SergeyKanzhelev approved these changes May 16, 2025

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 17, 2025

k8s-ci-robot merged commit 2125fd6 into kubernetes:master May 17, 2025
16 checks passed

k8s-ci-robot added this to the v1.34 milestone May 17, 2025

github-project-automation Bot moved this from Needs Reviewer to Done in SIG Node: code and documentation PRs May 17, 2025

carlory deleted the kep-2395-kubelet-cleanup branch May 18, 2025 07:10

pohly reviewed May 19, 2025

View reviewed changes

pohly mentioned this pull request May 19, 2025

hack/local-up-cluster.sh: remove kubelet --cloud-config #131841

Merged

This was referenced May 20, 2025

[Failing test] [sig-k8s-infra] [sig-scalability] ci-kubernetes-e2e-kops-aws-scale-amazonvpc-using-cl2.Overall #130849

Closed

Remove cloud-config and cloud-provider from 1.33 kubelet kubernetes/kops#17412

Merged

brandond added a commit to brandond/rke2 that referenced this pull request Sep 12, 2025

Remove cloud-config arg from kubelet

e4474eb

Ref: kubernetes/kubernetes#130161 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

brandond added a commit to brandond/rke2 that referenced this pull request Sep 12, 2025

Remove cloud-config arg from kubelet

e48e5b8

Ref: kubernetes/kubernetes#130161 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

This was referenced Sep 12, 2025

Remove cloud-config arg from kubelet rancher/rke2#8926

Merged

[release-1.34] Remove cloud-config arg from kubelet rancher/rke2#8927

Merged

brandond added a commit to rancher/rke2 that referenced this pull request Sep 12, 2025

Remove cloud-config arg from kubelet

42c409b

Ref: kubernetes/kubernetes#130161 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

brandond added a commit to rancher/rke2 that referenced this pull request Sep 12, 2025

Remove cloud-config arg from kubelet

1ee9821

Ref: kubernetes/kubernetes#130161 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

tobschli added a commit to tobschli/gardener that referenced this pull request Oct 27, 2025

Adapt to new labels for metrics

92cabc3

kubernetes/kubernetes#130161

tobschli added a commit to tobschli/gardener that referenced this pull request Oct 30, 2025

Adapt to new labels for metrics

d8a83a7

kubernetes/kubernetes#130161

Conversation

carlory commented Feb 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

Uh oh!

carlory commented Feb 14, 2025

Uh oh!

bart0sh commented Feb 17, 2025

Uh oh!

elmiko left a comment

Choose a reason for hiding this comment

Uh oh!

carlory commented Feb 26, 2025

Uh oh!

elmiko commented Feb 26, 2025

Uh oh!

carlory commented Feb 27, 2025

Uh oh!

elmiko left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

elmiko left a comment

Choose a reason for hiding this comment

Uh oh!

dims commented May 15, 2025

Uh oh!

carlory commented May 16, 2025

Uh oh!

SergeyKanzhelev left a comment

Choose a reason for hiding this comment

Uh oh!

carlory commented May 17, 2025

Uh oh!

dims commented May 17, 2025

Uh oh!

k8s-ci-robot commented May 17, 2025

Uh oh!

k8s-triage-robot commented May 17, 2025

Uh oh!

k8s-triage-robot commented May 17, 2025

Uh oh!

Uh oh!

pohly May 19, 2025

Choose a reason for hiding this comment

Uh oh!

pohly May 19, 2025

Choose a reason for hiding this comment

Uh oh!

carlory May 19, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

carlory commented Feb 14, 2025 •

edited

Loading