From 6029cc3adfe1681f9adf5506efd96e508617683b Mon Sep 17 00:00:00 2001 From: Andrew Sy Kim Date: Tue, 29 May 2018 18:03:53 -0400 Subject: [PATCH] Update cloud controller manager docs to beta 1.11 (#8756) * Update cloud controller manager docs to beta 1.11 * Use Hugo shortcode for feature state --- .../administer-cluster/developing-cloud-controller-manager.md | 3 ++- .../docs/tasks/administer-cluster/running-cloud-controller.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/content/en/docs/tasks/administer-cluster/developing-cloud-controller-manager.md b/content/en/docs/tasks/administer-cluster/developing-cloud-controller-manager.md index 9168b8b1386f2..11659900734c6 100644 --- a/content/en/docs/tasks/administer-cluster/developing-cloud-controller-manager.md +++ b/content/en/docs/tasks/administer-cluster/developing-cloud-controller-manager.md @@ -6,7 +6,8 @@ reviewers: title: Developing Cloud Controller Manager --- -**Cloud Controller Manager is an alpha feature in 1.8. In upcoming releases it will +{{< feature-state for_k8s_version="v1.11" state="beta" >}} +In upcoming releases, Cloud Controller Manager will be the preferred way to integrate Kubernetes with any cloud. This will ensure cloud providers can develop their features independently from the core Kubernetes release cycles.** diff --git a/content/en/docs/tasks/administer-cluster/running-cloud-controller.md b/content/en/docs/tasks/administer-cluster/running-cloud-controller.md index f79be347f83a5..868d4b779e337 100644 --- a/content/en/docs/tasks/administer-cluster/running-cloud-controller.md +++ b/content/en/docs/tasks/administer-cluster/running-cloud-controller.md @@ -6,7 +6,7 @@ reviewers: title: Kubernetes Cloud Controller Manager --- -{{< feature-state state="alpha" >}} +{{< feature-state state="beta" >}} {{< toc >}}