From 863f4736d15af973439f650bd7ed6b936c190dc6 Mon Sep 17 00:00:00 2001 From: Catherine Luse Date: Tue, 7 Jul 2020 21:57:42 -0700 Subject: [PATCH] Revert "Move cluster-capabilities-table to a headless bundle and include it as a page instead of reading the file" This reverts commit 0ebb806516b296d8fa0d74b25c928a3229c21330. --- content/rancher/v2.x/en/cluster-admin/_index.md | 2 +- .../cluster-capabilities-table.md | 0 .../rancher/v2.x/en/cluster-admin/editing-clusters/_index.md | 2 +- content/rancher/v2.x/en/cluster-provisioning/_index.md | 2 +- content/rancher/v2.x/en/includes/index.md | 3 --- content/rancher/v2.x/en/overview/_index.md | 2 +- layouts/shortcodes/include.html | 5 ----- 7 files changed, 4 insertions(+), 12 deletions(-) rename content/rancher/v2.x/en/{includes => cluster-admin}/cluster-capabilities-table.md (100%) delete mode 100644 content/rancher/v2.x/en/includes/index.md delete mode 100644 layouts/shortcodes/include.html diff --git a/content/rancher/v2.x/en/cluster-admin/_index.md b/content/rancher/v2.x/en/cluster-admin/_index.md index 9323075c141..fe49bdb7e9c 100644 --- a/content/rancher/v2.x/en/cluster-admin/_index.md +++ b/content/rancher/v2.x/en/cluster-admin/_index.md @@ -23,7 +23,7 @@ Alternatively, you can switch between projects and clusters directly in the navi After clusters have been [provisioned into Rancher]({{}}/rancher/v2.x/en/cluster-provisioning/), [cluster owners]({{}}/rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/#cluster-roles) will need to manage these clusters. There are many different options of how to manage your cluster. -{{% include file="/rancher/v2.x/en/includes/cluster-capabilities-table.md" %}} +{{% readfile file="/rancher/v2.x/en/cluster-admin/cluster-capabilities-table.md" markdown="true" %}} ## Configuring Tools diff --git a/content/rancher/v2.x/en/includes/cluster-capabilities-table.md b/content/rancher/v2.x/en/cluster-admin/cluster-capabilities-table.md similarity index 100% rename from content/rancher/v2.x/en/includes/cluster-capabilities-table.md rename to content/rancher/v2.x/en/cluster-admin/cluster-capabilities-table.md diff --git a/content/rancher/v2.x/en/cluster-admin/editing-clusters/_index.md b/content/rancher/v2.x/en/cluster-admin/editing-clusters/_index.md index b69c578fbd0..1fe6ce09d18 100644 --- a/content/rancher/v2.x/en/cluster-admin/editing-clusters/_index.md +++ b/content/rancher/v2.x/en/cluster-admin/editing-clusters/_index.md @@ -12,7 +12,7 @@ The options and settings available for an existing cluster change based on the m The following table summarizes the options and settings available for each cluster type: -{{% include file="/rancher/v2.x/en/includes/cluster-capabilities-table.md" %}} +{{% readfile file="/rancher/v2.x/en/cluster-admin/cluster-capabilities-table.md" markdown="true" %}} ## Editing Cluster Membership diff --git a/content/rancher/v2.x/en/cluster-provisioning/_index.md b/content/rancher/v2.x/en/cluster-provisioning/_index.md index 1c9485b0495..652194b518b 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/_index.md @@ -28,7 +28,7 @@ This section covers the following topics: The following table summarizes the options and settings available for each cluster type: -{{% include file="/rancher/v2.x/en/includes/cluster-capabilities-table.md" %}} +{{% readfile file="/rancher/v2.x/en/cluster-admin/cluster-capabilities-table.md" markdown="true" %}} # Setting up Clusters in a Hosted Kubernetes Provider diff --git a/content/rancher/v2.x/en/includes/index.md b/content/rancher/v2.x/en/includes/index.md deleted file mode 100644 index ca03031f1ee..00000000000 --- a/content/rancher/v2.x/en/includes/index.md +++ /dev/null @@ -1,3 +0,0 @@ ---- -headless: true ---- diff --git a/content/rancher/v2.x/en/overview/_index.md b/content/rancher/v2.x/en/overview/_index.md index 2f981c7ec1c..b691f67864a 100644 --- a/content/rancher/v2.x/en/overview/_index.md +++ b/content/rancher/v2.x/en/overview/_index.md @@ -60,4 +60,4 @@ After a cluster is created with Rancher, a cluster administrator can manage clus The following table summarizes the options and settings available for each cluster type: -{{% include file="/rancher/v2.x/en/includes/cluster-capabilities-table.md" %}} +{{% readfile file="/rancher/v2.x/en/cluster-admin/cluster-capabilities-table.md" markdown="true" %}} diff --git a/layouts/shortcodes/include.html b/layouts/shortcodes/include.html deleted file mode 100644 index 0d98507f062..00000000000 --- a/layouts/shortcodes/include.html +++ /dev/null @@ -1,5 +0,0 @@ -{{$file := .Get "file"}} - -{{- with .Site.GetPage $file -}} -{{- .Content | markdownify -}} -{{- end -}}