From 9e50621718464c657240cc62daf030c3333eae5e Mon Sep 17 00:00:00 2001 From: Lindsey Tulloch Date: Mon, 18 Jun 2018 10:38:15 -0400 Subject: [PATCH 1/2] Update references to Federation-v2 progress Added resources to the whats next section as there has been significant progress over the past few months with the alpha release of Federation-v2 expected in the next few weeks. --- content/en/docs/concepts/cluster-administration/federation.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/content/en/docs/concepts/cluster-administration/federation.md b/content/en/docs/concepts/cluster-administration/federation.md index 78f9253b92dc7..50529a32d0bea 100644 --- a/content/en/docs/concepts/cluster-administration/federation.md +++ b/content/en/docs/concepts/cluster-administration/federation.md @@ -178,6 +178,10 @@ clusters up to 5000 nodes. See [Building Large Clusters](/docs/admin/cluster-lar * See this [setup guide](/docs/tutorials/federation/set-up-cluster-federation-kubefed/) for cluster federation. * See this [Kubecon2016 talk on federation](https://www.youtube.com/watch?v=pq9lbkmxpS8) * See this [Kubecon2017 Europe update on federation](https://www.youtube.com/watch?v=kwOvOLnFYck) +* See this [Kubecon2018 Europe update on sig-multicluster](https://www.youtube.com/watch?v=vGZo5DaThQU) +* See this [Kubecon2018 Europe Federation-v2 prototype presentation](https://youtu.be/q27rbaX5Jis?t=7m20s) +* See this [Federation-v2 Userguide](https://github.com/kubernetes-sigs/federation-v2/blob/master/docs/userguide.md) {{% /capture %}} + From 2dbd50e150befa1d31d6f2fb15406baa6bd22e4c Mon Sep 17 00:00:00 2001 From: Andrew Chen Date: Wed, 18 Jul 2018 17:32:41 -0700 Subject: [PATCH 2/2] remove in link --- content/en/docs/concepts/cluster-administration/federation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/concepts/cluster-administration/federation.md b/content/en/docs/concepts/cluster-administration/federation.md index 50529a32d0bea..df437951b805b 100644 --- a/content/en/docs/concepts/cluster-administration/federation.md +++ b/content/en/docs/concepts/cluster-administration/federation.md @@ -178,7 +178,7 @@ clusters up to 5000 nodes. See [Building Large Clusters](/docs/admin/cluster-lar * See this [setup guide](/docs/tutorials/federation/set-up-cluster-federation-kubefed/) for cluster federation. * See this [Kubecon2016 talk on federation](https://www.youtube.com/watch?v=pq9lbkmxpS8) * See this [Kubecon2017 Europe update on federation](https://www.youtube.com/watch?v=kwOvOLnFYck) -* See this [Kubecon2018 Europe update on sig-multicluster](https://www.youtube.com/watch?v=vGZo5DaThQU) +* See this [Kubecon2018 Europe update on sig-multicluster](https://www.youtube.com/watch?v=vGZo5DaThQU) * See this [Kubecon2018 Europe Federation-v2 prototype presentation](https://youtu.be/q27rbaX5Jis?t=7m20s) * See this [Federation-v2 Userguide](https://github.com/kubernetes-sigs/federation-v2/blob/master/docs/userguide.md) {{% /capture %}}