Merge pull request #3235 from castrojo/retire-container-identity

Archive WG App dev, kubeadm adoption, and container identity

10 files changed, 2 insertions, 95 deletions

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 5cd72ac8..86cc2305 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -113,19 +113,12 @@ aliases:
   sig-windows-leads:
     - michmike
     - patricklang
-  wg-app-def-leads:
-    - ant31
-    - bryanl
-    - garethr
   wg-apply-leads:
     - lavalamp
   wg-component-standard-leads:
     - luxas
     - sttts
     - mtaufen
-  wg-container-identity-leads:
-    - smarterclayton
-    - destijl
   wg-iot-edge-leads:
     - cindyxing
     - dejanb
@@ -134,9 +127,6 @@ aliases:
   wg-k8s-infra-leads:
     - dims
     - spiffxp
-  wg-kubeadm-adoption-leads:
-    - luxas
-    - justinsb
   wg-lts-leads:
     - tpepper
     - imkin
diff --git a/wg-app-def/OWNERS b/archive/wg-app-def/OWNERS
index bccc1a22..bccc1a22 100644
--- a/wg-app-def/OWNERS
+++ b/archive/wg-app-def/OWNERS
diff --git a/wg-app-def/README.md b/archive/wg-app-def/README.md
index 91a6f716..91a6f716 100644
--- a/wg-app-def/README.md
+++ b/archive/wg-app-def/README.md
diff --git a/wg-container-identity/OWNERS b/archive/wg-container-identity/OWNERS
index acfe9948..acfe9948 100644
--- a/wg-container-identity/OWNERS
+++ b/archive/wg-container-identity/OWNERS
diff --git a/wg-container-identity/README.md b/archive/wg-container-identity/README.md
index 2e956ac7..2e956ac7 100644
--- a/wg-container-identity/README.md
+++ b/archive/wg-container-identity/README.md
diff --git a/wg-kubeadm-adoption/OWNERS b/archive/wg-kubeadm-adoption/OWNERS
index 757e61c0..757e61c0 100644
--- a/wg-kubeadm-adoption/OWNERS
+++ b/archive/wg-kubeadm-adoption/OWNERS
diff --git a/wg-kubeadm-adoption/README.md b/archive/wg-kubeadm-adoption/README.md
index 4c88f848..4c88f848 100644
--- a/wg-kubeadm-adoption/README.md
+++ b/archive/wg-kubeadm-adoption/README.md
diff --git a/sig-auth/README.md b/sig-auth/README.md
index 61b852cb..e3965335 100644
--- a/sig-auth/README.md
+++ b/sig-auth/README.md
@@ -103,7 +103,7 @@ The following subprojects are owned by sig-auth:
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/OWNERS
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/OWNERS
-- **node-identity-and-isolation**
+- **node-n-and-isolation**
   - Description: Node identity management (co-owned with sig-lifecycle), and authorization restrictions for isolating workloads on separate nodes (co-owned with sig-node).
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/certificates/approver/OWNERS
diff --git a/sig-list.md b/sig-list.md
index 1a98ba6c..c1ae6df0 100644
--- a/sig-list.md
+++ b/sig-list.md
@@ -57,13 +57,10 @@ When the need arises, a [new SIG can be created](sig-creation-procedure.md)
 
 | Name | Stakeholder SIGs |Organizers | Contact | Meetings |
 |------|------------------|-----------|---------|----------|
