diff --git a/cmd/kube-apiserver/app/options/options_test.go b/cmd/kube-apiserver/app/options/options_test.go index 7d7ced66f4a..2e01c0a52cb 100644 --- a/cmd/kube-apiserver/app/options/options_test.go +++ b/cmd/kube-apiserver/app/options/options_test.go @@ -104,8 +104,6 @@ func TestAddFlags(t *testing.T) { "--authorization-webhook-config-file=/webhook-config", "--bind-address=192.168.10.20", "--client-ca-file=/client-ca", - "--cloud-config=/cloud-config", - "--cloud-provider=azure", "--cors-allowed-origins=10.10.10.100,10.10.10.200", "--contention-profiling=true", "--egress-selector-config-file=/var/run/kubernetes/egress-selector/connectivity.yaml", diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 9802b1726e5..1e1d846d135 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -175,16 +175,6 @@ const ( // both allocators. This feature gate disables the dual write on the new Cluster IP allocators. DisableAllocatorDualWrite featuregate.Feature = "DisableAllocatorDualWrite" - // owner: @andrewsykim - // - // Disable any functionality in kube-apiserver, kube-controller-manager and kubelet related to the `--cloud-provider` component flag. - DisableCloudProviders featuregate.Feature = "DisableCloudProviders" - - // owner: @andrewsykim - // - // Disable in-tree functionality in kubelet to authenticate to cloud provider container registries for image pull credentials. - DisableKubeletCloudCredentialProviders featuregate.Feature = "DisableKubeletCloudCredentialProviders" - // owner: @micahhausler // // Setting AllowInsecureKubeletCertificateSigningRequests to true disables node admission validation of CSRs diff --git a/pkg/features/versioned_kube_features.go b/pkg/features/versioned_kube_features.go index 163de6476fa..69b9deebd31 100644 --- a/pkg/features/versioned_kube_features.go +++ b/pkg/features/versioned_kube_features.go @@ -167,18 +167,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate {Version: version.MustParse("1.33"), Default: false, PreRelease: featuregate.Beta}, // remove after MultiCIDRServiceAllocator is GA }, - DisableCloudProviders: { - {Version: version.MustParse("1.22"), Default: false, PreRelease: featuregate.Alpha}, - {Version: version.MustParse("1.29"), Default: true, PreRelease: featuregate.Beta}, - {Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - }, - - DisableKubeletCloudCredentialProviders: { - {Version: version.MustParse("1.23"), Default: false, PreRelease: featuregate.Alpha}, - {Version: version.MustParse("1.29"), Default: true, PreRelease: featuregate.Beta}, - {Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - }, - DisableNodeKubeProxyVersion: { {Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha}, {Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Deprecated}, diff --git a/test/featuregates_linter/test_data/versioned_feature_list.yaml b/test/featuregates_linter/test_data/versioned_feature_list.yaml index 565290d616c..0d8afbd4564 100644 --- a/test/featuregates_linter/test_data/versioned_feature_list.yaml +++ b/test/featuregates_linter/test_data/versioned_feature_list.yaml @@ -406,40 +406,12 @@ lockToDefault: false preRelease: Beta version: "1.33" -- name: DisableCloudProviders - versionedSpecs: - - default: false - lockToDefault: false - preRelease: Alpha - version: "1.22" - - default: true - lockToDefault: false - preRelease: Beta - version: "1.29" - - default: true - lockToDefault: true - preRelease: GA - version: "1.31" - name: DisableCPUQuotaWithExclusiveCPUs versionedSpecs: - default: true lockToDefault: false preRelease: Beta version: "1.33" -- name: DisableKubeletCloudCredentialProviders - versionedSpecs: - - default: false - lockToDefault: false - preRelease: Alpha - version: "1.23" - - default: true - lockToDefault: false - preRelease: Beta - version: "1.29" - - default: true - lockToDefault: true - preRelease: GA - version: "1.31" - name: DisableNodeKubeProxyVersion versionedSpecs: - default: false