From e3ce36d0b73a5482a25e7c04cc3d1adb1244b0a0 Mon Sep 17 00:00:00 2001 From: Catherine Luse Date: Tue, 4 May 2021 15:00:50 -0700 Subject: [PATCH] Fix formatting for air gap docs --- .../upgrades/air-gap-upgrade/_index.md | 34 +++++++++---------- .../air-gap/install-rancher/_index.md | 2 +- .../resources/feature-flags/_index.md | 10 +++--- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/content/rancher/v2.5/en/installation/install-rancher-on-k8s/upgrades/air-gap-upgrade/_index.md b/content/rancher/v2.5/en/installation/install-rancher-on-k8s/upgrades/air-gap-upgrade/_index.md index ea0fe3ad61f..ce0ae4f4838 100644 --- a/content/rancher/v2.5/en/installation/install-rancher-on-k8s/upgrades/air-gap-upgrade/_index.md +++ b/content/rancher/v2.5/en/installation/install-rancher-on-k8s/upgrades/air-gap-upgrade/_index.md @@ -64,29 +64,29 @@ helm template ./rancher-.tgz --output-dir . \ ```plain helm template ./rancher-.tgz --output-dir . \ ---name rancher \ ---no-hooks \ # prevent files for Helm hooks from being generated ---namespace cattle-system \ ---set hostname= \ ---set rancherImage=/rancher/rancher \ ---set ingress.tls.source=secret \ ---set systemDefaultRegistry= \ # Set a default private registry to be used in Rancher ---set useBundledSystemChart=true # Use the packaged Rancher system charts + --name rancher \ + --no-hooks \ # prevent files for Helm hooks from being generated + --namespace cattle-system \ + --set hostname= \ + --set rancherImage=/rancher/rancher \ + --set ingress.tls.source=secret \ + --set systemDefaultRegistry= \ # Set a default private registry to be used in Rancher + --set useBundledSystemChart=true # Use the packaged Rancher system charts ``` If you are using a Private CA signed cert, add `--set privateCA=true` following `--set ingress.tls.source=secret`: ```plain helm template ./rancher-.tgz --output-dir . \ ---name rancher \ ---no-hooks \ # prevent files for Helm hooks from being generated ---namespace cattle-system \ ---set hostname= \ ---set rancherImage=/rancher/rancher \ ---set ingress.tls.source=secret \ ---set privateCA=true \ ---set systemDefaultRegistry= \ # Set a default private registry to be used in Rancher ---set useBundledSystemChart=true # Use the packaged Rancher system charts + --name rancher \ + --no-hooks \ # prevent files for Helm hooks from being generated + --namespace cattle-system \ + --set hostname= \ + --set rancherImage=/rancher/rancher \ + --set ingress.tls.source=secret \ + --set privateCA=true \ + --set systemDefaultRegistry= \ # Set a default private registry to be used in Rancher + --set useBundledSystemChart=true # Use the packaged Rancher system charts ``` {{% /tab %}} diff --git a/content/rancher/v2.5/en/installation/other-installation-methods/air-gap/install-rancher/_index.md b/content/rancher/v2.5/en/installation/other-installation-methods/air-gap/install-rancher/_index.md index de768a16285..dda9e56d1ea 100644 --- a/content/rancher/v2.5/en/installation/other-installation-methods/air-gap/install-rancher/_index.md +++ b/content/rancher/v2.5/en/installation/other-installation-methods/air-gap/install-rancher/_index.md @@ -191,7 +191,7 @@ Render the Rancher template, declaring your chosen options. Use the reference ta ```plain helm template rancher ./rancher-.tgz --output-dir . \ - --no-hooks \ # prevent files for Helm hooks from being generated + --no-hooks \ # prevent files for Helm hooks from being generated --namespace cattle-system \ --set hostname= \ --set rancherImage=/rancher/rancher \ diff --git a/content/rancher/v2.5/en/installation/resources/feature-flags/_index.md b/content/rancher/v2.5/en/installation/resources/feature-flags/_index.md index 4a4e422ddba..72509798b96 100644 --- a/content/rancher/v2.5/en/installation/resources/feature-flags/_index.md +++ b/content/rancher/v2.5/en/installation/resources/feature-flags/_index.md @@ -51,10 +51,10 @@ The below table shows the availability and default value for feature flags in Ra When you install Rancher, enable the feature you want with a feature flag. The command is different depending on whether you are installing Rancher on a single node or if you are doing a Kubernetes Installation of Rancher. +### Enabling Features for Kubernetes Installs + > **Note:** Values set from the Rancher API will override the value passed in through the command line. -{{% tabs %}} -{{% tab "Kubernetes Install" %}} When installing Rancher with a Helm chart, use the `--features` option. In the below example, two features are enabled by passing the feature flag names names in a comma separated list: ``` @@ -123,8 +123,8 @@ helm template ./rancher-.tgz --output-dir . \ --set 'extraEnv[0].value==true,=true' ``` -{{% /tab %}} -{{% tab "Docker Install" %}} +### Enabling Features for Docker Installs + When installing Rancher with Docker, use the `--features` option. In the below example, two features are enabled by passing the feature flag names in a comma separated list: ``` @@ -134,8 +134,6 @@ docker run -d -p 80:80 -p 443:443 \ --features==true,=true ``` -{{% /tab %}} -{{% /tabs %}} # Enabling Features with the Rancher UI