-|[App Def](wg-app-def/README.md)||* [Antoine Legrand](https://github.com/ant31), CoreOS<br>* [Bryan Liles](https://github.com/bryanl), VMware<br>* [Gareth Rushgrove](https://github.com/garethr), Docker<br>|* [Slack](https://kubernetes.slack.com/messages/wg-app-def)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-app-def)|* Regular WG Meeting: [Wednesdays at 16:00 UTC (bi-weekly)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>
 |[Apply](wg-apply/README.md)||* [Daniel Smith](https://github.com/lavalamp), Google<br>|* [Slack](https://kubernetes.slack.com/messages/wg-apply)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-apply)|* Regular WG Meeting: [Tuesdays at 9:30 PT (Pacific Time) (weekly)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>
 |[Component Standard](wg-component-standard/README.md)|* Architecture<br>* API Machinery<br>* Cluster Lifecycle<br>|* [Lucas Käldström](https://github.com/luxas), Luxas Labs (occasionally contracting for Weaveworks)<br>* [Dr. Stefan Schimanski](https://github.com/sttts), Red Hat<br>* [Michael Taufen](https://github.com/mtaufen), Google<br>|* [Slack](https://kubernetes.slack.com/messages/wg-component-standard)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-component-standard)|* Regular WG Meeting: [Tuesdays at 08:30 PT (Pacific Time) (weekly)](https://zoom.us/j/705540322)<br>
-|[Container Identity](wg-container-identity/README.md)||* [Clayton Coleman](https://github.com/smarterclayton), Red Hat<br>* [Greg Castle](https://github.com/destijl), Google<br>|* [Slack](https://kubernetes.slack.com/messages/wg-container-identity)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-container-identity)|* Regular WG Meeting: [Wednesdays at 10:00 PDT (bi-weekly (On demand))](https://zoom.us/my/k8s.sig.auth)<br>
 |[IoT Edge](wg-iot-edge/README.md)||* [Cindy Xing](https://github.com/cindyxing), Huawei<br>* [Dejan Bosanac](https://github.com/dejanb), Red Hat<br>* [Preston Holmes](https://github.com/ptone), Google<br>* [Steve Wong](https://github.com/cantbewong), VMWare<br>|* [Slack](https://kubernetes.slack.com/messages/wg-iot-edge)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-iot-edge)|* Regular WG Meeting: [Wednesdays at 17:00 UTC (every four weeks)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>* APAC WG Meeting: [Wednesdays at 5:00 UTC (every four weeks)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>
 |[K8s Infra](wg-k8s-infra/README.md)|* Architecture<br>* Contributor Experience<br>* Release<br>* Testing<br>|* [Davanum Srinivas](https://github.com/dims), Huawei<br>* [Aaron Crickenberger](https://github.com/spiffxp), Google<br>|* [Slack](https://kubernetes.slack.com/messages/wg-k8s-infra)<br>* [Mailing List](https://groups.google.com/forum/#!forum/wg-k8s-infra)|* Regular WG Meeting: [Wednesdays at 8:30 PT (Pacific Time) (bi-weekly)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>
-|[Kubeadm Adoption](wg-kubeadm-adoption/README.md)||* [Lucas Käldström](https://github.com/luxas), Luxas Labs (occasionally contracting for Weaveworks)<br>* [Justin Santa Barbara](https://github.com/justinsb)<br>|* [Slack](https://kubernetes.slack.com/messages/sig-cluster-lifecycle)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-cluster-lifecycle)|* Regular WG Meeting: [Tuesdays at 18:00 UTC (bi-weekly)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>
 |[LTS](wg-lts/README.md)|* API Machinery<br>* CLI<br>* Node<br>|* [Tim Pepper](https://github.com/tpepper), VMware<br>* [Dhawal Yogesh Bhanusali](https://github.com/imkin), VMware<br>* [Quinton Hoole](https://github.com/quinton-hoole-2), Huawei<br>* [Nick Young](https://github.com/youngnick), Atlassian<br>|* [Slack](https://kubernetes.slack.com/messages/wg-lts)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-lts)|* Regular WG Meeting: [Tuesdays at 09:00 PT (Pacific Time) (bi-weekly)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>
 |[Machine Learning](wg-machine-learning/README.md)||* [Vishnu Kannan](https://github.com/vishh), Google<br>* [Kenneth Owens](https://github.com/kow3ns), Google<br>* [Balaji Subramaniam](https://github.com/balajismaniam), Intel<br>* [Connor Doyle](https://github.com/ConnorDoyle), Intel<br>|* [Slack](https://kubernetes.slack.com/messages/wg-machine-learning)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-machine-learning)|* Regular WG Meeting: [Thursdays at 13:00 PT (Pacific Time) (biweekly)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>
 |[Multitenancy](wg-multitenancy/README.md)||* [David Oppenheimer](https://github.com/davidopp), Google<br>* [Jessie Frazelle](https://github.com/jessfraz), Microsoft<br>|* [Slack](https://kubernetes.slack.com/messages/wg-multitenancy)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-multitenancy)|* Regular WG Meeting: [Wednesdays at 11:00 PT (Pacific Time) (biweekly)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit)<br>
diff --git a/sigs.yaml b/sigs.yaml
index dcef30d2..db63ba7b 100644
--- a/sigs.yaml
+++ b/sigs.yaml
@@ -403,7 +403,7 @@ sigs:
       owners:
       - https://raw.githubusercontent.com/kubernetes/kubernetes/master/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/OWNERS
       - https://raw.githubusercontent.com/kubernetes/kubernetes/master/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/OWNERS
-    - name: node-identity-and-isolation
+    - name: node-n-and-isolation
       description: >
         Node identity management (co-owned with sig-lifecycle), and
         authorization restrictions for isolating workloads on separate nodes
@@ -2170,56 +2170,6 @@ workinggroups:
     contact:
       slack: wg-resource-mgmt
       mailing_list: https://groups.google.com/forum/#!forum/kubernetes-wg-resource-management
-  - name: Container Identity
-    dir: wg-container-identity
-    mission_statement: >
-      Ensure containers are able to interact with external systems and acquire secure identities for communication, integrating with external solutions as necessary.
-    charter_link:
-    leadership:
-      chairs:
-      - name: Clayton Coleman
-        github: smarterclayton
-        company: Red Hat
-      - name: Greg Castle
-        github: destijl
-        company: Google
-    meetings:
-    - description: Regular WG Meeting
-      day: Wednesday
-      time: "10:00"
-      tz: "PDT"
-      frequency: bi-weekly (On demand)
-      url: https://zoom.us/my/k8s.sig.auth
-      archive_url: https://docs.google.com/document/d/1uH60pNr1-jBn7N2pEcddk6-6NTnmV5qepwKUJe9tMRo/edit
-      recordings_url:
-    contact:
-      slack: wg-container-identity
-      mailing_list: https://groups.google.com/forum/#!forum/kubernetes-wg-container-identity
-  - name: Kubeadm Adoption
-    dir: wg-kubeadm-adoption
-    mission_statement: >
-      Boost adoption of the kubeadm tool. kubeadm is a tool for creating new Kubernetes clusters easily for new users, but can also be used as a toolbox for higher-level deployment
-      solutions. This working group makes sure kubeadm meets the extensibility requirements of those higher-level Kubernetes installers.
-    charter_link:
-    leadership:
-      chairs:
-      - name: Lucas Käldström
-        github: luxas
-        company: Luxas Labs (occasionally contracting for Weaveworks)
-      - name: Justin Santa Barbara
-        github: justinsb
-    meetings:
-    - description: Regular WG Meeting
-      day: Tuesday
-      time: "18:00"
-      tz: "UTC"
-      frequency: bi-weekly
-      url: https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit
-      archive_url: https://docs.google.com/document/d/1KdXsLYiJYJdiRbtgZsx6qbHF4g_K-gAScB9Zs4avgzg/edit
-      recordings_url: https://www.youtube.com/watch?v=-Xlcrm5iT80&list=PLPgAK4Icr0ehh93BiMC3djAc5KoW7WIkl
-    contact:
-      slack: sig-cluster-lifecycle
-      mailing_list: https://groups.google.com/forum/#!forum/kubernetes-sig-cluster-lifecycle
   - name: LTS
     dir: wg-lts
     mission_statement: >
@@ -2264,36 +2214,6 @@ workinggroups:
     contact:
       slack: wg-lts
       mailing_list: https://groups.google.com/forum/#!forum/kubernetes-wg-lts
-  - name: App Def
-    dir: wg-app-def
-    mission_statement: >
-      Improve UX of declarative primitives in the API and/or primary client libraries and tools,
-      understand the needs of other parts of the ecosystem on this layer, and improve the interoperability
-      of application management tools through better separation of concerns, common conventions,
-      and common principles.
-    charter_link:
-    leadership:
-      chairs:
-      - name: Antoine Legrand
-        github: ant31
-        company: CoreOS
-      - name: Bryan Liles
-        github: bryanl
-        company: VMware
-      - name: Gareth Rushgrove
-        github: garethr
-        company: Docker
-    meetings:
-    - description: Regular WG Meeting
-      day: Wednesday
-      time: "16:00"
-      tz: "UTC"
-      frequency: bi-weekly
-      url: https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit
-      archive_url: https://docs.google.com/document/d/1Pxc-qwAt4FvuISZ_Ib5KdUwlynFkGueuzPx5Je_lbGM/edit
-    contact:
-      slack: wg-app-def
-      mailing_list: https://groups.google.com/forum/#!forum/kubernetes-wg-app-def
   - name: Apply
     dir: wg-apply
     # We might want to create a charter here.