categorize and expand api machinery projects

1 files changed, 42 insertions, 19 deletions

diff --git a/sigs.yaml b/sigs.yaml
index b2c8a94a..db4f2d80 100644
--- a/sigs.yaml
+++ b/sigs.yaml
@@ -42,35 +42,55 @@ sigs:
       - name: sig-api-machinery-test-failures
         description: Test Failures and Triage
     subprojects:
-    - name: api
+    - name: server-binaries
       owners:
-      - https://raw.githubusercontent.com/kubernetes/api/master/OWNERS
-    - name: apiserver
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cmd/kube-apiserver/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cmd/kube-controller-manager/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cmd/cloud-controller-manager/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cmd/controller-manager/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/kubeapiserver/OWNERS # support for binary
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/master/OWNERS # support for binary
+    - name: control-plane-features
+      owners:
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/garbagecollector/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/namespace/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/quota/OWNERS # if not us, who?
+    - name: universal-machinery # i.e., both client and server
       owners:
-      - https://raw.githubusercontent.com/kubernetes/apiserver/master/OWNERS
       - https://raw.githubusercontent.com/kubernetes/apimachinery/master/OWNERS
-      - https://raw.githubusercontent.com/kubernetes-incubator/apiserver-builder/master/OWNERS
-      - https://raw.githubusercontent.com/kubernetes/sample-apiserver/master/OWNERS
-      - https://raw.githubusercontent.com/kubernetes/sample-controller/master/OWNERS
-    - name: code-generator
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/staging/src/k8s.io/apimachinery/master/OWNERS
+    - name: server-frameworks
       owners:
-      - https://raw.githubusercontent.com/kubernetes/code-generator/master/OWNERS
-    - name: crd
+      - https://raw.githubusercontent.com/kubernetes/apiserver/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/staging/src/k8s.io/apiserver/master/OWNERS
+    - name: server-crd
       owners:
       - https://raw.githubusercontent.com/kubernetes/apiextensions-apiserver/master/OWNERS
-    - name: gen
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/staging/src/k8s.io/apiextensions-apiserver/master/OWNERS
+    - name: server-api-aggregation
       owners:
-    - name: IDL
+      - https://raw.githubusercontent.com/kubernetes/kube-aggregator/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/staging/src/k8s.io/kube-aggregator/master/OWNERS
+    - name: server-sdk
       owners:
-      - https://raw.githubusercontent.com/kubernetes/gengo/master/OWNERS
-    - name: api-aggregation
+      - https://raw.githubusercontent.com/kubernetes/sample-apiserver/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/staging/src/k8s.io/sample-apiserver/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/sample-controller/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/staging/src/k8s.io/sample-controller/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes-incubator/apiserver-builder/master/OWNERS
+    - name: idl-schema-client-pipeline
       owners:
-      - https://raw.githubusercontent.com/kubernetes/kube-aggregator/master/OWNERS
-    - name: kubernetes-client-library
+      - https://raw.githubusercontent.com/kubernetes/gengo/master/OWNERS # possibly should be totally separate
+      - https://raw.githubusercontent.com/kubernetes/code-generator/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/staging/src/k8s.io/code-generator/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kube-openapi/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/api/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/staging/src/k8s.io/api/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes-client/gen/master/OWNERS
+    - name: kubernetes-clients
       owners:
       - https://raw.githubusercontent.com/kubernetes-client/community/master/OWNERS
       - https://raw.githubusercontent.com/kubernetes-client/csharp/master/OWNERS
-      - https://raw.githubusercontent.com/kubernetes-client/gen/master/OWNERS
       - https://raw.githubusercontent.com/kubernetes-client/go-base/master/OWNERS
       - https://raw.githubusercontent.com/kubernetes-client/go/master/OWNERS
       - https://raw.githubusercontent.com/kubernetes-client/haskell/master/OWNERS
@@ -81,8 +101,8 @@ sigs:
       - https://raw.githubusercontent.com/kubernetes-client/typescript/master/OWNERS
       - https://raw.githubusercontent.com/kubernetes-incubator/client-python/master/OWNERS
       - https://raw.githubusercontent.com/kubernetes/client-go/master/OWNERS
-      - https://raw.githubusercontent.com/kubernetes/kube-openapi/master/OWNERS
-    - name: utils
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/staging/src/k8s.io/client-go/master/OWNERS
+    - name: universal-utils # There is no reason why this is in api-machinery
       owners:
       - https://raw.githubusercontent.com/kubernetes/utils/master/OWNERS
   - name: Apps
@@ -1470,6 +1490,9 @@ sigs:
     - name: test-infra
       owners:
       - https://raw.githubusercontent.com/kubernetes/test-infra/master/OWNERS
+    - name: repo-publishing
+      owners:
+      - https://raw.githubusercontent.com/kubernetes/publishing-bot/master/OWNERS
     - name: testing-commons
       description: "The Testing Commons is a subproject within the Kubernetes sig-testing community interested code structure, layout, and execution of common test code used throughout the kubernetes project."
       owners: