From 9eb664f88ab5309800a7a334833e5e8742fd9ad1 Mon Sep 17 00:00:00 2001
From: Daniel Smith <dbsmith@google.com>
Date: Wed, 2 Sep 2020 11:45:10 -0700
Subject: [PATCH] fix a few missed references

```
grep -RIl pkg/master . | xargs -n 1 sed -i 's|pkg/master|pkg/controlplane|g'
LC_ALL=C sort -o hack/.golint_failures hack/.golint_failures
```
---
 hack/.golint_failures                                         | 4 ++--
 hack/verify-api-groups.sh                                     | 2 +-
 .../src/k8s.io/apiserver/pkg/endpoints/request/requestinfo.go | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hack/.golint_failures b/hack/.golint_failures
index f5979993205..665aaedf08a 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -89,6 +89,8 @@ pkg/controller/volume/attachdetach/testing
 pkg/controller/volume/expand
 pkg/controller/volume/persistentvolume
 pkg/controller/volume/persistentvolume/config/v1alpha1
+pkg/controlplane/controller/crdregistration
+pkg/controlplane/tunneler
 pkg/features
 pkg/kubeapiserver
 pkg/kubectl/cmd/convert
@@ -109,8 +111,6 @@ pkg/kubelet/stats
 pkg/kubelet/sysctl
 pkg/kubelet/types
 pkg/kubemark
-pkg/master/controller/crdregistration
-pkg/master/tunneler
 pkg/proxy/apis/config
 pkg/proxy/apis/config/v1alpha1
 pkg/proxy/userspace
diff --git a/hack/verify-api-groups.sh b/hack/verify-api-groups.sh
index ab5a10f86a5..4199bb44f8d 100755
--- a/hack/verify-api-groups.sh
+++ b/hack/verify-api-groups.sh
@@ -95,7 +95,7 @@ packages_without_install=(
 	"k8s.io/kubernetes/pkg/apis/componentconfig" # TODO: Remove this package completely and from this list
 )
 known_version_files=(
-	"pkg/master/import_known_versions.go"
+	"pkg/controlplane/import_known_versions.go"
 )
 for expected_install_package in "${expected_install_packages[@]}"; do
 	found=0
diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/request/requestinfo.go b/staging/src/k8s.io/apiserver/pkg/endpoints/request/requestinfo.go
index 0890ae4ff1a..1f5dc28a9e1 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/request/requestinfo.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/request/requestinfo.go
@@ -77,7 +77,7 @@ var specialVerbsNoSubresources = sets.NewString("proxy")
 // this list allows the parser to distinguish between a namespace subresource, and a namespaced resource
 var namespaceSubresources = sets.NewString("status", "finalize")
 
-// NamespaceSubResourcesForTest exports namespaceSubresources for testing in pkg/master/master_test.go, so we never drift
+// NamespaceSubResourcesForTest exports namespaceSubresources for testing in pkg/controlplane/master_test.go, so we never drift
 var NamespaceSubResourcesForTest = sets.NewString(namespaceSubresources.List()...)
 
 type RequestInfoFactory struct {