From 169aadbbe185b6c42c8f2a4e8066548903b72d12 Mon Sep 17 00:00:00 2001 From: Steve Perry Date: Wed, 16 May 2018 12:26:52 -0700 Subject: [PATCH] Arrange the Extending Kubernetes section in the Concepts TOC (#8569) * Left nav for Extending Kubernetes * Redirect moved topics. Remove extraneous directory. --- content/en/docs/concepts/api-extension/_index.md | 5 ----- content/en/docs/concepts/extend-kubernetes/_index.md | 3 +++ .../docs/concepts/extend-kubernetes/api-extension/_index.md | 4 ++++ .../api-extension/apiserver-aggregation.md | 1 + .../api-extension/custom-resources.md | 1 + .../extend-kubernetes/compute-storage-net/_index.md | 4 ++++ .../compute-storage-net}/device-plugins.md | 1 + .../compute-storage-net}/network-plugins.md | 1 + .../extending.md => extend-kubernetes/extend-cluster.md} | 1 + .../concepts/{ => extend-kubernetes}/service-catalog.md | 1 + static/_redirects | 6 ++++++ 11 files changed, 23 insertions(+), 5 deletions(-) delete mode 100755 content/en/docs/concepts/api-extension/_index.md create mode 100644 content/en/docs/concepts/extend-kubernetes/_index.md create mode 100644 content/en/docs/concepts/extend-kubernetes/api-extension/_index.md rename content/en/docs/concepts/{ => extend-kubernetes}/api-extension/apiserver-aggregation.md (99%) rename content/en/docs/concepts/{ => extend-kubernetes}/api-extension/custom-resources.md (99%) create mode 100644 content/en/docs/concepts/extend-kubernetes/compute-storage-net/_index.md rename content/en/docs/concepts/{cluster-administration => extend-kubernetes/compute-storage-net}/device-plugins.md (99%) rename content/en/docs/concepts/{cluster-administration => extend-kubernetes/compute-storage-net}/network-plugins.md (99%) rename content/en/docs/concepts/{overview/extending.md => extend-kubernetes/extend-cluster.md} (99%) rename content/en/docs/concepts/{ => extend-kubernetes}/service-catalog.md (99%) diff --git a/content/en/docs/concepts/api-extension/_index.md b/content/en/docs/concepts/api-extension/_index.md deleted file mode 100755 index f35a33dd70abd..0000000000000 --- a/content/en/docs/concepts/api-extension/_index.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "Extending the Kubernetes API" -weight: 20 ---- - diff --git a/content/en/docs/concepts/extend-kubernetes/_index.md b/content/en/docs/concepts/extend-kubernetes/_index.md new file mode 100644 index 0000000000000..ff1725b269343 --- /dev/null +++ b/content/en/docs/concepts/extend-kubernetes/_index.md @@ -0,0 +1,3 @@ +--- +title: Extending Kubernetes +--- diff --git a/content/en/docs/concepts/extend-kubernetes/api-extension/_index.md b/content/en/docs/concepts/extend-kubernetes/api-extension/_index.md new file mode 100644 index 0000000000000..7e1495887684c --- /dev/null +++ b/content/en/docs/concepts/extend-kubernetes/api-extension/_index.md @@ -0,0 +1,4 @@ +--- +title: Extending the Kubernetes API +weight: 20 +--- diff --git a/content/en/docs/concepts/api-extension/apiserver-aggregation.md b/content/en/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation.md similarity index 99% rename from content/en/docs/concepts/api-extension/apiserver-aggregation.md rename to content/en/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation.md index 1262c2f039bd6..f5b3ab058b09d 100644 --- a/content/en/docs/concepts/api-extension/apiserver-aggregation.md +++ b/content/en/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation.md @@ -5,6 +5,7 @@ reviewers: - cheftako - chenopis content_template: templates/concept +weight: 10 --- {{% capture overview %}} diff --git a/content/en/docs/concepts/api-extension/custom-resources.md b/content/en/docs/concepts/extend-kubernetes/api-extension/custom-resources.md similarity index 99% rename from content/en/docs/concepts/api-extension/custom-resources.md rename to content/en/docs/concepts/extend-kubernetes/api-extension/custom-resources.md index 624fbc83b3532..13cfba4d8b5ce 100644 --- a/content/en/docs/concepts/api-extension/custom-resources.md +++ b/content/en/docs/concepts/extend-kubernetes/api-extension/custom-resources.md @@ -4,6 +4,7 @@ reviewers: - enisoc - deads2k content_template: templates/concept +weight: 20 --- {{% capture overview %}} diff --git a/content/en/docs/concepts/extend-kubernetes/compute-storage-net/_index.md b/content/en/docs/concepts/extend-kubernetes/compute-storage-net/_index.md new file mode 100644 index 0000000000000..fdc031a393cec --- /dev/null +++ b/content/en/docs/concepts/extend-kubernetes/compute-storage-net/_index.md @@ -0,0 +1,4 @@ +--- +title: Compute, Storage, and Networking Extensions +weight: 30 +--- diff --git a/content/en/docs/concepts/cluster-administration/device-plugins.md b/content/en/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins.md similarity index 99% rename from content/en/docs/concepts/cluster-administration/device-plugins.md rename to content/en/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins.md index 4fe3a72ca0801..7d3952f8e95fe 100644 --- a/content/en/docs/concepts/cluster-administration/device-plugins.md +++ b/content/en/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins.md @@ -3,6 +3,7 @@ reviewers: title: Device Plugins description: Use the Kubernetes device plugin framework to implement plugins for GPUs, NICs, FPGAs, InfiniBand, and similar resources that require vendor-specific setup. content_template: templates/concept +weight: 20 --- {{< feature-state state="beta" >}} diff --git a/content/en/docs/concepts/cluster-administration/network-plugins.md b/content/en/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md similarity index 99% rename from content/en/docs/concepts/cluster-administration/network-plugins.md rename to content/en/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md index 1290deacb558e..6d392529c58af 100644 --- a/content/en/docs/concepts/cluster-administration/network-plugins.md +++ b/content/en/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins.md @@ -4,6 +4,7 @@ reviewers: - freehan - thockin title: Network Plugins +weight: 10 --- {{< toc >}} diff --git a/content/en/docs/concepts/overview/extending.md b/content/en/docs/concepts/extend-kubernetes/extend-cluster.md similarity index 99% rename from content/en/docs/concepts/overview/extending.md rename to content/en/docs/concepts/extend-kubernetes/extend-cluster.md index fcb796e9baf1a..ab6f59b743e8e 100644 --- a/content/en/docs/concepts/overview/extending.md +++ b/content/en/docs/concepts/extend-kubernetes/extend-cluster.md @@ -6,6 +6,7 @@ reviewers: - cheftako - chenopis content_template: templates/concept +weight: 10 --- {{% capture overview %}} diff --git a/content/en/docs/concepts/service-catalog.md b/content/en/docs/concepts/extend-kubernetes/service-catalog.md similarity index 99% rename from content/en/docs/concepts/service-catalog.md rename to content/en/docs/concepts/extend-kubernetes/service-catalog.md index a75ad6775bc2b..596d18d4d5256 100644 --- a/content/en/docs/concepts/service-catalog.md +++ b/content/en/docs/concepts/extend-kubernetes/service-catalog.md @@ -3,6 +3,7 @@ title: Service Catalog reviewers: - chenopis content_template: templates/concept +weight: 40 --- {{% capture overview %}} diff --git a/static/_redirects b/static/_redirects index 7b4a8c196feaf..363cede2b7216 100644 --- a/static/_redirects +++ b/static/_redirects @@ -72,17 +72,21 @@ /docs/concepts/abstractions/init-containers/ /docs/concepts/workloads/pods/init-containers/ 301 /docs/concepts/abstractions/overview/ /docs/concepts/overview/working-with-objects/kubernetes-objects/ 301 /docs/concepts/abstractions/pod/ /docs/concepts/workloads/pods/pod-overview/ 301 +/docs/concepts/api-extension/apiserver-aggregation/ /docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/ 301 +/docs/concepts/api-extension/custom-resources/ /docs/concepts/extend-kubernetes/api-extension/custom-resources/ 301 /docs/concepts/cluster/ /docs/concepts/cluster-administration/cluster-administration-overview/ 301 /docs/concepts/cluster-administration/access-cluster/ /docs/tasks/access-application-cluster/access-cluster/ 301 /docs/concepts/cluster-administration/audit/ /docs/tasks/debug-application-cluster/audit/ 301 /docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig /docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig/ 301 /docs/concepts/cluster-administration/cluster-management/ /docs/tasks/administer-cluster/cluster-management/ 301 /docs/concepts/cluster-administration/configure-etcd/ /docs/tasks/administer-cluster/configure-upgrade-etcd/ 301 +/docs/concepts/cluster-administration/device-plugins/ /docs/concepts/extend-kubernetes/compute-storage-net/device-plugins/ 301 /docs/concepts/cluster-administration/etcd-upgrade/ /docs/tasks/administer-cluster/configure-upgrade-etcd/ 301 /docs/concepts/cluster-administration/federation-service-discovery/ /docs/tasks/federation/federation-service-discovery/ 301 /docs/concepts/cluster-administration/guaranteed-scheduling-critical-addon-pods/ /docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/ 301 /docs/concepts/cluster-administration/master-node-communication/ /docs/concepts/architecture/master-node-communication/ 301 /docs/concepts/cluster-administration/multiple-clusters/ /docs/concepts/cluster-administration/federation/ 301 +/docs/concepts/cluster-administration/network-plugins/ /docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/ 301 /docs/concepts/cluster-administration/out-of-resource/ /docs/tasks/administer-cluster/out-of-resource/ 301 /docs/concepts/cluster-administration/resource-usage-monitoring /docs/tasks/debug-application-cluster/resource-usage-monitoring/ 301 /docs/concepts/cluster-administration/sysctl-cluster/ /docs/tasks/administer-cluster/sysctl-cluster/ 301 @@ -96,8 +100,10 @@ /docs/concepts/nodes/node/ /docs/concepts/architecture/nodes/ 301 /docs/concepts/object-metadata/annotations/ /docs/concepts/overview/working-with-objects/annotations/ 301 /docs/concepts/overview/ /docs/concepts/overview/what-is-kubernetes/ 301 +/docs/concepts/overview/extending/ /docs/concepts/extend-kubernetes/extend-cluster/ 301 /docs/concepts/policy/container-capabilities/ /docs/tasks/configure-pod-container/security-context/#set-capabilities-for-a-container/ 301 /docs/concepts/policy/security-context/ /docs/tasks/configure-pod-container/security-context/ 301 +/docs/concepts/service-catalog/ /docs/concepts/extend-kubernetes/service-catalog/ 301 /docs/concepts/services-networking/networkpolicies/ /docs/concepts/services-networking/network-policies/ 301 /docs/concepts/storage/etcd-store-api-object/ /docs/tasks/administer-cluster/configure-upgrade-etcd/ 301 /docs/concepts/storage/volumes/emptyDirapiVersion/ /docs/concepts/storage/volumes/#emptydir/ 301