Merge branch 'master' of https://github.com/kubernetes/community into patch-2

2 files changed, 107 insertions, 35 deletions

diff --git a/sig-node/README.md b/sig-node/README.md
index afad2120..13fdaebe 100644
--- a/sig-node/README.md
+++ b/sig-node/README.md
@@ -5,12 +5,12 @@ Please do not edit this file directly, but instead make changes to the
 sigs.yaml file in the project root.
 
 To understand how this file is generated, see https://git.k8s.io/community/generator/README.md
--->
+--->
 # Node Special Interest Group
 
 
 ## Meetings
-* Regular SIG Meeting: [Tuesdays at 10:00 PT (Pacific Time)](https://zoom.us/j/4799874685) (weekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=10:00&tz=PT%20%28Pacific%20Time%29).
+* Regular SIG Meeting: [Tuesdays at 10:00 PT (Pacific Time)](https://docs.google.com/document/d/1FQx0BPlkkl1Bn0c9ocVBxYIKojpmrS1CFP5h0DI68AE/edit) (weekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=10:00&tz=PT%20%28Pacific%20Time%29).
   * [Meeting notes and Agenda](https://docs.google.com/document/d/1Ne57gvidMEWXR70OxxnRkYquAoMpt56o75oZtg-OeBg/edit?usp=sharing).
   * [Meeting recordings](https://www.youtube.com/watch?v=FbKOI9-x9hI&list=PL69nYSiGNLP1wJPj5DYWXjiArF-MJ5fNG).
 
@@ -30,15 +30,12 @@ The Chairs of the SIG run operations and processes governing the SIG.
 ## Subprojects
 
 The following subprojects are owned by sig-node:
-- **cri-containerd**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes-incubator/cri-containerd/master/OWNERS
 - **cri-o**
   - Owners:
-    - https://raw.githubusercontent.com/kubernetes-incubator/cri-o/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes-sigs/cri-o/master/OWNERS
 - **cri-tools**
   - Owners:
-    - https://raw.githubusercontent.com/kubernetes-incubator/cri-tools/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes-sigs/cri-tools/master/OWNERS
 - **frakti**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/frakti/master/OWNERS
@@ -48,7 +45,7 @@ The following subprojects are owned by sig-node:
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/kubelet/OWNERS
 - **node-feature-discovery**
   - Owners:
-    - https://raw.githubusercontent.com/kubernetes-incubator/node-feature-discovery/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes-sigs/node-feature-discovery/master/OWNERS
 - **node-problem-detector**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/node-problem-detector/master/OWNERS
@@ -61,35 +58,35 @@ The following subprojects are owned by sig-node:
 The below teams can be mentioned on issues and PRs in order to get attention from the right people.
 Note that the links to display team membership will only work if you are a member of the org.
 
-The google groups contain the archive of Github team notifications.
-Mentioning a team on Github will CC its group.
-Monitor these for Github activity if you are not a member of the team.
-
-| Team Name | Details | Google Groups | Description |
-| --------- |:-------:|:-------------:|  ----------- |
-| @kubernetes/sig-node-api-reviews | [link](https://github.com/orgs/kubernetes/teams/sig-node-api-reviews) | [link](https://groups.google.com/forum/#!forum/kubernetes-sig-node-api-reviews) | API Changes and Reviews |
-| @kubernetes/sig-node-bugs | [link](https://github.com/orgs/kubernetes/teams/sig-node-bugs) | [link](https://groups.google.com/forum/#!forum/kubernetes-sig-node-bugs) | Bug Triage and Troubleshooting |
-| @kubernetes/sig-node-feature-requests | [link](https://github.com/orgs/kubernetes/teams/sig-node-feature-requests) | [link](https://groups.google.com/forum/#!forum/kubernetes-sig-node-feature-requests) | Feature Requests |
-| @kubernetes/sig-node-pr-reviews | [link](https://github.com/orgs/kubernetes/teams/sig-node-pr-reviews) | [link](https://groups.google.com/forum/#!forum/kubernetes-sig-node-pr-reviews) | PR Reviews |
-| @kubernetes/sig-node-proposals | [link](https://github.com/orgs/kubernetes/teams/sig-node-proposals) | [link](https://groups.google.com/forum/#!forum/kubernetes-sig-node-proposals) | Design Proposals |
-| @kubernetes/sig-node-test-failures | [link](https://github.com/orgs/kubernetes/teams/sig-node-test-failures) | [link](https://groups.google.com/forum/#!forum/kubernetes-sig-node-test-failures) | Test Failures and Triage |
+| Team Name | Details | Description |
+| --------- |:-------:| ----------- |
+| @kubernetes/sig-node-api-reviews | [link](https://github.com/orgs/kubernetes/teams/sig-node-api-reviews) | API Changes and Reviews |
+| @kubernetes/sig-node-bugs | [link](https://github.com/orgs/kubernetes/teams/sig-node-bugs) | Bug Triage and Troubleshooting |
+| @kubernetes/sig-node-feature-requests | [link](https://github.com/orgs/kubernetes/teams/sig-node-feature-requests) | Feature Requests |
+| @kubernetes/sig-node-pr-reviews | [link](https://github.com/orgs/kubernetes/teams/sig-node-pr-reviews) | PR Reviews |
+| @kubernetes/sig-node-proposals | [link](https://github.com/orgs/kubernetes/teams/sig-node-proposals) | Design Proposals |
+| @kubernetes/sig-node-test-failures | [link](https://github.com/orgs/kubernetes/teams/sig-node-test-failures) | Test Failures and Triage |
 
 <!-- BEGIN CUSTOM CONTENT -->
 ## Goals
 
-Topics include, but are not limited to:
-
-* Kubelet related features (e.g. Pod lifecycle)
-* Node level performance and scalability (with [sig-scalability](../sig-scalability))
-* Node reliability
-* Node lifecycle management (with [sig-cluster-lifecycle](../sig-cluster-lifecycle))
-* Container runtimes: docker, [rkt](../sig-rktnetes), etc.
-* Images, package management
-* Resource management (with [sig-scheduling](../sig-scheduling))
-* Issues related to monitoring (with [sig-instrumentation](../sig-instrumentation))
-* Node level security and Pod isolation (with [sig-auth](../sig-auth))
-* Kernel interactions (to a limited extent)
-* ...
-
-We also work closely with [sig-storage](../sig-storage) and [sig-networking](../sig-networking). As you can see, this is a very cross-functional team!
+The following topics fall under scope of this SIG.
+
+- Kubelet and its features
+- Pod API and Pod behaviors (with [sig-architecture](../sig-architecture))
+- Node API (with [sig-architecture](../sig-architecture))
+- Node controller
+- Node level performance and scalability (with [sig-scalability](../sig-scalability))
+- Node reliability (problem detection and remediation)
+- Node lifecycle management (with [sig-cluster-lifecycle](../sig-cluster-lifecycle))
+- Container runtimes
+- Device management
+- Image management
+- Node-level resource management (with [sig-scheduling](../sig-scheduling))
+- Hardware discovery
+- Issues related to node, pod, container monitoring (with [sig-instrumentation](../sig-instrumentation))
+- Node level security and Pod isolation (with [sig-auth](../sig-auth))
+- Host OS and/or kernel interactions (to a limited extent)
+
+We also work closely with [sig-storage](../sig-storage) and [sig-network](../sig-network). As you can see, this is a very cross-functional team!
 <!-- END CUSTOM CONTENT -->
diff --git a/sig-node/charter.md b/sig-node/charter.md
new file mode 100644
index 00000000..4150b605
--- /dev/null
+++ b/sig-node/charter.md
@@ -0,0 +1,75 @@
+# SIG Node Charter
+
+This charter adheres to the conventions described in the [Kubernetes Charter README] and uses
+the Roles and Organization Management outlined in [sig-governance].
+
+## Scope
+
+SIG Node is responsible for the components that support the controlled
+interactions between pods and host resources.  We manage the lifecycle of pods
+that are scheduled to a node.  We focus on enabling a broad set of workload
+types, including workloads with hardware specific or performance sensitive requirements.  We maintain
+isolation boundaries between pods on a node, as well as the pod and the host.  We
+aim to continuously improve node reliability.
+
+### In scope
+
+SIG [readme]
+
+#### Code, Binaries and Services
+
+- Kubelet and its features
+- Pod API and Pod behaviors (with [sig-architecture](../sig-architecture))
+- Node API (with [sig-architecture](../sig-architecture))
+- Node controller
+- Node level performance and scalability (with [sig-scalability](../sig-scalability))
+- Node reliability (problem detection and remediation)
+- Node lifecycle management (with [sig-cluster-lifecycle](../sig-cluster-lifecycle))
+- Container runtimes
+- Device management
+- Image management
+- Node-level resource management (with [sig-scheduling](../sig-scheduling))
+- Hardware discovery
+- Issues related to node, pod, container monitoring (with [sig-instrumentation](../sig-instrumentation))
+- Node level security and Pod isolation (with [sig-auth](../sig-auth))
+- Host OS and/or kernel interactions (to a limited extent)
+
+#### Cross-cutting and Externally Facing Processes
+
+- CRI [validation] and [testing policy]
+- Node [test grid] and [perf dashboard]
+
+### Out of scope
+
+- network management ([sig-network](../sig-network))
+- persistent storage management ([sig-storage](../sig-storage))
+
+## Roles and Organization Management
+
+This sig adheres to the Roles and Organization Management outlined in [sig-governance]
+and opts-in to updates and modifications to [sig-governance].
+
+### Additional responsibilities of Chairs
+
+- Technical leads seeded by legacy SIG chairs from existing subproject owners
+
+### Additional responsibilities of Tech Leads
+
+None
+
+### Deviations from [sig-governance]
+
+None
+
+### Subproject Creation
+
+SIG Technical Leads
+
+
+[validation]: https://github.com/kubernetes/community/blob/master/contributors/devel/cri-validation.md
+[testing policy]: https://github.com/kubernetes/community/blob/master/contributors/devel/cri-testing-policy.md
+[test grid]: https://k8s-testgrid.appspot.com/sig-node#Summary
+[perf dashboard]: http://node-perf-dash.k8s.io/#/builds
+[sig-governance]: https://github.com/kubernetes/community/blob/master/committee-steering/governance/sig-governance.md
+[readme]: https://github.com/kubernetes/community/tree/master/sig-node
+[Kubernetes Charter README]: https://github.com/kubernetes/community/blob/master/committee-steering/governance/README.md
\ No newline at end of file