diff --git a/_redirects b/_redirects index f5411e2cda..b7e3bc1af9 100644 --- a/_redirects +++ b/_redirects @@ -139,6 +139,7 @@ /docs/contribute/write-new-topic/ /docs/home/contribute/write-new-topic/ 301 /docs/deprecate/ /ddocs/reference/deprecation-policy/ 301 +/docs/deprecated/ /ddocs/reference/deprecation-policy/ 301 /docs/deprecation-policy/ /docs/reference/deprecation-policy/ 301 /docs/federation/api-reference/ /docs/reference/federation/v1/operations/ 301 @@ -269,6 +270,7 @@ /docs/tutorials/stateless-application/expose-external-ip-address-service/ /docs/tasks/access-application-cluster/service-access-application-cluster/ 301 /docs/tutorials/stateless-application/run-stateless-ap-replication-controller/ /docs/tasks/run-application/run-stateless-application-deployment/ 301 /docs/tutorials/stateless-application/run-stateless-application-deployment/ /docs/tasks/run-application/run-stateless-application-deployment/ 301 +/docs/tutorials/tasks/set-up-cluster-federation-kubefed/ /docs/tasks/federation/set-up-cluster-federation-kubefed/ 301 /docs/user-guide/ /docs/home/ 301 /docs/user-guide/accessing-the-cluster/ /docs/tasks/access-application-cluster/access-cluster/ 301 @@ -279,7 +281,7 @@ /docs/user-guide/config-best-practices/ /docs/concepts/configuration/overview/ 301 /docs/user-guide/configmap/ /docs/tasks/configure-pod-container/configmap/ 301 /docs/user-guide/configmap/README/ /docs/tasks/configure-pod-container/configure-pod-configmap/ 301 -/docs/user-guide/configuring-containers/ /docs/tasks/ 301 +/docs/user-guide/configuring-containers/ /docs/tasks/configure-pod-container/configmap/ 301 /docs/user-guide/connecting-applications/ /docs/concepts/services-networking/connect-applications-service/ 301 /docs/user-guide/connecting-to-applications-port-forward/ /docs/tasks/access-application-cluster/port-forward-access-application-cluster/ 301 /docs/user-guide/connecting-to-applications-proxy/ /docs/tasks/access-kubernetes-api/http-proxy-access-api/ 301 @@ -343,6 +345,7 @@ /docs/user-guide/namespaces/ /docs/concepts/overview/working-with-objects/namespaces/ 301 /docs/user-guide/networkpolicies/ /docs/concepts/services-networking/network-policies/ 301 /docs/user-guide/node-selection/ /docs/concepts/configuration/assign-pod-node/ 301 +/docs/user-guide/node-selection/README /docs/concepts/configuration/assign-pod-node/ 301 /docs/user-guide/overview/ /docs/concepts/overview/what-is-kubernetes/ 301 /docs/user-guide/persistent-volumes/ /docs/concepts/storage/persistent-volumes/ 301 /docs/user-guide/persistent-volumes/index /docs/concepts/storage/persistent-volumes/ 301 diff --git a/docs/admin/admission-controllers.md b/docs/admin/admission-controllers.md index 631389f234..bbd9d579b5 100644 --- a/docs/admin/admission-controllers.md +++ b/docs/admin/admission-controllers.md @@ -364,7 +364,7 @@ For more information about persistent volume claims, see ["PersistentVolumeClaim ### PodPreset This plug-in injects a pod with the fields specified in a matching PodPreset. -See also [PodPreset concept](docs/concepts/workloads/pods/podpreset/) and +See also [PodPreset concept](/docs/concepts/workloads/pods/podpreset/) and [Inject Information into Pods Using a PodPreset](/docs/tasks/inject-data-application/podpreset) for more information. diff --git a/docs/admin/federation/index.md b/docs/admin/federation/index.md index 2c55fedc23..1e40630e10 100644 --- a/docs/admin/federation/index.md +++ b/docs/admin/federation/index.md @@ -6,7 +6,7 @@ approvers: title: (Deprecated) Using `federation-up` and `deploy.sh` --- -## The mechanisms explained in this doc to setup federation are deprecated. [`kubefed`](/docs/tutorials/tasks/set-up-cluster-federation-kubefed/) is now the recommended way to deploy federation. +## The mechanisms explained in this doc to setup federation are deprecated. [`kubefed`](/docs/tasks/federation/set-up-cluster-federation-kubefed/) is now the recommended way to deploy federation. This guide explains how to set up cluster federation that lets us control multiple Kubernetes clusters. diff --git a/docs/concepts/services-networking/network-policies.md b/docs/concepts/services-networking/network-policies.md index d523971a7f..281a568639 100644 --- a/docs/concepts/services-networking/network-policies.md +++ b/docs/concepts/services-networking/network-policies.md @@ -68,7 +68,7 @@ spec: *POSTing this to the API server will have no effect unless your chosen networking solution supports network policy.* -__Mandatory Fields__: As with all other Kubernetes config, a `NetworkPolicy` needs `apiVersion`, `kind`, and `metadata` fields. For general information about working with config files, see [here](/docs/user-guide/simple-yaml), [here](/docs/user-guide/configuring-containers), and [here](/docs/user-guide/working-with-resources). +__Mandatory Fields__: As with all other Kubernetes config, a `NetworkPolicy` needs `apiVersion`, `kind`, and `metadata` fields. For general information about working with config files, see [Configure Containers Using a ConfigMap](/docs/tasks/configure-pod-container/configmap/), and [Object Management](https://kubernetes.io/docs/tutorials/object-management-kubectl/object-management/). __spec__: `NetworkPolicy` [spec](https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status) has all the information needed to define a particular network policy in the given namespace. diff --git a/docs/concepts/workloads/controllers/replicaset.md b/docs/concepts/workloads/controllers/replicaset.md index acdfea5ac5..fc61332116 100644 --- a/docs/concepts/workloads/controllers/replicaset.md +++ b/docs/concepts/workloads/controllers/replicaset.md @@ -96,8 +96,7 @@ frontend-qhloh 1/1 Running 0 1m ## Writing a ReplicaSet Spec As with all other Kubernetes API objects, a ReplicaSet needs the `apiVersion`, `kind`, and `metadata` fields. For -general information about working with manifests, see [here](/docs/user-guide/simple-yaml/), -[here](/docs/tasks/), and [here](/docs/concepts/tools/kubectl/object-management-overview/). +general information about working with manifests, see [Object Management](/docs/concepts/tools/kubectl/object-management-overview/). A ReplicaSet also needs a [`.spec` section](https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status). diff --git a/docs/concepts/workloads/controllers/replicationcontroller.md b/docs/concepts/workloads/controllers/replicationcontroller.md index e4c26a010f..555df714a3 100644 --- a/docs/concepts/workloads/controllers/replicationcontroller.md +++ b/docs/concepts/workloads/controllers/replicationcontroller.md @@ -99,9 +99,8 @@ specifies an expression that just gets the name from each pod in the returned li ## Writing a ReplicationController Spec -As with all other Kubernetes config, a ReplicationController needs `apiVersion`, `kind`, and `metadata` fields. For -general information about working with config files, see [here](/docs/user-guide/simple-yaml/), -[here](/docs/tasks/), and [here](/docs/concepts/tools/kubectl/object-management-overview/). +As with all other Kubernetes config, a ReplicationController needs `apiVersion`, `kind`, and `metadata` fields. +For general information about working with config files, see [Object Management](/docs/concepts/tools/kubectl/object-management-overview/). A ReplicationController also needs a [`.spec` section](https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status). diff --git a/docs/getting-started-guides/cloudstack.md b/docs/getting-started-guides/cloudstack.md index d92b90b2eb..81f9854188 100644 --- a/docs/getting-started-guides/cloudstack.md +++ b/docs/getting-started-guides/cloudstack.md @@ -8,10 +8,7 @@ title: Cloudstack [CoreOS](http://coreos.com) templates for CloudStack are built [nightly](http://stable.release.core-os.net/amd64-usr/current/). CloudStack operators need to [register](http://docs.cloudstack.apache.org/projects/cloudstack-administration/en/latest/templates.html) this template in their cloud before proceeding with these Kubernetes deployment instructions. -This guide uses an [Ansible playbook](https://github.com/apachecloudstack/k8s). -This is completely automated, a single playbook deploys Kubernetes. - -This [Ansible](http://ansibleworks.com) playbook deploys Kubernetes on a CloudStack based Cloud using CoreOS images. The playbook, creates an ssh key pair, creates a security group and associated rules and finally starts coreOS instances configured via cloud-init. +This guide uses a single [Ansible playbook](https://github.com/apachecloudstack/k8s), which is completely automated and can deploy Kubernetes on a CloudStack based Cloud using CoreOS images. The playbook, creates an ssh key pair, creates a security group and associated rules and finally starts coreOS instances configured via cloud-init. diff --git a/docs/tasks/administer-cluster/romana-network-policy.md b/docs/tasks/administer-cluster/romana-network-policy.md index 68ca156b41..709459c87f 100644 --- a/docs/tasks/administer-cluster/romana-network-policy.md +++ b/docs/tasks/administer-cluster/romana-network-policy.md @@ -27,7 +27,7 @@ Follow the [containerized installation guide](https://github.com/romana/romana/t To apply network policies use one of the following: * [Romana network policies](https://github.com/romana/romana/wiki/Romana-policies). - * [Example of Romana network policy](https://github.com/romana/core/tree/master/policy). + * [Example of Romana network policy](https://github.com/romana/core/blob/master/doc/policy.md). * The NetworkPolicy API. {% endcapture %} diff --git a/docs/tutorials/stateful-application/zookeeper.md b/docs/tutorials/stateful-application/zookeeper.md index 49383c1f12..5c07373bf3 100644 --- a/docs/tutorials/stateful-application/zookeeper.md +++ b/docs/tutorials/stateful-application/zookeeper.md @@ -142,7 +142,7 @@ zk-2 1/1 Running 0 40s ``` The StatefulSet controller creates three Pods, and each Pod has a container with -a [ZooKeeper 3.4.9](http://www-us.apache.org/dist/zookeeper/zookeeper-3.4.9/) server. +a [ZooKeeper](http://www-us.apache.org/dist/zookeeper/stable/) server. ### Facilitating Leader Election