From d56dff68df68407e2db30aca09a5a1abe4c5949e Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 27 Sep 2018 23:46:30 -0700 Subject: [PATCH 1/3] 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_ From a85e51336c346b54770703f2a41ffffc0b7e38a2 Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Fri, 28 Sep 2018 18:21:35 -0700 Subject: [PATCH 2/3] removing draft flag for air gap --- .../config-rancher-for-private-reg/_index.md | 1 - .../air-gap-installation/install-rancher/_index.md | 3 +++ .../air-gap-installation/prepare-private-reg/_index.md | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/content/rancher/v2.x/en/installation/air-gap-installation/config-rancher-for-private-reg/_index.md b/content/rancher/v2.x/en/installation/air-gap-installation/config-rancher-for-private-reg/_index.md index 4084d537d00..2286ff0a088 100644 --- a/content/rancher/v2.x/en/installation/air-gap-installation/config-rancher-for-private-reg/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-installation/config-rancher-for-private-reg/_index.md @@ -1,7 +1,6 @@ --- title: 3—Configuring Rancher for the Private Registry weight: 75 -draft: true --- Rancher needs to be configured to use the private registry as source for the needed images. diff --git a/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md b/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md index 3578650b56e..83abb50a520 100644 --- a/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md @@ -1,7 +1,10 @@ --- title: 2—Installing Rancher weight: 50 +<<<<<<< HEAD draft: true +======= +>>>>>>> removing draft flag for air gap --- After your private registry is setup for your Rancher installation, complete that installation. Follow one of the procedures below based on the configuration in which you want to run Rancher. diff --git a/content/rancher/v2.x/en/installation/air-gap-installation/prepare-private-reg/_index.md b/content/rancher/v2.x/en/installation/air-gap-installation/prepare-private-reg/_index.md index b86f31d5150..d6068cec1ee 100644 --- a/content/rancher/v2.x/en/installation/air-gap-installation/prepare-private-reg/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-installation/prepare-private-reg/_index.md @@ -1,7 +1,6 @@ --- title: 1—Preparing the Private Registry weight: 25 -draft: true --- For the first part of your air gap install, you'll prepare your private registry for Rancher installation by downloading the Rancher release files, and then pushing them to your private registry. From 45890175edb7a9bb386e2e8a24c75b57d390563d Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Mon, 1 Oct 2018 10:39:52 -0700 Subject: [PATCH 3/3] fixing conflict --- .../air-gap-installation/install-rancher/_index.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md b/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md index 83abb50a520..cb94327ada6 100644 --- a/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md +++ b/content/rancher/v2.x/en/installation/air-gap-installation/install-rancher/_index.md @@ -1,10 +1,6 @@ --- title: 2—Installing Rancher weight: 50 -<<<<<<< HEAD -draft: true -======= ->>>>>>> removing draft flag for air gap --- After your private registry is setup for your Rancher installation, complete that installation. Follow one of the procedures below based on the configuration in which you want to run Rancher.