From 096fee2c395bcd77b06a0b7186c5828f4b6aa718 Mon Sep 17 00:00:00 2001 From: Steve Perry Date: Mon, 25 Sep 2017 18:43:26 -0700 Subject: [PATCH] Update links to avoid redirects. (#5625) --- _redirects | 1 + .../cluster-administration/kubelet-garbage-collection.md | 2 +- docs/concepts/cluster-administration/manage-deployment.md | 2 +- docs/concepts/configuration/overview.md | 4 ++-- docs/concepts/overview/working-with-objects/annotations.md | 2 +- docs/concepts/storage/persistent-volumes.md | 2 +- docs/concepts/workloads/controllers/replicaset.md | 2 +- docs/concepts/workloads/controllers/replicationcontroller.md | 4 ++-- docs/tasks/access-application-cluster/web-ui-dashboard.md | 4 ++-- docs/tasks/administer-cluster/out-of-resource.md | 2 +- docs/tasks/configure-pod-container/assign-pods-nodes.md | 2 +- .../debug-application-introspection.md | 2 +- docs/tasks/job/parallel-processing-expansion.md | 2 +- docs/tasks/manage-daemon/update-daemon-set.md | 2 +- docs/user-guide/walkthrough/k8s201.md | 2 +- 15 files changed, 18 insertions(+), 17 deletions(-) diff --git a/_redirects b/_redirects index f91eda55cc..6d1aa85864 100644 --- a/_redirects +++ b/_redirects @@ -237,6 +237,7 @@ /docs/user-guide/node-selection/ /docs/concepts/configuration/assign-pod-node/ 301 /docs/user-guide/persistent-volumes/ /docs/concepts/storage/persistent-volumes/ 301 /docs/user-guide/persistent-volumes/index /docs/concepts/storage/persistent-volumes/ 301 +/docs/user-guide/persistent-volumes/index.md /docs/concepts/storage/persistent-volumes/ 301 /docs/user-guide/persistent-volumes/walkthrough/ /docs/tasks/configure-pod-container/configure-persistent-volume-storage/ 301 /docs/user-guide/petset/ /docs/concepts/workloads/controllers/petset/ 301 /docs/user-guide/petset/bootstrapping/ /docs/concepts/workloads/controllers/petset/ 301 diff --git a/docs/concepts/cluster-administration/kubelet-garbage-collection.md b/docs/concepts/cluster-administration/kubelet-garbage-collection.md index 0a1036cd69..068ee6bd2a 100644 --- a/docs/concepts/cluster-administration/kubelet-garbage-collection.md +++ b/docs/concepts/cluster-administration/kubelet-garbage-collection.md @@ -72,4 +72,4 @@ Including: | `--low-diskspace-threshold-mb` | `--eviction-hard` or `eviction-soft` | eviction generalizes disk thresholds to other resources | | `--outofdisk-transition-frequency` | `--eviction-pressure-transition-period` | eviction generalizes disk pressure transition to other resources | -See [Configuring Out Of Resource Handling](/docs/concepts/cluster-administration/out-of-resource/) for more details. +See [Configuring Out Of Resource Handling](/docs/tasks/administer-cluster/out-of-resource/) for more details. diff --git a/docs/concepts/cluster-administration/manage-deployment.md b/docs/concepts/cluster-administration/manage-deployment.md index 4a94607125..c89990c044 100644 --- a/docs/concepts/cluster-administration/manage-deployment.md +++ b/docs/concepts/cluster-administration/manage-deployment.md @@ -256,7 +256,7 @@ my-nginx-2035384211-u3t6x 1/1 Running 0 23m fe This outputs all "app=nginx" pods, with an additional label column of pods' tier (specified with `-L` or `--label-columns`). -For more information, please see [labels](/docs/user-guide/labels/) and [kubectl label](/docs/user-guide/kubectl/{{page.version}}/#label) document. +For more information, please see [labels](/docs/concepts/overview/working-with-objects/labels/) and [kubectl label](/docs/user-guide/kubectl/{{page.version}}/#label) document. ## Updating annotations diff --git a/docs/concepts/configuration/overview.md b/docs/concepts/configuration/overview.md index c354a2a6df..61149cd3ca 100644 --- a/docs/concepts/configuration/overview.md +++ b/docs/concepts/configuration/overview.md @@ -58,7 +58,7 @@ This is a living document. If you think of something that is not on this list bu ## Using Labels -- Define and use [labels](/docs/user-guide/labels/) that identify __semantic attributes__ of your application or deployment. For example, instead of attaching a label to a set of pods to explicitly represent some service (For example, `service: myservice`), or explicitly representing the replication controller managing the pods (for example, `controller: mycontroller`), attach labels that identify semantic attributes, such as `{ app: myapp, tier: frontend, phase: test, deployment: v3 }`. This will let you select the object groups appropriate to the context— for example, a service for all "tier: frontend" pods, or all "test" phase components of app "myapp". See the [guestbook](https://github.com/kubernetes/examples/tree/{{page.githubbranch}}/guestbook/) app for an example of this approach. +- Define and use [labels](/docs/concepts/overview/working-with-objects/labels/) that identify __semantic attributes__ of your application or deployment. For example, instead of attaching a label to a set of pods to explicitly represent some service (For example, `service: myservice`), or explicitly representing the replication controller managing the pods (for example, `controller: mycontroller`), attach labels that identify semantic attributes, such as `{ app: myapp, tier: frontend, phase: test, deployment: v3 }`. This will let you select the object groups appropriate to the context— for example, a service for all "tier: frontend" pods, or all "test" phase components of app "myapp". See the [guestbook](https://github.com/kubernetes/examples/tree/{{page.githubbranch}}/guestbook/) app for an example of this approach. A service can be made to span multiple deployments, such as is done across [rolling updates](/docs/tasks/run-application/rolling-update-replication-controller/), by simply omitting release-specific labels from its selector, rather than updating a service's selector to match the replication controller's selector fully. @@ -84,7 +84,7 @@ This is a living document. If you think of something that is not on this list bu - Use `kubectl delete` rather than `stop`. `Delete` has a superset of the functionality of `stop`, and `stop` is deprecated. -- Use kubectl bulk operations (via files and/or labels) for get and delete. See [label selectors](/docs/user-guide/labels/#label-selectors) and [using labels effectively](/docs/concepts/cluster-administration/manage-deployment/#using-labels-effectively). +- Use kubectl bulk operations (via files and/or labels) for get and delete. See [label selectors](/docs/concepts/overview/working-with-objects/labels/#label-selectors) and [using labels effectively](/docs/concepts/cluster-administration/manage-deployment/#using-labels-effectively). - Use `kubectl run` and `expose` to quickly create and expose single container Deployments. See the [quick start guide](/docs/user-guide/quick-start/) for an example. diff --git a/docs/concepts/overview/working-with-objects/annotations.md b/docs/concepts/overview/working-with-objects/annotations.md index 2bb89e17e5..e0b8443253 100644 --- a/docs/concepts/overview/working-with-objects/annotations.md +++ b/docs/concepts/overview/working-with-objects/annotations.md @@ -55,7 +55,7 @@ and the like. {% endcapture %} {% capture whatsnext %} -Learn more about [Labels and Selectors](/docs/user-guide/labels/). +Learn more about [Labels and Selectors](/docs/concepts/overview/working-with-objects/labels/). {% endcapture %} {% include templates/concept.md %} diff --git a/docs/concepts/storage/persistent-volumes.md b/docs/concepts/storage/persistent-volumes.md index 96ebfed733..0ad9d76d06 100644 --- a/docs/concepts/storage/persistent-volumes.md +++ b/docs/concepts/storage/persistent-volumes.md @@ -315,7 +315,7 @@ Claims, like pods, can request specific quantities of a resource. In this case, ### Selector -Claims can specify a [label selector](/docs/user-guide/labels/#label-selectors) to further filter the set of volumes. Only the volumes whose labels match the selector can be bound to the claim. The selector can consist of two fields: +Claims can specify a [label selector](/docs/concepts/overview/working-with-objects/labels/#label-selectors) to further filter the set of volumes. Only the volumes whose labels match the selector can be bound to the claim. The selector can consist of two fields: * matchLabels - the volume must have a label with this value * matchExpressions - a list of requirements made by specifying key, list of values, and operator that relates the key and values. Valid operators include In, NotIn, Exists, and DoesNotExist. diff --git a/docs/concepts/workloads/controllers/replicaset.md b/docs/concepts/workloads/controllers/replicaset.md index a9247f15aa..dfe140601f 100644 --- a/docs/concepts/workloads/controllers/replicaset.md +++ b/docs/concepts/workloads/controllers/replicaset.md @@ -12,7 +12,7 @@ ReplicaSet is the next-generation Replication Controller. The only difference between a _ReplicaSet_ and a [_Replication Controller_](/docs/concepts/workloads/controllers/replicationcontroller/) right now is the selector support. ReplicaSet supports the new set-based selector requirements -as described in the [labels user guide](/docs/user-guide/labels/#label-selectors) +as described in the [labels user guide](/docs/concepts/overview/working-with-objects/labels/#label-selectors) whereas a Replication Controller only supports equality-based selector requirements. {% endcapture %} diff --git a/docs/concepts/workloads/controllers/replicationcontroller.md b/docs/concepts/workloads/controllers/replicationcontroller.md index 42f929317f..12a37bc445 100644 --- a/docs/concepts/workloads/controllers/replicationcontroller.md +++ b/docs/concepts/workloads/controllers/replicationcontroller.md @@ -129,7 +129,7 @@ different, and the `.metadata.labels` do not affect the behavior of the Replicat ### Pod Selector -The `.spec.selector` field is a [label selector](/docs/user-guide/labels/#label-selectors). A ReplicationController +The `.spec.selector` field is a [label selector](/docs/concepts/overview/working-with-objects/labels/#label-selectors). A ReplicationController manages all the pods with labels that match the selector. It does not distinguish between pods that it created or deleted and pods that another person or process created or deleted. This allows the ReplicationController to be replaced without affecting the running pods. @@ -243,7 +243,7 @@ object](/docs/api-reference/{{page.version}}/#replicationcontroller-v1-core). ### ReplicaSet -[`ReplicaSet`](/docs/concepts/workloads/controllers/replicaset/) is the next-generation ReplicationController that supports the new [set-based label selector](/docs/user-guide/labels/#set-based-requirement). +[`ReplicaSet`](/docs/concepts/workloads/controllers/replicaset/) is the next-generation ReplicationController that supports the new [set-based label selector](/docs/concepts/overview/working-with-objects/labels/#set-based-requirement). It’s mainly used by [`Deployment`](/docs/concepts/workloads/controllers/deployment/) as a mechanism to orchestrate pod creation, deletion and updates. Note that we recommend using Deployments instead of directly using Replica Sets, unless you require custom update orchestration or don’t require updates at all. diff --git a/docs/tasks/access-application-cluster/web-ui-dashboard.md b/docs/tasks/access-application-cluster/web-ui-dashboard.md index f77da393e5..a6bd934444 100644 --- a/docs/tasks/access-application-cluster/web-ui-dashboard.md +++ b/docs/tasks/access-application-cluster/web-ui-dashboard.md @@ -64,7 +64,7 @@ To access the deploy wizard from the Welcome page, click the respective button. The deploy wizard expects that you provide the following information: -- **App name** (mandatory): Name for your application. A [label](/docs/user-guide/labels/) with the name will be added to the Deployment and Service, if any, that will be deployed. +- **App name** (mandatory): Name for your application. A [label](/docs/concepts/overview/working-with-objects/labels/) with the name will be added to the Deployment and Service, if any, that will be deployed. The application name must be unique within the selected Kubernetes [namespace](/docs/tasks/administer-cluster/namespaces/). It must start with a lowercase character, and end with a lowercase character or a number, and contain only lowercase letters, numbers and dashes (-). It is limited to 24 characters. Leading and trailing spaces are ignored. @@ -84,7 +84,7 @@ If needed, you can expand the **Advanced options** section where you can specify - **Description**: The text you enter here will be added as an [annotation](/docs/concepts/overview/working-with-objects/annotations/) to the Deployment and displayed in the application's details. -- **Labels**: Default [labels](/docs/user-guide/labels/) to be used for your application are application name and version. You can specify additional labels to be applied to the Deployment, Service (if any), and Pods, such as release, environment, tier, partition, and release track. +- **Labels**: Default [labels](/docs/concepts/overview/working-with-objects/labels/) to be used for your application are application name and version. You can specify additional labels to be applied to the Deployment, Service (if any), and Pods, such as release, environment, tier, partition, and release track. Example: diff --git a/docs/tasks/administer-cluster/out-of-resource.md b/docs/tasks/administer-cluster/out-of-resource.md index a86f70ddf2..02098595df 100644 --- a/docs/tasks/administer-cluster/out-of-resource.md +++ b/docs/tasks/administer-cluster/out-of-resource.md @@ -49,7 +49,7 @@ container, and if users use the [node allocatable](/docs/tasks/administer-cluster/reserve-compute-resources/#node-allocatable) feature, out of resource decisions are made local to the end user pod part of the cgroup hierarchy as well as the root node. This -[script](/docs/concepts/cluster-administration/out-of-resource/memory-available.sh) +[script](/docs/tasks/administer-cluster/out-of-resource/memory-available.sh) reproduces the same set of steps that the `kubelet` performs to calculate `memory.available`. The `kubelet` excludes inactive_file (i.e. # of bytes of file-backed memory on inactive LRU list) from its calculation as it assumes that diff --git a/docs/tasks/configure-pod-container/assign-pods-nodes.md b/docs/tasks/configure-pod-container/assign-pods-nodes.md index 06a29e575a..613c731a0e 100644 --- a/docs/tasks/configure-pod-container/assign-pods-nodes.md +++ b/docs/tasks/configure-pod-container/assign-pods-nodes.md @@ -75,7 +75,7 @@ a `disktype=ssd` label. {% capture whatsnext %} Learn more about -[labels and selectors](/docs/user-guide/labels/). +[labels and selectors](/docs/concepts/overview/working-with-objects/labels/). {% endcapture %} {% include templates/task.md %} diff --git a/docs/tasks/debug-application-cluster/debug-application-introspection.md b/docs/tasks/debug-application-cluster/debug-application-introspection.md index 55c4c24c7f..292e86a363 100644 --- a/docs/tasks/debug-application-cluster/debug-application-introspection.md +++ b/docs/tasks/debug-application-cluster/debug-application-introspection.md @@ -379,7 +379,7 @@ Learn about additional debugging tools, including: * [Logging](/docs/user-guide/logging/overview) * [Monitoring](/docs/user-guide/monitoring) * [Getting into containers via `exec`](/docs/user-guide/getting-into-containers) -* [Connecting to containers via proxies](/docs/user-guide/connecting-to-applications-proxy) +* [Connecting to containers via proxies](/docs/tasks/access-kubernetes-api/http-proxy-access-api/) * [Connecting to containers via port forwarding](/docs/user-guide/connecting-to-applications-port-forward) diff --git a/docs/tasks/job/parallel-processing-expansion.md b/docs/tasks/job/parallel-processing-expansion.md index f8fac8066e..7feb9c7602 100644 --- a/docs/tasks/job/parallel-processing-expansion.md +++ b/docs/tasks/job/parallel-processing-expansion.md @@ -109,7 +109,7 @@ Processing item cherry In the first example, each instance of the template had one parameter, and that parameter was also used as a label. However label keys are limited in [what characters they can -contain](/docs/user-guide/labels/#syntax-and-character-set). +contain](/docs/concepts/overview/working-with-objects/labels/#syntax-and-character-set). This slightly more complex example uses the jinja2 template language to generate our objects. We will use a one-line python script to convert the template to a file. diff --git a/docs/tasks/manage-daemon/update-daemon-set.md b/docs/tasks/manage-daemon/update-daemon-set.md index 653eec57a1..46a5823218 100644 --- a/docs/tasks/manage-daemon/update-daemon-set.md +++ b/docs/tasks/manage-daemon/update-daemon-set.md @@ -159,7 +159,7 @@ causes: The rollout is stuck because new DaemonSet pods can't be scheduled on at least one node. This is possible when the node is -[running out of resources](/docs/concepts/cluster-administration/out-of-resource/). +[running out of resources](/docs/tasks/administer-cluster/out-of-resource/). When this happens, find the nodes that don't have the DaemonSet pods scheduled on by comparing the output of `kubectl get nodes` and the output of: diff --git a/docs/user-guide/walkthrough/k8s201.md b/docs/user-guide/walkthrough/k8s201.md index f5f42d7120..b9d659c05f 100644 --- a/docs/user-guide/walkthrough/k8s201.md +++ b/docs/user-guide/walkthrough/k8s201.md @@ -46,7 +46,7 @@ List all Pods with the label `app=nginx`: kubectl get pods -l app=nginx ``` -For more information, see [Labels](/docs/user-guide/labels/). +For more information, see [Labels](/docs/concepts/overview/working-with-objects/labels/). They are a core concept used by two additional Kubernetes building blocks: Deployments and Services.