Merge branch 'kubernetes:master' into patch-3

4 files changed, 8 insertions, 7 deletions

diff --git a/sig-node/OWNERS b/sig-node/OWNERS
index dcf3663c..2ea840ee 100644
--- a/sig-node/OWNERS
+++ b/sig-node/OWNERS
@@ -2,11 +2,11 @@
 
 reviewers:
   - sig-node-leads
-  - ehashman
   - SergeyKanzhelev
 approvers:
   - sig-node-leads
-  - ehashman
   - SergeyKanzhelev
+emeritus_approvers:
+  - ehashman
 labels:
   - sig/node
diff --git a/sig-node/README.md b/sig-node/README.md
index 58c16e20..9aea176d 100644
--- a/sig-node/README.md
+++ b/sig-node/README.md
@@ -89,12 +89,13 @@ The following [subprojects][subproject-definition] are owned by sig-node:
   - [kubernetes/test-infra/config/jobs/kubernetes/node-problem-detector](https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes/node-problem-detector/OWNERS)
 - **Contact:**
   - Slack: [#node-problem-detector](https://kubernetes.slack.com/messages/node-problem-detector)
-### noderesourcetopology-api
+### resource-management
 - **Owners:**
+  - [kubernetes/kubernetes/staging/src/k8s.io/dynamic-resource-allocation](https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/dynamic-resource-allocation/OWNERS)
   - [kubernetes/noderesourcetopology-api](https://github.com/kubernetes/noderesourcetopology-api/blob/master/OWNERS)
 ### security-profiles-operator
 - **Owners:**
-  - [kubernetes-sigs/security-profiles-operator](https://github.com/kubernetes-sigs/security-profiles-operator/blob/master/OWNERS)
+  - [kubernetes-sigs/security-profiles-operator](https://github.com/kubernetes-sigs/security-profiles-operator/blob/main/OWNERS)
 - **Contact:**
   - Slack: [#security-profiles-operator](https://kubernetes.slack.com/messages/security-profiles-operator)
 
diff --git a/sig-node/archive/meeting-notes-2020.md b/sig-node/archive/meeting-notes-2020.md
index e753d9e6..915805af 100644
--- a/sig-node/archive/meeting-notes-2020.md
+++ b/sig-node/archive/meeting-notes-2020.md
@@ -1050,7 +1050,7 @@ Meeting is [canceled](https://groups.google.com/forum/?utm_medium=email&utm_sour
 * [bart0sh] 2 hugepages PRs need review/approval:
   * [Implement support for multiple sizes huge pages](https://github.com/kubernetes/kubernetes/pull/84051) was already reviewed and passed API review. Last signode review is required. This PR is covered by [granted sig-release exception](https://github.com/kubernetes/enhancements/pull/1540#issuecomment-583072382) and is going to be included into 1.18 if merged.
   * [kubelet: sync node allocatable cgroups upon status update](https://github.com/kubernetes/kubernetes/pull/81774) bugfix got lgtm in Oct 2019. It would be great to have it in 1.18.
-* [cynepco3hahue] The KEP [Propose Memory Manager for NUMA awareness](https://github.com/kubernetes/enhancements/pull/1203) needs review, it can be great to get feedback from someone under the the sig-node group.
+* [cynepco3hahue] The KEP [Propose Memory Manager for NUMA awareness](https://github.com/kubernetes/enhancements/pull/1203) needs review, it can be great to get feedback from someone under the sig-node group.
 * [vpickard] ~~Topology Manager CI job PR needs /approve from sig-node owner [https://github.com/kubernetes/test-infra/pull/16062](https://github.com/kubernetes/test-infra/pull/16062)~~
 * [fromani] Topology Manager Upgrade test PR [https://github.com/kubernetes/kubernetes/pull/88107](https://github.com/kubernetes/kubernetes/pull/88107)
 * [dashpole] Distributed Tracing in Kubernete
diff --git a/sig-node/sig-node-contributor-ladder.md b/sig-node/sig-node-contributor-ladder.md
index 78833917..b961a25e 100644
--- a/sig-node/sig-node-contributor-ladder.md
+++ b/sig-node/sig-node-contributor-ladder.md
@@ -13,7 +13,7 @@ If you are a community member that wants to suggest changes, please do!
 
 SIG Node welcomes new contributors to the community, help is always desired.  Not all contributors are able to provide sustained contribution, but each contribution is always welcome.  This document intends to capture a leadership path for contributors that intend to provide a sustained contribution to the SIG and its associated code base by taking on reviewer and approver responsibilities at various levels.
 
-Please review the list of [sub-projects](./README.mdmd#subprojects) for areas to engage!
+Please review the list of [sub-projects](./README.md#subprojects) for areas to engage!
 
 ## SIG Node reviewers and approvers
 
@@ -113,4 +113,4 @@ There are different ways to earn trust:
 - Actively triage issues and PRs, provide support to contributors to drive their PRs to completion.
 
 **Be present**
-Participate in SIG Node meetings by speaking about KEPs or improvements driven, or find some other way to prove the identity behind GitHub handle.
\ No newline at end of file
+Participate in SIG Node meetings by speaking about KEPs or improvements driven, or find some other way to prove the identity behind GitHub handle.