summaryrefslogtreecommitdiff
path: root/contributors
diff options
context:
space:
mode:
authorJonathan MacMillan <dvorak@google.com>2017-10-11 16:34:50 -0700
committerJonathan MacMillan <dvorak@google.com>2017-10-13 10:13:16 -0700
commitf8e1cbd0920f4a181759664095d80775e4e672c0 (patch)
treee81c7d3ae9fa982e3a9b9a88600d23807a170663 /contributors
parent5bd42a9126ceebc44fd3630d4a531cd2ed76acac (diff)
Update files in the community repo to point to multicluster rather than federation.
Diffstat (limited to 'contributors')
-rw-r--r--contributors/design-proposals/architecture/architecture.md2
-rw-r--r--contributors/design-proposals/dir_struct.txt2
-rw-r--r--contributors/design-proposals/multicluster/control-plane-resilience.md (renamed from contributors/design-proposals/federation/control-plane-resilience.md)0
-rw-r--r--contributors/design-proposals/multicluster/federated-api-servers.md (renamed from contributors/design-proposals/federation/federated-api-servers.md)0
-rw-r--r--contributors/design-proposals/multicluster/federated-ingress.md (renamed from contributors/design-proposals/federation/federated-ingress.md)0
-rw-r--r--contributors/design-proposals/multicluster/federated-placement-policy.md (renamed from contributors/design-proposals/federation/federated-placement-policy.md)6
-rw-r--r--contributors/design-proposals/multicluster/federated-replicasets.md (renamed from contributors/design-proposals/federation/federated-replicasets.md)0
-rw-r--r--contributors/design-proposals/multicluster/federated-services.md (renamed from contributors/design-proposals/federation/federated-services.md)0
-rw-r--r--contributors/design-proposals/multicluster/federation-clusterselector.md (renamed from contributors/design-proposals/federation/federation-clusterselector.md)0
-rw-r--r--contributors/design-proposals/multicluster/federation-high-level-arch.png (renamed from contributors/design-proposals/federation/federation-high-level-arch.png)bin31793 -> 31793 bytes
-rw-r--r--contributors/design-proposals/multicluster/federation-lite.md (renamed from contributors/design-proposals/federation/federation-lite.md)0
-rw-r--r--contributors/design-proposals/multicluster/federation-phase-1.md (renamed from contributors/design-proposals/federation/federation-phase-1.md)0
-rw-r--r--contributors/design-proposals/multicluster/federation.md (renamed from contributors/design-proposals/federation/federation.md)0
-rw-r--r--contributors/design-proposals/multicluster/ubernetes-cluster-state.png (renamed from contributors/design-proposals/federation/ubernetes-cluster-state.png)bin13824 -> 13824 bytes
-rw-r--r--contributors/design-proposals/multicluster/ubernetes-design.png (renamed from contributors/design-proposals/federation/ubernetes-design.png)bin20358 -> 20358 bytes
-rw-r--r--contributors/design-proposals/multicluster/ubernetes-scheduling.png (renamed from contributors/design-proposals/federation/ubernetes-scheduling.png)bin39094 -> 39094 bytes
-rw-r--r--contributors/design-proposals/scheduling/podaffinity.md2
-rw-r--r--contributors/devel/release/issues.md2
18 files changed, 7 insertions, 7 deletions
diff --git a/contributors/design-proposals/architecture/architecture.md b/contributors/design-proposals/architecture/architecture.md
index 06644621..b0d1f99b 100644
--- a/contributors/design-proposals/architecture/architecture.md
+++ b/contributors/design-proposals/architecture/architecture.md
@@ -245,7 +245,7 @@ itself:
A single Kubernetes cluster may span multiple availability zones.
-However, for the highest availability, we recommend using [cluster federation](../federation/federation.md).
+However, for the highest availability, we recommend using [cluster federation](../multicluster/federation.md).
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/design/architecture.md?pixel)]()
diff --git a/contributors/design-proposals/dir_struct.txt b/contributors/design-proposals/dir_struct.txt
index e5e8ea71..ef61ae75 100644
--- a/contributors/design-proposals/dir_struct.txt
+++ b/contributors/design-proposals/dir_struct.txt
@@ -134,7 +134,7 @@ Uncategorized
security.md
security_context.md
service_accounts.md
-./federation
+./multicluster
control-plane-resilience.md
federated-api-servers.md
federated-ingress.md
diff --git a/contributors/design-proposals/federation/control-plane-resilience.md b/contributors/design-proposals/multicluster/control-plane-resilience.md
index 1e0a3baf..1e0a3baf 100644
--- a/contributors/design-proposals/federation/control-plane-resilience.md
+++ b/contributors/design-proposals/multicluster/control-plane-resilience.md
diff --git a/contributors/design-proposals/federation/federated-api-servers.md b/contributors/design-proposals/multicluster/federated-api-servers.md
index ff214c23..ff214c23 100644
--- a/contributors/design-proposals/federation/federated-api-servers.md
+++ b/contributors/design-proposals/multicluster/federated-api-servers.md
diff --git a/contributors/design-proposals/federation/federated-ingress.md b/contributors/design-proposals/multicluster/federated-ingress.md
index 07e75b0c..07e75b0c 100644
--- a/contributors/design-proposals/federation/federated-ingress.md
+++ b/contributors/design-proposals/multicluster/federated-ingress.md
diff --git a/contributors/design-proposals/federation/federated-placement-policy.md b/contributors/design-proposals/multicluster/federated-placement-policy.md
index e1292bd9..d613422d 100644
--- a/contributors/design-proposals/federation/federated-placement-policy.md
+++ b/contributors/design-proposals/multicluster/federated-placement-policy.md
@@ -28,7 +28,7 @@ A simple example of a placement policy is
> compliance.
The [Kubernetes Cluster
-Federation](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/federation/federation.md#policy-engine-and-migrationreplication-controllers)
+Federation](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/multicluster/federation.md#policy-engine-and-migrationreplication-controllers)
design proposal includes a pluggable policy engine component that decides how
applications/resources are placed across federated clusters.
@@ -283,7 +283,7 @@ When the remediator component (in the sidecar) receives the notification it
sends a PATCH request to the federation-apiserver to update the affected
resource. This way, the actual rebalancing of ReplicaSets is still handled by
the [Rescheduling
-Algorithm](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/federation/federated-replicasets.md)
+Algorithm](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/multicluster/federated-replicasets.md)
in the Federated ReplicaSet controller.
The remediator component must be deployed with a kubeconfig for the
@@ -368,4 +368,4 @@ engine could implement.
## Future Work
- This proposal uses ConfigMaps to store and manage policies. In the future, we
- want to introduce a first-class **Policy** API resource. \ No newline at end of file
+ want to introduce a first-class **Policy** API resource.
diff --git a/contributors/design-proposals/federation/federated-replicasets.md b/contributors/design-proposals/multicluster/federated-replicasets.md
index 8b48731c..8b48731c 100644
--- a/contributors/design-proposals/federation/federated-replicasets.md
+++ b/contributors/design-proposals/multicluster/federated-replicasets.md
diff --git a/contributors/design-proposals/federation/federated-services.md b/contributors/design-proposals/multicluster/federated-services.md
index 8ec9ca29..8ec9ca29 100644
--- a/contributors/design-proposals/federation/federated-services.md
+++ b/contributors/design-proposals/multicluster/federated-services.md
diff --git a/contributors/design-proposals/federation/federation-clusterselector.md b/contributors/design-proposals/multicluster/federation-clusterselector.md
index 154412c7..154412c7 100644
--- a/contributors/design-proposals/federation/federation-clusterselector.md
+++ b/contributors/design-proposals/multicluster/federation-clusterselector.md
diff --git a/contributors/design-proposals/federation/federation-high-level-arch.png b/contributors/design-proposals/multicluster/federation-high-level-arch.png
index 8a416cc1..8a416cc1 100644
--- a/contributors/design-proposals/federation/federation-high-level-arch.png
+++ b/contributors/design-proposals/multicluster/federation-high-level-arch.png
Binary files differ
diff --git a/contributors/design-proposals/federation/federation-lite.md b/contributors/design-proposals/multicluster/federation-lite.md
index 549f98df..549f98df 100644
--- a/contributors/design-proposals/federation/federation-lite.md
+++ b/contributors/design-proposals/multicluster/federation-lite.md
diff --git a/contributors/design-proposals/federation/federation-phase-1.md b/contributors/design-proposals/multicluster/federation-phase-1.md
index 157b5668..157b5668 100644
--- a/contributors/design-proposals/federation/federation-phase-1.md
+++ b/contributors/design-proposals/multicluster/federation-phase-1.md
diff --git a/contributors/design-proposals/federation/federation.md b/contributors/design-proposals/multicluster/federation.md
index fc595123..fc595123 100644
--- a/contributors/design-proposals/federation/federation.md
+++ b/contributors/design-proposals/multicluster/federation.md
diff --git a/contributors/design-proposals/federation/ubernetes-cluster-state.png b/contributors/design-proposals/multicluster/ubernetes-cluster-state.png
index 56ec2df8..56ec2df8 100644
--- a/contributors/design-proposals/federation/ubernetes-cluster-state.png
+++ b/contributors/design-proposals/multicluster/ubernetes-cluster-state.png
Binary files differ
diff --git a/contributors/design-proposals/federation/ubernetes-design.png b/contributors/design-proposals/multicluster/ubernetes-design.png
index 44924846..44924846 100644
--- a/contributors/design-proposals/federation/ubernetes-design.png
+++ b/contributors/design-proposals/multicluster/ubernetes-design.png
Binary files differ
diff --git a/contributors/design-proposals/federation/ubernetes-scheduling.png b/contributors/design-proposals/multicluster/ubernetes-scheduling.png
index 01774882..01774882 100644
--- a/contributors/design-proposals/federation/ubernetes-scheduling.png
+++ b/contributors/design-proposals/multicluster/ubernetes-scheduling.png
Binary files differ
diff --git a/contributors/design-proposals/scheduling/podaffinity.md b/contributors/design-proposals/scheduling/podaffinity.md
index 24930f96..30bdb256 100644
--- a/contributors/design-proposals/scheduling/podaffinity.md
+++ b/contributors/design-proposals/scheduling/podaffinity.md
@@ -313,7 +313,7 @@ scheduler to not put more than one pod from S in the same zone, and thus by
definition it will not put more than one pod from S on the same node, assuming
each node is in one zone. This rule is more useful as PreferredDuringScheduling
anti-affinity, e.g. one might expect it to be common in
-[Cluster Federation](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/federation/federation.md) clusters.)
+[Cluster Federation](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/multicluster/federation.md) clusters.)
* **Don't co-locate pods of this service with pods from service "evilService"**:
`{LabelSelector: selector that matches evilService's pods, TopologyKey: "node"}`
diff --git a/contributors/devel/release/issues.md b/contributors/devel/release/issues.md
index 7aa86297..819b6e41 100644
--- a/contributors/devel/release/issues.md
+++ b/contributors/devel/release/issues.md
@@ -32,7 +32,7 @@ The SIG owner label defines the SIG to which the bot will escalate if the issue
or updated by the deadline. If there are no updates after escalation, the
issue may automatically removed from the milestone.
-e.g. `sig/node`, `sig/federation`, `sig/apps`, `sig/network`
+e.g. `sig/node`, `sig/multicluster`, `sig/apps`, `sig/network`
**Note:**
- For test-infrastructure issues use `sig/testing`.