From d56dff68df68407e2db30aca09a5a1abe4c5949e Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 27 Sep 2018 23:46:30 -0700 Subject: [PATCH] undrafting 2.1 content --- .../rancher/v2.x/en/admin-settings/authentication/_index.md | 3 +-- .../v2.x/en/admin-settings/authentication/keycloak/_index.md | 3 +-- .../projects-and-namespaces/resource-quotas/_index.md | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/content/rancher/v2.x/en/admin-settings/authentication/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/_index.md index 75c82991e9b..57a51437204 100644 --- a/content/rancher/v2.x/en/admin-settings/authentication/_index.md +++ b/content/rancher/v2.x/en/admin-settings/authentication/_index.md @@ -25,8 +25,7 @@ The Rancher authentication proxy integrates with the following external authenti | [OpenLDAP]({{< baseurl >}}/rancher/v2.x/en/admin-settings/authentication/openldap/) | v2.0.5 | | [Microsoft AD FS]({{< baseurl >}}rancher/v2.x/en/admin-settings/authentication/microsoft-adfs/) | v2.0.7 | | [PingIdentity]({{< baseurl >}}/rancher/v2.x/en/admin-settings/authentication/ping-federate/) | v2.0.7 | - - +| [Keycloak]({{< baseurl >}}/rancher/v2.x/en/admin-settings/authentication/keycloak/) | v2.1.0 |
However, Rancher also provides local authentication. diff --git a/content/rancher/v2.x/en/admin-settings/authentication/keycloak/_index.md b/content/rancher/v2.x/en/admin-settings/authentication/keycloak/_index.md index 4b5817939ae..ce13650ccfe 100644 --- a/content/rancher/v2.x/en/admin-settings/authentication/keycloak/_index.md +++ b/content/rancher/v2.x/en/admin-settings/authentication/keycloak/_index.md @@ -1,9 +1,8 @@ --- title: Configuring KeyCloak (SAML) weight: 1200 -draft: true --- -_Available as of v2.0.1_ +_Available as of v2.1.0_ If your organization uses KeyCloak Identity Provider (IdP) for user authentication, you can configure Rancher to allow your users to log in using their IdP credentials. diff --git a/content/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/resource-quotas/_index.md b/content/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/resource-quotas/_index.md index e52816e8a94..d07cd9c68a6 100644 --- a/content/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/resource-quotas/_index.md +++ b/content/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/resource-quotas/_index.md @@ -1,7 +1,6 @@ --- title: Resource Quotas weight: 5000 -draft: true --- _Available as of v2.1.0_