Skip to content

Commit 4ff2390

Browse files
committed
Fix a warning message about the gce in-tree cloud provider state
1 parent de521a9 commit 4ff2390

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

pkg/features/kube_features.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ const (
221221
// owner: @andrewsykim
222222
// alpha: v1.23
223223
// beta: v1.29
224+
// GA: v1.31
224225
//
225226
// Disable in-tree functionality in kubelet to authenticate to cloud provider container registries for image pull credentials.
226227
DisableKubeletCloudCredentialProviders featuregate.Feature = "DisableKubeletCloudCredentialProviders"

staging/src/k8s.io/cloud-provider/plugins.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var (
4040
external bool
4141
detail string
4242
}{
43-
{"gce", false, "The GCE provider is deprecated and will be removed in a future release. Please use https://github.com/kubernetes/cloud-provider-gcp"},
43+
{"gce", true, "The GCE built-in cloud provider was removed. Please use https://github.com/kubernetes/cloud-provider-gcp"},
4444
}
4545
)
4646

staging/src/k8s.io/cloud-provider/sample/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Begin with 1.20, all cloud providers should not copy over or vendor in `k8s.io/k
1111
1. Have your external repo under k8s.io. e.g. `k8s.io/cloud-provider-<provider>`
1212
2. Create `main.go` file under your external repo CCM directory. Please refer to `basic_main.go` for a minimum working sample.
1313
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.
14-
3. Build/release CCM from your external repo. For existing cloud providers, the option to import legacy providers from `k8s.io/legacy-cloud-provider/<provider>` is still available.
14+
3. Build/release CCM from your external repo. For existing cloud providers, the option to import legacy providers from `k8s.io/legacy-cloud-provider/<provider>` is still available until 1.31.
1515

1616
## Things you should NOT do
1717

0 commit comments

Comments
 (0)