Merge pull request #106458 from dims/lint-yaml-in-owners-files

Lint/Beautify yaml in OWNERS files

CHANGELOG/OWNERS

@@ -15,7 +15,6 @@ reviewers:
   - pmmalinov01 # 1.22 Release Notes Lead
   - simcard0000 # 1.22 Release Notes shadow
   - sladyn98 # 1.22 Release Notes shadow
-
 labels:
   - sig/release
   - area/release-eng

OWNERS

@@ -20,7 +20,6 @@ filters:
       - brendandburns
       - bgrant0607
       - jbeda
-
   # go.{mod,sum} files relate to go dependencies, and should be reviewed by the
   # dep-approvers
   "go\\.(mod|sum)$":

OWNERS_ALIASES

@@ -3,7 +3,6 @@ aliases:
     - dims
     - derekwaynecarr
     - johnbelamaric
-
   # sig-auth subproject aliases
   sig-auth-audit-approvers:
     - sttts
@@ -13,7 +12,6 @@ aliases:
     - lavalamp
     - sttts
     - tallclair
-
   sig-auth-authenticators-approvers:
     - deads2k
     - liggitt
@@ -27,7 +25,6 @@ aliases:
     - mikedanese
     - sttts
     - wojtek-t
-
   sig-auth-authorizers-approvers:
     - deads2k
     - liggitt
@@ -44,7 +41,6 @@ aliases:
     - sttts
     - thockin
     - wojtek-t
-
   sig-auth-certificates-approvers:
     - liggitt
     - mikedanese
@@ -63,7 +59,6 @@ aliases:
     - thockin
     - timothysc
     - wojtek-t
-
   sig-auth-encryption-at-rest-approvers:
     - smarterclayton
   sig-auth-encryption-at-rest-reviewers:
@@ -72,7 +67,6 @@ aliases:
     - liggitt
     - smarterclayton
     - wojtek-t
-
   sig-auth-node-isolation-approvers:
     - deads2k
     - liggitt
@@ -83,7 +77,6 @@ aliases:
     - liggitt
     - mikedanese
     - tallclair
-
   sig-auth-policy-approvers:
     - deads2k
     - liggitt
@@ -93,7 +86,6 @@ aliases:
     - liggitt
     - tallclair
     - krmayankk
-
   sig-auth-serviceaccounts-approvers:
     - deads2k
     - liggitt
@@ -104,7 +96,6 @@ aliases:
     - liggitt
     - mikedanese
     - WanLinghao
-
   # SIG Release
   release-engineering-approvers:
     - cpanato # SIG Technical Lead / RelEng subproject owner / Release Manager
@@ -137,7 +128,6 @@ aliases:
     - puerco # SIG Technical Lead / RelEng subproject owner / Release Manager
     - saschagrunert # SIG Chair / RelEng subproject owner / Release Manager
     - xmudrii # Release Manager
-
   sig-storage-approvers:
     - saad-ali
     - thockin
@@ -215,7 +205,6 @@ aliases:
     - dougsland
     - rikatz
     - KnVerey
-
   sig-testing-reviewers:
     - bentheelder
     - cblecker
@@ -230,7 +219,6 @@ aliases:
     # emeritus
     # - ixdy
     # - krzyzacy
-
   sig-node-approvers:
     - Random-Liu
     - dchen1107
@@ -267,7 +255,6 @@ aliases:
   sig-network-driver-approvers:
     - dcbw
     - freehan
-
   sig-network-approvers:
     - andrewsykim
     - aojea
@@ -296,7 +283,6 @@ aliases:
     - mrhohn
     - rramkumar1
     - thockin
-
   sig-apps-approvers:
     - kow3ns
     - janetkuo
@@ -351,70 +337,56 @@ aliases:
     - smarterclayton
     - thockin
     - liggitt
-
   # subsets of api-approvers by sig area to help focus approval requests to those with domain knowledge
   sig-api-machinery-api-approvers:
     - lavalamp
     - liggitt
     - smarterclayton
-
   sig-apps-api-approvers:
     - erictune
     - lavalamp
     - liggitt
     - smarterclayton
-
   sig-auth-api-approvers:
     - liggitt
     - smarterclayton
-
   sig-cli-api-approvers:
     - liggitt
     - smarterclayton
-
   sig-cloud-provider-api-approvers:
     - liggitt
     - thockin
