summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com>2019-09-25 12:32:04 -0700
committerGitHub <noreply@github.com>2019-09-25 12:32:04 -0700
commit3beaf548fa37b1f24a5eb3d3f4c2c7af5c77fe86 (patch)
treebe4e2d24b862cfaf4c663ba596b9b34571814281
parentbd3b9364291a72bdc36ec05e17b850940222cf4a (diff)
parentbd885d46d17fb7aaabf12e7eab3f96741d0da829 (diff)
Merge pull request #4005 from marun/cleanup-mc-kubefed
Cleanup cluster federation references in sig-multicluster docs
-rw-r--r--sig-list.md2
-rw-r--r--sig-multicluster/README.md2
-rw-r--r--sig-multicluster/charter.md4
-rw-r--r--sigs.yaml2
4 files changed, 5 insertions, 5 deletions
diff --git a/sig-list.md b/sig-list.md
index a0497fd7..97c31cba 100644
--- a/sig-list.md
+++ b/sig-list.md
@@ -33,7 +33,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
|[Contributor Experience](sig-contributor-experience/README.md)|contributor-experience|* [Elsie Phillips](https://github.com/Phillels), Red Hat<br>* [Paris Pittman](https://github.com/parispittman), Google<br>|* [Slack](https://kubernetes.slack.com/messages/sig-contribex)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-contribex)|* Regular SIG Meeting: [Wednesdays at 9:30 PT (Pacific Time) (biweekly)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>* (community-management) APAC Coordinator Meeting: [Thursdays at 5:00 UTC (biweekly)](https://docs.google.com/document/d/1qf-02B7EOrItQgwXFxgqZ5qjW0mtfu5qkYIF1Hl4ZLI/edit)<br>* (contributors-documentation) Non-Code Contributors Meeting: [Wednesdays at 11:00 PT (Pacific Time) (biweekly)](https://docs.google.com/document/d/1gdFWfkrapQclZ4-z4Lx2JwqKsJjXXUOVoLhBzZiZgSk/edit)<br>* (events) Events Planning Subproject: [Mondays at 10:00 PT (Pacific Time) (weekly)](https://docs.google.com/document/d/1oLXv5_rM4f645jlXym_Vd7AUq7x6DV-O87E6tcW1sjU/edit)<br>
|[Docs](sig-docs/README.md)|docs|* [Jennifer Rondeau](https://github.com/Bradamant3), Stripe<br>* [Jim Angel](https://github.com/jimangel), General Motors<br>* [Zach Corleissen](https://github.com/zacharysarah), Linux Foundation<br>|* [Slack](https://kubernetes.slack.com/messages/sig-docs)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-docs)|* APAC SIG Meeting: [Wednesdays at 02:00 UTC (monthly - fourth Wednesday every month)](https://docs.google.com/document/d/1zg6By77SGg90EVUrhDIhopjZlSDg2jCebU-Ks9cYx0w/edit)<br>* Korean Team Meeting: [Thursdays at 13:00 UTC (biweekly)](https://docs.google.com/document/d/1h5sMhBpPB5unJmBAS7KzDiPs-_eFQOu5o4UyHwMtFCA/edit)<br>* Regular SIG Meeting: [Tuesdays at 17:30 UTC (weekly - except fourth Tuesday every month)](https://docs.google.com/document/d/1zg6By77SGg90EVUrhDIhopjZlSDg2jCebU-Ks9cYx0w/edit)<br>
|[Instrumentation](sig-instrumentation/README.md)|instrumentation|* [Frederic Branczyk](https://github.com/brancz), Red Hat<br>* [Piotr Szczesniak](https://github.com/piosz), Google<br>|* [Slack](https://kubernetes.slack.com/messages/sig-instrumentation)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-instrumentation)|* Regular SIG Meeting: [Thursdays at 17:30 UTC (biweekly)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>
-|[Multicluster](sig-multicluster/README.md)|multicluster|* [Paul Morie](https://github.com/pmorie), Red Hat<br>* [Quinton Hoole](https://github.com/quinton-hoole), Huawei<br>|* [Slack](https://kubernetes.slack.com/messages/sig-multicluster)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-multicluster)|* Federation v2 Working Group: [Wednesdays at 7:30 PT (Pacific Time) (weekly)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>* Regular SIG Meeting: [Tuesdays at 9:30 PT (Pacific Time) (biweekly)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>
+|[Multicluster](sig-multicluster/README.md)|multicluster|* [Paul Morie](https://github.com/pmorie), Red Hat<br>* [Quinton Hoole](https://github.com/quinton-hoole), Huawei<br>|* [Slack](https://kubernetes.slack.com/messages/sig-multicluster)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-multicluster)|* Cluster Federation (KubeFed) Working Group: [Wednesdays at 7:30 PT (Pacific Time) (weekly)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>* Regular SIG Meeting: [Tuesdays at 9:30 PT (Pacific Time) (biweekly)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>
|[Network](sig-network/README.md)|network|* [Casey Davenport](https://github.com/caseydavenport), Tigera<br>* [Dan Williams](https://github.com/dcbw), Red Hat<br>* [Tim Hockin](https://github.com/thockin), Google<br>|* [Slack](https://kubernetes.slack.com/messages/sig-network)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-network)|* Regular SIG Meeting: [Thursdays at 14:00 PT (Pacific Time) (biweekly)](https://zoom.us/j/361123509)<br>
|[Node](sig-node/README.md)|node|* [Dawn Chen](https://github.com/dchen1107), Google<br>* [Derek Carr](https://github.com/derekwaynecarr), Red Hat<br>|* [Slack](https://kubernetes.slack.com/messages/sig-node)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-node)|* Regular SIG Meeting: [Tuesdays at 10:00 PT (Pacific Time) (weekly)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>
|[PM](sig-pm/README.md)|pm|* [Caleb Miles](https://github.com/calebamiles), Google<br>* [Jaice Singer DuMars](https://github.com/jdumars), Google<br>* [Stephen Augustus](https://github.com/justaugustus), VMware<br>* [Lachie Evenson](https://github.com/lachie83), Microsoft<br>|* [Slack](https://kubernetes.slack.com/messages/sig-pm)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-pm)|* Regular SIG Meeting: [Tuesdays at 18:30 UTC (biweekly)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>
diff --git a/sig-multicluster/README.md b/sig-multicluster/README.md
index fba82510..5bea45d5 100644
--- a/sig-multicluster/README.md
+++ b/sig-multicluster/README.md
@@ -13,7 +13,7 @@ A Special Interest Group focused on solving common challenges related to the man
The [charter](charter.md) defines the scope and governance of the Multicluster Special Interest Group.
## Meetings
-* Federation v2 Working Group: [Wednesdays at 7:30 PT (Pacific Time)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit) (weekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=7:30&tz=PT%20%28Pacific%20Time%29).
+* Cluster Federation (KubeFed) Working Group: [Wednesdays at 7:30 PT (Pacific Time)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit) (weekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=7:30&tz=PT%20%28Pacific%20Time%29).
* [Meeting notes and Agenda](https://docs.google.com/document/d/1v-Kb1pUs3ww_x0MiKtgcyTXCAuZlbVlz4_A9wS3_HXY/edit).
* [Meeting recordings](https://www.youtube.com/playlist?list=PL69nYSiGNLP3iKP5EzMbtNT2zOZv6RCrX).
* Regular SIG Meeting: [Tuesdays at 9:30 PT (Pacific Time)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit) (biweekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=9:30&tz=PT%20%28Pacific%20Time%29).
diff --git a/sig-multicluster/charter.md b/sig-multicluster/charter.md
index 0925dbf6..43e6f097 100644
--- a/sig-multicluster/charter.md
+++ b/sig-multicluster/charter.md
@@ -8,8 +8,8 @@ the Roles and Organization Management outlined in [sig-governance].
The scope of SIG Multicluster is limited to the following subprojects:
- The [cluster-registry](https://github.com/kubernetes/cluster-registry)
-- Kubernetes federation:
- - [Kubefed](https://github.com/kubernetes-sigs/kubefed)
+- Kubernetes Cluster Federation:
+ - [KubeFed](https://github.com/kubernetes-sigs/kubefed)
- [Federation v1](https://github.com/kubernetes/federation)
- [Kubemci](https://github.com/GoogleCloudPlatform/k8s-multicluster-ingress)
diff --git a/sigs.yaml b/sigs.yaml
index 6892eb63..4db84071 100644
--- a/sigs.yaml
+++ b/sigs.yaml
@@ -1330,7 +1330,7 @@ sigs:
name: Quinton Hoole
company: Huawei
meetings:
- - description: Federation v2 Working Group
+ - description: Cluster Federation (KubeFed) Working Group
day: Wednesday
time: "7:30"
tz: PT (Pacific Time)