Merge pull request #3715 from pmorie/kubefed-yezzzzz

Rename federation-v2 to Kubefed

3 files changed, 12 insertions, 12 deletions

diff --git a/sig-multicluster/README.md b/sig-multicluster/README.md
index 3320bcb8..949091c2 100644
--- a/sig-multicluster/README.md
+++ b/sig-multicluster/README.md
@@ -36,15 +36,15 @@ The Chairs of the SIG run operations and processes governing the SIG.
 ## Subprojects
 
 The following subprojects are owned by sig-multicluster:
+- **Kubefed**
+  - Owners:
+    - https://raw.githubusercontent.com/kubernetes-sigs/kubefed/master/OWNERS
 - **cluster-registry**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/cluster-registry/master/OWNERS
 - **federation-v1**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/federation/master/OWNERS
-- **federation-v2**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes-sigs/federation-v2/master/OWNERS
 - **kubemci**
   - Owners:
     - https://raw.githubusercontent.com/GoogleCloudPlatform/k8s-multicluster-ingress/master/OWNERS
@@ -67,16 +67,16 @@ Note that the links to display team membership will only work if you are a membe
 <!-- BEGIN CUSTOM CONTENT -->
 ## Subprojects
 
-### Federation v2
+### Kubefed
 Control Plane for newer Multicluster-specific APIs. Discussions are ongoing to focus future development on multi-cluster specific Kubernetes APIs rather than a reimplementation of single-cluster Kubernetes APIs.
 
 |  |  |
 | -------------- |:-------|
 | Recommended for Production | Not yet. |
 | General Availability | Beta by 2018-Q4. GA TBD. |
-| Current Level of Activity | Once to twice weekly discussions as part of Federation working group (most active SIG-Multicluster members). |
+| Current Level of Activity | Once to twice weekly discussions as part of Kubefed working group (most active SIG-Multicluster members). |
 | Owner(s) | Working Group |
-| Where to find it? | https://github.com/kubernetes-sigs/federation-v2 |
+| Where to find it? | https://github.com/kubernetes-sigs/kubefed |
 | Meeting Agenda | https://docs.google.com/document/d/1v-Kb1pUs3ww_x0MiKtgcyTXCAuZlbVlz4_A9wS3_HXY |
 
 ### Cluster Registry
@@ -104,13 +104,13 @@ Ability to program Global multicluster load balancers with two deliverables:
 | Where to find it? | https://github.com/GoogleCloudPlatform/k8s-multicluster-ingress |
 
 ### Federation v1 (a.k.a. Cluster Federation)
-Control Plane that coordinates configuration across multiple clusters by presenting a subset of the existing single-cluster Kubernetes APIs. Initially released as part of Kubernetes 1.3, Cluster Federation has implemented parts of the existing “single-cluster” Kubernetes API so that they may be used transparently in a multi-cluster fashion. As of Kubernetes 1.9, many of the non-Federated Kubernetes Workloads APIs have moved to GA (Deployments, ReplicaSets, Daemonset, StatefulSet). However, under Federation, these workloads have not reached the maturity of “GA” since they are re-implemented by different federated controllers. The SIG is currently re-thinking how to support Kubernetes APIs in a Federation fashion and this discussion is reflected under Federation v2.
+Control Plane that coordinates configuration across multiple clusters by presenting a subset of the existing single-cluster Kubernetes APIs. Initially released as part of Kubernetes 1.3, Cluster Federation has implemented parts of the existing “single-cluster” Kubernetes API so that they may be used transparently in a multi-cluster fashion. As of Kubernetes 1.9, many of the non-Federated Kubernetes Workloads APIs have moved to GA (Deployments, ReplicaSets, Daemonset, StatefulSet). However, under Federation, these workloads have not reached the maturity of “GA” since they are re-implemented by different federated controllers. The SIG is currently re-thinking how to support Kubernetes APIs in a Federation fashion and this discussion is reflected under Kubefed.
 
 |  |  |
 | -------------- |:-------|
 | Recommended for Production | No. Between Alpha and Beta levels of functionality depending on Kubernetes APIs used. |
 | General Availability | No target set date. |
-| Current Level of Activity | On Hold. See Federation v2. |
+| Current Level of Activity | On Hold. See Kubefed. |
 | Owner(s) | [@shashidharatd](https://github.com/shashidharatd) |
 | Where to find it? | Out of main Kubernetes repository as of 1.9 and into its own [kubernetes/federation](https://github.com/kubernetes/federation) repository (kubefed is no longer distributed as part of Kubernetes client tools). Users have to build their own Federation Control Plane and kubefed client tool or wait on [issue #192](https://github.com/kubernetes/federation/issues/192) to be resolved. |
 <!-- END CUSTOM CONTENT -->
diff --git a/sig-multicluster/charter.md b/sig-multicluster/charter.md
index 89df3865..0925dbf6 100644
--- a/sig-multicluster/charter.md
+++ b/sig-multicluster/charter.md
@@ -9,7 +9,7 @@ The scope of SIG Multicluster is limited to the following subprojects:
 
 - The [cluster-registry](https://github.com/kubernetes/cluster-registry)
 - Kubernetes federation:
-  - [Federation v2](https://github.com/kubernetes-sigs/federation-v2)
+  - [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 9f4b6f5b..8561bef5 100644
--- a/sigs.yaml
+++ b/sigs.yaml
@@ -1395,15 +1395,15 @@ sigs:
     - name: sig-mutlicluster-proposals
       description: Design Proposals
   subprojects:
+  - name: Kubefed
+    owners:
+    - https://raw.githubusercontent.com/kubernetes-sigs/kubefed/master/OWNERS
   - name: cluster-registry
     owners:
     - https://raw.githubusercontent.com/kubernetes/cluster-registry/master/OWNERS
   - name: federation-v1
     owners:
     - https://raw.githubusercontent.com/kubernetes/federation/master/OWNERS
-  - name: federation-v2
-    owners:
-    - https://raw.githubusercontent.com/kubernetes-sigs/federation-v2/master/OWNERS
   - name: kubemci
     owners:
     - https://raw.githubusercontent.com/GoogleCloudPlatform/k8s-multicluster-ingress/master/OWNERS