From f3a85d32b66b34cfc6417a085cc983454c4b3160 Mon Sep 17 00:00:00 2001 From: Andy Clemenko Date: Fri, 21 Apr 2023 09:58:52 -0400 Subject: [PATCH 1/2] Update helm-chart-options.md when the transition to v1.25 disabling the PSP is needed to install. --- .../installation-references/helm-chart-options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md b/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md index 42925aee1c0..4999280f57c 100644 --- a/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md +++ b/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md @@ -57,7 +57,7 @@ For information on enabling experimental features, refer to [this page.](../../. | `systemDefaultRegistry` | "" | `string` - private registry to be used for all system container images, e.g., http://registry.example.com/ | | `tls` | "ingress" | `string` - See [External TLS Termination](#external-tls-termination) for details. - "ingress, external" | | `useBundledSystemChart` | `false` | `bool` - select to use the system-charts packaged with Rancher server. This option is used for air gapped installations. | - +| `global.cattle.psp.enabled` | `true` | `bool` - select 'false' to disable PSP for RKE/RKE2 (K8S) versions `v1.25` and higher. | ### Bootstrap Password From 64049bb062b72b0328a5f47ad84c6010b827dc30 Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Fri, 21 Apr 2023 11:19:29 -0700 Subject: [PATCH 2/2] Update docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md --- .../installation-references/helm-chart-options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md b/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md index 4999280f57c..984aa48c8ef 100644 --- a/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md +++ b/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md @@ -57,7 +57,7 @@ For information on enabling experimental features, refer to [this page.](../../. | `systemDefaultRegistry` | "" | `string` - private registry to be used for all system container images, e.g., http://registry.example.com/ | | `tls` | "ingress" | `string` - See [External TLS Termination](#external-tls-termination) for details. - "ingress, external" | | `useBundledSystemChart` | `false` | `bool` - select to use the system-charts packaged with Rancher server. This option is used for air gapped installations. | -| `global.cattle.psp.enabled` | `true` | `bool` - select 'false' to disable PSP for RKE/RKE2 (K8S) versions `v1.25` and higher. | +| `global.cattle.psp.enabled` | `true` | `bool` - select 'false' to disable PSP for RKE/RKE2 (K8s) versions `v1.25` and higher. | ### Bootstrap Password