-
   sig-cluster-lifecycle-api-approvers:
     - liggitt
     - smarterclayton
-
   sig-cluster-lifecycle-leads:
     - fabriziopandini
     - justinsb
     - neolit123
     - vincepri
-
   sig-network-api-approvers:
     - smarterclayton
     - thockin
-
   sig-network-api-reviewers:
     - andrewsykim
     - caseydavenport
     - cmluciano
     - danwinship
     - thockin
-
   sig-node-api-approvers:
     - smarterclayton
     - thockin
-
   sig-scheduling-api-approvers:
     - lavalamp
     - smarterclayton
     - thockin
-
   sig-storage-api-approvers:
     - liggitt
     - thockin
-
   sig-windows-api-approvers:
     - smarterclayton
     - thockin
     - liggitt
-
   api-reviewers:
     - andrewsykim
     - erictune
@@ -448,92 +420,74 @@ aliases:
     - piosz
     - jsafrane
     - dims
-
   # api-reviewers targeted by sig area
   # see https://git.k8s.io/community/sig-architecture/api-review-process.md#training-reviews
-
   sig-api-machinery-api-reviewers:
     - caesarxuchao
     - deads2k
     - jpbetz
     - sttts
-
   sig-apps-api-reviewers:
     - janetkuo
     - kow3ns
     - soltysh
     - alculquicondor
-
   sig-auth-api-reviewers:
     - enj
     - mikedanese
-
   sig-cli-api-reviewers:
     - pwittrock
     - soltysh
-
   sig-cloud-provider-api-reviewers:
     - andrewsykim
     - cheftako
     - dims
-
   # sig-cluster-lifecycle-api-reviewers:
   #   -
   #   -
-
   sig-contribex-approvers:
     - alisondy
     - mrbobbytables
     - cblecker
     - nikhita
-
   sig-docs-approvers:
     - jimangel
     - kbhawkey
     - onlydole
     - sftim
-
   sig-node-api-reviewers:
     - dchen1107
     - derekwaynecarr
     - tallclair
     - yujuhong
     - ehashman
-
   sig-scalability-approvers:
     - mm4tt
     - wojtek-t
-
   sig-scalability-reviewers:
     - marseel
     - mborsz
     - mm4tt
     - wojtek-t
-
   sig-scheduling-api-reviewers:
     - alculquicondor
-
   sig-storage-api-reviewers:
     - deads2k
     - saad-ali
     - msau42
     - jsafrane
     - xing-yang
-
   sig-security-approvers:
     - IanColdwater
     - tabbysable
-
   sig-security-reviewers:
     - IanColdwater
     - tabbysable
-
   sig-windows-api-reviewers:
     - ddebroy
     - jayunit100
     - jsturtevant
     - marosset
-
   dep-approvers:
     - BenTheElder
     - cblecker
@@ -581,7 +535,6 @@ aliases:
     - timothysc # Cluster Lifecycle, Scheduling
     - xing-yang # Storage
     - wojtek-t # Scalability
-
   # conformance aliases https://git.k8s.io/enhancements/keps/sig-architecture/20190412-conformance-behaviors.md
   conformance-behavior-approvers:
     - smarterclayton

build/build-image/OWNERS

@@ -4,7 +4,6 @@ approvers:
   - build-image-approvers
 reviewers:
   - build-image-reviewers
-
 labels:
   - sig/release
   - area/release-eng

cluster/addons/calico-policy-controller/OWNERS

@@ -3,10 +3,10 @@
 approvers:
   - bowei
   - caseydavenport
-- fasaxc
+  #- fasaxc
 emeritus_approvers:
   - dnardo
 reviewers:
   - bowei
   - caseydavenport
-- fasaxc
+  #- fasaxc

cluster/images/OWNERS

@@ -2,6 +2,5 @@
 
 reviewers:
   - justaugustus
-
 labels:
   - area/release-eng

cmd/kube-apiserver/OWNERS

@@ -25,6 +25,5 @@ reviewers:
 labels:
   - sig/api-machinery
   - area/apiserver
-
 emeritus_approvers:
   - nikhiljindal

cmd/kubelet/OWNERS

@@ -2,10 +2,8 @@
 
 approvers:
   - sig-node-approvers # see https://github.com/kubernetes/kubernetes/blob/master/OWNERS_ALIASES#LC220:~:text=sig%2Dnode%2Dapprovers
