Resolving merge conflicts with master

docs/tasks/administer-federation/cluster.md

@@ -34,10 +34,14 @@ kubectl --context=federation get clusters
 The `--context=federation` flag tells kubectl to submit the
 request to the Federation apiserver instead of sending it to a Kubernetes
 cluster. If you submit it to a k8s cluster, you will receive an error saying
-`the server doesn't have a resource type "clusters"`
+
+```the server doesn't have a resource type "clusters"```
 
 If you passed the correct Federation context but received a message error saying
-`No resources found.`, it means that you haven't
+
+```No resources found.```
+
+it means that you haven't
 added any cluster to the Federation yet.
 
 ## Creating a Federated Cluster

docs/tasks/administer-federation/deployment.md

@@ -66,7 +66,7 @@ if you have 3 registered clusters and you create a Federated Deployment with
 `spec.replicas = 9`, then each Deployment in the 3 clusters will have
 `spec.replicas=3`.
 To modify the number of replicas in each cluster, you can specify
-[FederatedReplicaSetPreference](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/federation/apis/federation/types.go)
+[FederatedReplicaSetPreference](https://github.com/kubernetes/federation/blob/{{page.githubbranch}}/apis/federation/types.go)
 as an annotation with key `federation.kubernetes.io/deployment-preferences`
 on Federated Deployment.
 

docs/tasks/administer-federation/events.md

@@ -12,14 +12,14 @@ This guide explains how to use events in federation control plane to help in deb
 
 This guide assumes that you have a running Kubernetes Cluster
 Federation installation. If not, then head over to the
-[federation admin guide](/docs/admin/federation/) to learn how to
+[federation admin guide](/docs/concepts/cluster-administration/federation/) to learn how to
 bring up a cluster federation (or have your cluster administrator do
 this for you). Other tutorials, for example
 [this one](https://github.com/kelseyhightower/kubernetes-cluster-federation)
 by Kelsey Hightower, are also available to help you.
 
 You are also expected to have a basic
-[working knowledge of Kubernetes](/docs/getting-started-guides/) in
+[working knowledge of Kubernetes](/docs/setup/) in
 general.
 
 ## Overview

docs/tasks/administer-federation/hpa.md

@@ -21,7 +21,7 @@ needed most by manipulating the min and max limits of the HPA objects in the fed
 
 * {% include federated-task-tutorial-prereqs.md %}
 * You are also expected to have a basic
-[working knowledge of Kubernetes](/docs/getting-started-guides/) in
+[working knowledge of Kubernetes](/docs/setup/) in
 general and [HPAs](/docs/tasks/run-application/horizontal-pod-autoscale/) in particular.
 
 The federated HPA is an alpha feature. The API is not enabled by default on the
@@ -79,7 +79,7 @@ kubectl --context=gce-asia-east1a get HPA php-apache
 The HPA in the underlying clusters will match the federation HPA
 except in the number of min and max replicas. The federation control plane ensures that the sum of max replicas in each cluster matches the specified
 max replicas on the federated HPA object, and the sum of minimum replicas will be greater
-than or equal to the minimum specified on the federated HPA object. 
+than or equal to the minimum specified on the federated HPA object.
 
 **Note:** A particular cluster cannot have a minimum replica sum of 0.
 {: .note}
@@ -136,7 +136,11 @@ the interaction is almost identical to interacting with a normal Kubernetes clus
 with a limited set of APIs that are federated). As both Deployments and
 HorizontalPodAutoscalers are now federated, `kubectl` commands like `kubectl run`
 and `kubectl autoscale` work on federation. Given this fact, the mechanism specified in
+<<<<<<< HEAD
 [horizontal pod autoscaler walkthrough](/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough)
+=======
+[horizontal pod autoscaler walkthrough](/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/)
+>>>>>>> master
 will also work when used with federation.
 Care however will need to be taken that when
 [generating load on a target deployment](/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/#step-three-increase-load),
@@ -161,8 +165,13 @@ and averaged current CPU utilization still higher than the target CPU utilizatio
 are fields on local HPA object), then the target app in this cluster
 needs more replicas, and the scaling is currently restricted by max replicas set on this local
 HPA object. In such a scenario, the federated HPA controller scans all clusters and tries to
+<<<<<<< HEAD
 find clusters which do not have such a condition (meaning the the desired replicas are less
 than the max, and current averaged cpu utilization is lower then the threshold). If it finds such
+=======
+find clusters which do not have such a condition (meaning the desired replicas are less
+than the max, and current averaged CPU utilization is lower then the threshold). If it finds such
+>>>>>>> master
 a cluster, it reduces the max replica on the HPA in this cluster and increases the max replicas
 on the HPA in the cluster which needed the replicas.
 

docs/tasks/administer-federation/ingress.md

@@ -6,7 +6,7 @@ title: Federated Ingress
 This page explains how to use Kubernetes Federated Ingress to deploy
 a common HTTP(S) virtual IP load balancer across a federated service running in
 multiple Kubernetes clusters.  As of v1.4, clusters hosted in Google
-Cloud (both GKE and GCE, or both) are supported. This makes it
+Cloud (both Google Kubernetes Engine and GCE, or both) are supported. This makes it
 easy to deploy a service that reliably serves HTTP(S) traffic
 originating from web clients around the globe on a single, static IP
 address.   Low network latency, high fault tolerance and easy administration are
@@ -19,7 +19,7 @@ automatically checks the health of the pods comprising the service,
 and avoids sending requests to unresponsive or slow pods (or entire
 unresponsive clusters).
 
-Federated Ingress is released as an alpha feature, and supports Google Cloud Platform (GKE,
+Federated Ingress is released as an alpha feature, and supports Google Cloud Platform (Google Kubernetes Engine,
 GCE and hybrid scenarios involving both) in Kubernetes v1.4.  Work is under way to support other cloud
 providers such as AWS, and other hybrid cloud scenarios (e.g. services
 spanning private on-premises as well as public cloud Kubernetes
@@ -66,7 +66,7 @@ this for you). Other tutorials, for example
 by Kelsey Hightower, are also available to help you.
 
 You must also have a basic
-[working knowledge of Kubernetes](/docs/getting-started-guides/) in
+[working knowledge of Kubernetes](/docs/setup/) in
 general, and [Ingress](/docs/concepts/services-networking/ingress/) in particular.
 {% endcapture %}
 
@@ -300,6 +300,6 @@ Check that:
 {% capture whatsnext %}
 *  If you need assistance, use one of the [support channels](/docs/tasks/debug-application-cluster/troubleshooting/) to seek assistance.
  *  For details about use cases that motivated this work, see
- [Federation proposal](https://git.k8s.io/community/contributors/design-proposals/federation/federation.md).
+ [Federation proposal](https://git.k8s.io/community/contributors/design-proposals/multicluster/federation.md).
 {% endcapture %}
 {% include templates/task.md %}

docs/tasks/administer-federation/job.md

@@ -16,7 +16,7 @@ parallelism and completions exist across the registered clusters.
 
 * {% include federated-task-tutorial-prereqs.md %}
 * You are also expected to have a basic
-[working knowledge of Kubernetes](/docs/getting-started-guides/) in
+[working knowledge of Kubernetes](/docs/setup/) in
 general and [jobs](/docs/concepts/workloads/controllers/jobs-run-to-completion/) in particular.
 {% endcapture %}
 
@@ -61,7 +61,11 @@ if you have 3 registered clusters and you create a federated job with
 `spec.parallelism = 9` and `spec.completions = 18`, then each job in the 3 clusters has
 `spec.parallelism = 3` and `spec.completions = 6`.
 To modify the number of parallelism and completions in each cluster, you can specify
+<<<<<<< HEAD
 [ReplicaAllocationPreferences](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/federation/apis/federation/types.go)
+=======
+[ReplicaAllocationPreferences](https://github.com/kubernetes/federation/blob/{{page.githubbranch}}/apis/federation/types.go)
+>>>>>>> master
 as an annotation with key `federation.kubernetes.io/job-preferences`
 on the federated job.
 

docs/tasks/administer-federation/replicaset.md

@@ -16,7 +16,7 @@ replicas exist across the registered clusters.
 
 * {% include federated-task-tutorial-prereqs.md %}
 * You are also expected to have a basic
-[working knowledge of Kubernetes](/docs/getting-started-guides/) in
+[working knowledge of Kubernetes](/docs/setup/) in
 general and [ReplicaSets](/docs/concepts/workloads/controllers/replicaset/) in particular.
 {% endcapture %}
 
@@ -34,7 +34,7 @@ You can do that using [kubectl](/docs/user-guide/kubectl/) by running:
 kubectl --context=federation-cluster create -f myrs.yaml
 ```
 
-The '--context=federation-cluster' flag tells kubectl to submit the
+The `--context=federation-cluster` flag tells kubectl to submit the
 request to the Federation apiserver instead of sending it to a Kubernetes
 cluster.
 
@@ -61,7 +61,7 @@ if you have 3 registered clusters and you create a federated ReplicaSet with
 `spec.replicas = 9`, then each ReplicaSet in the 3 clusters will have
 `spec.replicas=3`.
 To modify the number of replicas in each cluster, you can specify
-[FederatedReplicaSetPreference](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/federation/apis/federation/types.go)
+[FederatedReplicaSetPreference](https://github.com/kubernetes/federation/blob/{{page.githubbranch}}/apis/federation/types.go)
 as an annotation with key `federation.kubernetes.io/replica-set-preferences`
 on the federated ReplicaSet.
 

docs/tasks/administer-federation/secret.md

@@ -18,7 +18,7 @@ this for you). Other tutorials, for example
 by Kelsey Hightower, are also available to help you.
 
 You are also expected to have a basic
-[working knowledge of Kubernetes](/docs/getting-started-guides/) in
+[working knowledge of Kubernetes](/docs/setup/) in
 general and [Secrets](/docs/concepts/configuration/secret/) in particular.
 
 ## Overview
@@ -42,7 +42,7 @@ You can do that using [kubectl](/docs/user-guide/kubectl/) by running:
 kubectl --context=federation-cluster create -f mysecret.yaml
 ```
 
-The '--context=federation-cluster' flag tells kubectl to submit the
+The `--context=federation-cluster` flag tells kubectl to submit the
 request to the Federation apiserver instead of sending it to a Kubernetes
 cluster.