diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index b0dd04ee1e4..bae2cdf4b63 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -221,6 +221,7 @@ const ( // owner: @andrewsykim // alpha: v1.23 // beta: v1.29 + // GA: v1.31 // // Disable in-tree functionality in kubelet to authenticate to cloud provider container registries for image pull credentials. DisableKubeletCloudCredentialProviders featuregate.Feature = "DisableKubeletCloudCredentialProviders" diff --git a/staging/src/k8s.io/cloud-provider/plugins.go b/staging/src/k8s.io/cloud-provider/plugins.go index 0e8b9357261..a3b8d47da83 100644 --- a/staging/src/k8s.io/cloud-provider/plugins.go +++ b/staging/src/k8s.io/cloud-provider/plugins.go @@ -40,7 +40,7 @@ var ( external bool detail string }{ - {"gce", false, "The GCE provider is deprecated and will be removed in a future release. Please use https://github.com/kubernetes/cloud-provider-gcp"}, + {"gce", true, "The GCE built-in cloud provider was removed. Please use https://github.com/kubernetes/cloud-provider-gcp"}, } ) diff --git a/staging/src/k8s.io/cloud-provider/sample/README.md b/staging/src/k8s.io/cloud-provider/sample/README.md index 369ee82ba55..826c069f8b9 100644 --- a/staging/src/k8s.io/cloud-provider/sample/README.md +++ b/staging/src/k8s.io/cloud-provider/sample/README.md @@ -11,7 +11,7 @@ Begin with 1.20, all cloud providers should not copy over or vendor in `k8s.io/k 1. Have your external repo under k8s.io. e.g. `k8s.io/cloud-provider-` 2. Create `main.go` file under your external repo CCM directory. Please refer to `basic_main.go` for a minimum working sample. Note: If you have a requirement of adding/deleting controllers within CCM, please refer to `k8s.io/kubernetes/cmd/cloud-controller-manager/main.go` for extra details. -3. Build/release CCM from your external repo. For existing cloud providers, the option to import legacy providers from `k8s.io/legacy-cloud-provider/` is still available. +3. Build/release CCM from your external repo. For existing cloud providers, the option to import legacy providers from `k8s.io/legacy-cloud-provider/` is still available until 1.31. ## Things you should NOT do