-
 reviewers:
   - sig-node-reviewers # see https://github.com/kubernetes/kubernetes/blob/master/OWNERS_ALIASES#LC220:~:text=sig%2Dnode%2Dreviewers
-
 labels:
   - area/kubelet
   - sig/node

cmd/yamlfmt/OWNERS

@@ -0,0 +1,4 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+approvers:
+  - dims

cmd/yamlfmt/yamlfmt.go

@@ -0,0 +1,71 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"flag"
+	"io"
+	"io/ioutil"
+	"os"
+
+	"gopkg.in/yaml.v3"
+)
+
+func main() {
+	indent := flag.Int("indent", 2, "default indent")
+	flag.Parse()
+
+	if flag.NArg() > 0 {
+		for _, path := range flag.Args() {
+			sourceYaml, err := ioutil.ReadFile(path)
+			if err != nil {
+				panic(err)
+			}
+			rootNode, err := fetchYaml(sourceYaml)
+			if err != nil {
+				panic(err)
+			}
+			writer, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
+			if err != nil {
+				panic(err)
+			}
+			err = streamYaml(writer, indent, rootNode)
+			if err != nil {
+				panic(err)
+			}
+		}
+	}
+}
+
+func fetchYaml(sourceYaml []byte) (*yaml.Node, error) {
+	rootNode := yaml.Node{}
+	err := yaml.Unmarshal(sourceYaml, &rootNode)
+	if err != nil {
+		return nil, err
+	}
+	return &rootNode, nil
+}
+
+func streamYaml(writer io.Writer, indent *int, in *yaml.Node) error {
+	encoder := yaml.NewEncoder(writer)
+	encoder.SetIndent(*indent)
+	err := encoder.Encode(in)
+	if err != nil {
+		return err
+	}
+	return encoder.Close()
+}

cmd/yamlfmt/yamlfmt_test.go

@@ -0,0 +1,52 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"bufio"
+	"bytes"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestFetchYaml(t *testing.T) {
+	sourceYaml := ` # See the OWNERS docs at https://go.k8s.io/owners
+approvers:
+- dep-approvers
+- thockin         # Network
+- liggitt
+
+labels:
+- sig/architecture
+`
+
+	outputYaml := `# See the OWNERS docs at https://go.k8s.io/owners
+approvers:
+  - dep-approvers
+  - thockin # Network
+  - liggitt
+labels:
+  - sig/architecture
+`
+	node, _ := fetchYaml([]byte(sourceYaml))
+	var output bytes.Buffer
+	indent := 2
+	writer := bufio.NewWriter(&output)
+	_ = streamYaml(writer, &indent, node)
+	_ = writer.Flush()
+	assert.Equal(t, outputYaml, string(output.Bytes()), "yaml was not formatted correctly")
+}

go.mod

@@ -100,6 +100,7 @@ require (
 	gopkg.in/gcfg.v1 v1.2.0
 	gopkg.in/square/go-jose.v2 v2.2.2
 	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 	k8s.io/api v0.0.0
 	k8s.io/apiextensions-apiserver v0.0.0
 	k8s.io/apimachinery v0.0.0

hack/update-yamlfmt.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+# Copyright 2021 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
+source "${KUBE_ROOT}/hack/lib/init.sh"
+
+kube::golang::verify_go_version
+
+cd "${KUBE_ROOT}"
+
+find_files() {
+  find . -not \( \
+      \( \
+        -wholename './output' \
+        -o -wholename './.git' \
+        -o -wholename './_output' \
+        -o -wholename './_gopath' \
+        -o -wholename './release' \
+        -o -wholename './target' \
+        -o -wholename '*/vendor/*' \
+      \) -prune \
+    \) -name 'OWNERS*'
+}
+
+find_files | xargs go run cmd/yamlfmt/yamlfmt.go

hack/verify-yamlfmt.sh

@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+# Copyright 2021 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script checks whether the OWNERS files need to be formatted or not by
+# `yamlfmt`. Run `hack/update-yamlfmt.sh` to actually format sources.
+#
+# Usage: `hack/verify-yamlfmt.sh`.
+
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
+export KUBE_ROOT
+source "${KUBE_ROOT}/hack/lib/init.sh"
+
+kube::util::ensure_clean_working_dir
+
+_tmpdir="$(kube::realpath "$(mktemp -d -t verify-generated-files.XXXXXX)")"
+
+_tmp_gopath="${_tmpdir}/go"
+_tmp_kuberoot="${_tmp_gopath}/src/k8s.io/kubernetes"
+git worktree add -f "${_tmp_kuberoot}" HEAD
+kube::util::trap_add "git worktree remove -f ${_tmp_kuberoot} && rm -rf ${_tmpdir}" EXIT
+
+find_files() {
+  pushd "${_tmp_kuberoot}" >/dev/null 2>&1
+  find "$(pwd)" -not \( \
+      \( \
+        -wholename './output' \
+        -o -wholename './.git' \
+        -o -wholename './_output' \
+        -o -wholename './_gopath' \
+        -o -wholename './release' \
+        -o -wholename './target' \
+        -o -wholename '*/vendor/*' \
+      \) -prune \
+    \) -name 'OWNERS*'
+  popd >/dev/null 2>&1
+}
+
+find_files | xargs go run cmd/yamlfmt/yamlfmt.go
+
+cd "${_tmp_kuberoot}"
+changed_files=$(git status --porcelain)
+
+if [[ -n "${changed_files}" ]]; then
+  echo "!!! OWNERS files need to be updated:" >&2
+  echo "${changed_files}" >&2
+  echo >&2
+  echo "Please run hack/update-yamlfmt.sh." >&2
+  exit 1
+fi

pkg/api/OWNERS

@@ -9,7 +9,6 @@ filters:
       - api-approvers
     reviewers:
       - api-reviewers
-
   # examples:
   #   pkg/api/types.go
   #   pkg/api/*/register.go

pkg/apis/OWNERS

@@ -9,7 +9,6 @@ filters:
       - api-approvers
     reviewers:
       - api-reviewers
-
   # examples:
   #   pkg/apis/*/types.go
   #   pkg/apis/*/*/types.go

pkg/apis/authentication/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authenticators-reviewers
 labels:
   - sig/auth
-

pkg/apis/authorization/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authorizers-reviewers
 labels:
   - sig/auth
-

pkg/apis/certificates/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-certificates-reviewers
 labels:
   - sig/auth
-

pkg/apis/imagepolicy/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-policy-reviewers
 labels:
   - sig/auth
-

pkg/apis/policy/OWNERS

@@ -8,4 +8,3 @@ reviewers:
   - sig-auth-policy-reviewers
 labels:
   - sig/auth
-

pkg/apis/rbac/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authorizers-reviewers
 labels:
   - sig/auth
-

pkg/controller/certificates/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-certificates-reviewers
 labels:
   - sig/auth
-

pkg/controller/certificates/approver/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-certificates-reviewers
 labels:
   - sig/auth
-

pkg/controller/nodeipam/OWNERS

@@ -9,6 +9,5 @@ reviewers:
   - k82cn
 labels:
   - sig/network
-
 emeritus_approvers:
   - gmarek

pkg/controller/nodelifecycle/OWNERS

@@ -8,6 +8,5 @@ reviewers:
   - ingvagabund
   - aveshagarwal
   - k82cn
-
 emeritus_approvers:
   - gmarek

pkg/controller/podgc/OWNERS

@@ -4,6 +4,5 @@ approvers:
   - foxish
 reviewers:
   - foxish
-
 emeritus_approvers:
   - gmarek

pkg/controller/serviceaccount/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-serviceaccounts-reviewers
 labels:
   - sig/auth
-

pkg/controller/statefulset/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-apps-reviewers
 labels:
   - sig/apps
-

pkg/controller/util/endpointslice/OWNERS

@@ -10,4 +10,3 @@ reviewers:
   - sig-network-reviewers
 labels:
   - sig/network
-

pkg/controlplane/OWNERS

@@ -35,6 +35,5 @@ reviewers:
   - enj
 labels:
   - sig/api-machinery
-
 emeritus_approvers:
   - nikhiljindal

pkg/kubeapiserver/authenticator/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authenticators-reviewers
 labels:
   - sig/auth
-

pkg/kubeapiserver/authorizer/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authorizers-reviewers
 labels:
   - sig/auth
-

pkg/kubelet/OWNERS

@@ -9,15 +9,12 @@ approvers:
   - sjenning
   - mrunalp
   - klueska
-
 emeritus_approvers:
   - dashpole
   - vishh
-
 reviewers:
   - sig-node-reviewers # see https://github.com/kubernetes/kubernetes/blob/master/OWNERS_ALIASES#LC220:~:text=sig%2Dnode%2Dreviewers
   - tallclair
-
 labels:
   - area/kubelet
   - sig/node

pkg/kubelet/certificate/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-certificates-reviewers
 labels:
   - sig/auth
-

pkg/kubelet/cm/cpumanager/OWNERS

@@ -6,6 +6,5 @@ approvers:
   - ConnorDoyle
 reviewers:
   - klueska
-
 emeritus_approvers:
   - balajismaniam

pkg/kubelet/cm/topologymanager/OWNERS

@@ -5,6 +5,5 @@ approvers:
   - derekwaynecarr
   - klueska
   - lmdaly
-
 reviewers:
   - nolancon

pkg/kubelet/token/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-serviceaccounts-reviewers
 labels:
   - sig/auth
-

pkg/kubemark/OWNERS

@@ -8,9 +8,7 @@ approvers:
   - shyamjvs
   - sig-scalability-approvers
   - wojtek-t
-
 emeritus_approvers:
   - gmarek
-
 labels:
   - sig/scalability

pkg/probe/OWNERS

@@ -4,6 +4,5 @@ approvers:
   - sig-node-approvers
 reviewers:
   - sig-node-reviewers
-
 labels:
   - sig/node

pkg/registry/authentication/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authenticators-reviewers
 labels:
   - sig/auth
-

pkg/registry/authorization/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authorizers-reviewers
 labels:
   - sig/auth
-

pkg/registry/certificates/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-certificates-reviewers
 labels:
   - sig/auth
-

pkg/registry/events/OWNERS

@@ -6,6 +6,5 @@ reviewers:
 approvers:
   - deads2k
   - sttts
-
 emeritus_approvers:
   - gmarek

pkg/registry/policy/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-policy-reviewers
 labels:
   - sig/auth
-

pkg/registry/rbac/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authorizers-reviewers
 labels:
   - sig/auth
-

pkg/security/podsecuritypolicy/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-policy-reviewers
 labels:
   - sig/auth
-

pkg/serviceaccount/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-serviceaccounts-reviewers
 labels:
   - sig/auth
-

pkg/volume/util/subpath/OWNERS

@@ -10,4 +10,3 @@ approvers:
   - jingxu97
   - saad-ali
   - jsafrane
-

plugin/pkg/admission/noderestriction/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-node-isolation-reviewers
 labels:
   - sig/auth
-

plugin/pkg/admission/security/podsecuritypolicy/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-policy-reviewers
 labels:
   - sig/auth
-

plugin/pkg/admission/serviceaccount/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-serviceaccounts-reviewers
 labels:
   - sig/auth
-

plugin/pkg/auth/authenticator/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authenticators-reviewers
 labels:
   - sig/auth
-

plugin/pkg/auth/authorizer/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authorizers-reviewers
 labels:
   - sig/auth
-

plugin/pkg/auth/authorizer/node/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-node-isolation-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/api/authentication/OWNERS

@@ -5,4 +5,3 @@ reviewers:
   - sig-auth-authenticators-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/api/authorization/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authorizers-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/api/imagepolicy/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-policy-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/api/policy/OWNERS

@@ -7,4 +7,3 @@ reviewers:
   - sig-auth-policy-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/api/rbac/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authorizers-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/apiserver/pkg/apis/audit/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-audit-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/apiserver/pkg/audit/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-audit-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/apiserver/pkg/authentication/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authenticators-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/apiserver/pkg/authentication/request/x509/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-certificates-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/apiserver/pkg/authorization/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authorizers-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/apiserver/pkg/endpoints/metrics/OWNERS

@@ -3,6 +3,5 @@
 reviewers:
   - wojtek-t
   - jimmidyson
-
 approvers:
   - logicalhan

staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-encryption-at-rest-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-encryption-at-rest-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/apiserver/plugin/pkg/audit/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-audit-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/apiserver/plugin/pkg/authenticator/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authenticators-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/apiserver/plugin/pkg/authorizer/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authorizers-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/client-go/kubernetes/typed/authentication/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authenticators-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/client-go/kubernetes/typed/authorization/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authorizers-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/client-go/kubernetes/typed/rbac/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authorizers-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/client-go/listers/authentication/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authenticators-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/client-go/listers/authorization/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authorizers-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/client-go/listers/rbac/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authorizers-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/client-go/pkg/apis/clientauthentication/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authenticators-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/client-go/plugin/pkg/client/auth/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authenticators-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/client-go/tools/auth/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authenticators-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/client-go/util/cert/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-certificates-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/client-go/util/certificate/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-certificates-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/client-go/util/keyutil/OWNERS

@@ -4,4 +4,3 @@ reviewers:
   - sig-auth-certificates-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/cloud-provider/controllers/route/OWNERS

@@ -9,6 +9,5 @@ reviewers:
   - wojtek-t
   - andrewsykim
   - cheftako
-
 emeritus_approvers:
   - gmarek

staging/src/k8s.io/component-base/configz/OWNERS

@@ -11,7 +11,6 @@ approvers:
   - api-approvers
 reviewers:
   - api-reviewers
-
 labels:
   - kind/api-change
   - sig/cluster-lifecycle

staging/src/k8s.io/component-base/featuregate/OWNERS

@@ -10,7 +10,6 @@ approvers:
   - api-approvers
 reviewers:
   - api-reviewers
-
 labels:
   - kind/api-change
   - sig/api-machinery

staging/src/k8s.io/component-base/term/OWNERS

@@ -7,6 +7,5 @@ approvers:
   - sig-cli-maintainers
 reviewers:
   - sig-cli
-
 labels:
   - sig/cli

staging/src/k8s.io/component-base/version/OWNERS

@@ -11,7 +11,6 @@ approvers:
 reviewers:
   - sig-api-machinery-api-reviewers
   - release-managers
-
 labels:
   - sig/api-machinery
   - sig/release

staging/src/k8s.io/cri-api/pkg/OWNERS

@@ -3,13 +3,10 @@
 # Disable inheritance as this is owned by sig-node (should mirror same contents as pkg/kubelet/OWNERS)
 options:
   no_parent_owners: true
-
 approvers:
   - sig-node-approvers # see https://github.com/kubernetes/kubernetes/blob/master/OWNERS_ALIASES#LC220:~:text=sig%2Dnode%2Dapprovers
-
 reviewers:
   - sig-node-reviewers # see https://github.com/kubernetes/kubernetes/blob/master/OWNERS_ALIASES#LC220:~:text=sig%2Dnode%2Dreviewers
-
 labels:
   - area/kubelet
   - sig/node

staging/src/k8s.io/csi-translation-lib/OWNERS

@@ -7,11 +7,9 @@ reviewers:
   - ddebroy
   - leakingtapan
   - andyzhangx
-
 approvers:
   - davidz627
   - saad-ali
   - msau42
-
 labels:
   - sig/storage

staging/src/k8s.io/kubectl/pkg/cmd/auth/OWNERS

@@ -6,4 +6,3 @@ reviewers:
   - sig-auth-authorizers-reviewers
 labels:
   - sig/auth
-

staging/src/k8s.io/mount-utils/OWNERS

@@ -11,6 +11,5 @@ approvers:
   - jingxu97
   - saad-ali
   - jsafrane
-
 labels:
   - sig/storage

test/OWNERS

@@ -47,7 +47,6 @@ emeritus_approvers:
   - ncdc
   - vishh
   - shyamjvs
-
 labels:
   - area/test
   - sig/testing

test/e2e/cloud/gcp/OWNERS

@@ -6,6 +6,5 @@ approvers:
 reviewers:
   - cheftako
   - justinsb
-
 labels:
   - sig/cloud-provider

test/e2e/storage/OWNERS

@@ -9,7 +9,6 @@ reviewers:
   - pohly
 labels:
   - sig/storage
-
 emeritus_reviewers:
   - rootfs
   - davidz627

test/e2e_node/perf/workloads/OWNERS

@@ -6,6 +6,5 @@ approvers:
   - ConnorDoyle
 reviewers:
   - sig-node-reviewers
-
 emeritus_approvers:
   - balajismaniam

vendor/modules.txt

@@ -1242,6 +1242,7 @@ gopkg.in/warnings.v0
 ## explicit
 gopkg.in/yaml.v2
 # gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b => gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+## explicit
 gopkg.in/yaml.v3
 # k8s.io/api v0.0.0 => ./staging/src/k8s.io/api
 ## explicit