From 1f0305fe1bb2e85a342c90d3c8b1e7aacf3d47fb Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Wed, 2 Sep 2020 09:08:35 -0700 Subject: [PATCH] partial --- pkg/{master => controlplane}/BUILD | 0 pkg/{master => controlplane}/OWNERS | 0 pkg/{master => controlplane}/client_util.go | 2 +- pkg/{master => controlplane}/controller.go | 2 +- .../controller/clusterauthenticationtrust/BUILD | 0 .../cluster_authentication_trust_controller.go | 0 .../cluster_authentication_trust_controller_test.go | 0 pkg/{master => controlplane}/controller/crdregistration/BUILD | 0 .../controller/crdregistration/crdregistration_controller.go | 0 .../crdregistration/crdregistration_controller_test.go | 0 pkg/{master => controlplane}/controller_test.go | 2 +- pkg/{master => controlplane}/doc.go | 2 +- pkg/{master => controlplane}/import_known_versions.go | 2 +- pkg/{master => controlplane}/import_known_versions_test.go | 2 +- pkg/{master => controlplane}/master.go | 2 +- pkg/{master => controlplane}/master_openapi_test.go | 2 +- pkg/{master => controlplane}/master_test.go | 2 +- pkg/{master => controlplane}/reconcilers/BUILD | 0 pkg/{master => controlplane}/reconcilers/doc.go | 0 pkg/{master => controlplane}/reconcilers/endpointsadapter.go | 0 .../reconcilers/endpointsadapter_test.go | 0 pkg/{master => controlplane}/reconcilers/lease.go | 0 pkg/{master => controlplane}/reconcilers/lease_test.go | 0 pkg/{master => controlplane}/reconcilers/mastercount.go | 0 pkg/{master => controlplane}/reconcilers/none.go | 0 pkg/{master => controlplane}/reconcilers/reconcilers.go | 0 pkg/{master => controlplane}/services.go | 2 +- pkg/{master => controlplane}/storageversionhashdata/BUILD | 0 pkg/{master => controlplane}/storageversionhashdata/OWNERS | 0 pkg/{master => controlplane}/storageversionhashdata/data.go | 0 pkg/{master => controlplane}/tunneler/BUILD | 0 pkg/{master => controlplane}/tunneler/ssh.go | 0 pkg/{master => controlplane}/tunneler/ssh_test.go | 0 33 files changed, 10 insertions(+), 10 deletions(-) rename pkg/{master => controlplane}/BUILD (100%) rename pkg/{master => controlplane}/OWNERS (100%) rename pkg/{master => controlplane}/client_util.go (98%) rename pkg/{master => controlplane}/controller.go (99%) rename pkg/{master => controlplane}/controller/clusterauthenticationtrust/BUILD (100%) rename pkg/{master => controlplane}/controller/clusterauthenticationtrust/cluster_authentication_trust_controller.go (100%) rename pkg/{master => controlplane}/controller/clusterauthenticationtrust/cluster_authentication_trust_controller_test.go (100%) rename pkg/{master => controlplane}/controller/crdregistration/BUILD (100%) rename pkg/{master => controlplane}/controller/crdregistration/crdregistration_controller.go (100%) rename pkg/{master => controlplane}/controller/crdregistration/crdregistration_controller_test.go (100%) rename pkg/{master => controlplane}/controller_test.go (99%) rename pkg/{master => controlplane}/doc.go (91%) rename pkg/{master => controlplane}/import_known_versions.go (98%) rename pkg/{master => controlplane}/import_known_versions_test.go (99%) rename pkg/{master => controlplane}/master.go (99%) rename pkg/{master => controlplane}/master_openapi_test.go (99%) rename pkg/{master => controlplane}/master_test.go (99%) rename pkg/{master => controlplane}/reconcilers/BUILD (100%) rename pkg/{master => controlplane}/reconcilers/doc.go (100%) rename pkg/{master => controlplane}/reconcilers/endpointsadapter.go (100%) rename pkg/{master => controlplane}/reconcilers/endpointsadapter_test.go (100%) rename pkg/{master => controlplane}/reconcilers/lease.go (100%) rename pkg/{master => controlplane}/reconcilers/lease_test.go (100%) rename pkg/{master => controlplane}/reconcilers/mastercount.go (100%) rename pkg/{master => controlplane}/reconcilers/none.go (100%) rename pkg/{master => controlplane}/reconcilers/reconcilers.go (100%) rename pkg/{master => controlplane}/services.go (99%) rename pkg/{master => controlplane}/storageversionhashdata/BUILD (100%) rename pkg/{master => controlplane}/storageversionhashdata/OWNERS (100%) rename pkg/{master => controlplane}/storageversionhashdata/data.go (100%) rename pkg/{master => controlplane}/tunneler/BUILD (100%) rename pkg/{master => controlplane}/tunneler/ssh.go (100%) rename pkg/{master => controlplane}/tunneler/ssh_test.go (100%) diff --git a/pkg/master/BUILD b/pkg/controlplane/BUILD similarity index 100% rename from pkg/master/BUILD rename to pkg/controlplane/BUILD diff --git a/pkg/master/OWNERS b/pkg/controlplane/OWNERS similarity index 100% rename from pkg/master/OWNERS rename to pkg/controlplane/OWNERS diff --git a/pkg/master/client_util.go b/pkg/controlplane/client_util.go similarity index 98% rename from pkg/master/client_util.go rename to pkg/controlplane/client_util.go index 689e2cc3352..20bf644b3cb 100644 --- a/pkg/master/client_util.go +++ b/pkg/controlplane/client_util.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( "context" diff --git a/pkg/master/controller.go b/pkg/controlplane/controller.go similarity index 99% rename from pkg/master/controller.go rename to pkg/controlplane/controller.go index fdc9f10c19f..26336f1a2fc 100644 --- a/pkg/master/controller.go +++ b/pkg/controlplane/controller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( "context" diff --git a/pkg/master/controller/clusterauthenticationtrust/BUILD b/pkg/controlplane/controller/clusterauthenticationtrust/BUILD similarity index 100% rename from pkg/master/controller/clusterauthenticationtrust/BUILD rename to pkg/controlplane/controller/clusterauthenticationtrust/BUILD diff --git a/pkg/master/controller/clusterauthenticationtrust/cluster_authentication_trust_controller.go b/pkg/controlplane/controller/clusterauthenticationtrust/cluster_authentication_trust_controller.go similarity index 100% rename from pkg/master/controller/clusterauthenticationtrust/cluster_authentication_trust_controller.go rename to pkg/controlplane/controller/clusterauthenticationtrust/cluster_authentication_trust_controller.go diff --git a/pkg/master/controller/clusterauthenticationtrust/cluster_authentication_trust_controller_test.go b/pkg/controlplane/controller/clusterauthenticationtrust/cluster_authentication_trust_controller_test.go similarity index 100% rename from pkg/master/controller/clusterauthenticationtrust/cluster_authentication_trust_controller_test.go rename to pkg/controlplane/controller/clusterauthenticationtrust/cluster_authentication_trust_controller_test.go diff --git a/pkg/master/controller/crdregistration/BUILD b/pkg/controlplane/controller/crdregistration/BUILD similarity index 100% rename from pkg/master/controller/crdregistration/BUILD rename to pkg/controlplane/controller/crdregistration/BUILD diff --git a/pkg/master/controller/crdregistration/crdregistration_controller.go b/pkg/controlplane/controller/crdregistration/crdregistration_controller.go similarity index 100% rename from pkg/master/controller/crdregistration/crdregistration_controller.go rename to pkg/controlplane/controller/crdregistration/crdregistration_controller.go diff --git a/pkg/master/controller/crdregistration/crdregistration_controller_test.go b/pkg/controlplane/controller/crdregistration/crdregistration_controller_test.go similarity index 100% rename from pkg/master/controller/crdregistration/crdregistration_controller_test.go rename to pkg/controlplane/controller/crdregistration/crdregistration_controller_test.go diff --git a/pkg/master/controller_test.go b/pkg/controlplane/controller_test.go similarity index 99% rename from pkg/master/controller_test.go rename to pkg/controlplane/controller_test.go index a54ee417960..eb907227e0b 100644 --- a/pkg/master/controller_test.go +++ b/pkg/controlplane/controller_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( "net" diff --git a/pkg/master/doc.go b/pkg/controlplane/doc.go similarity index 91% rename from pkg/master/doc.go rename to pkg/controlplane/doc.go index 2aae50ed368..4b1c565bf3c 100644 --- a/pkg/master/doc.go +++ b/pkg/controlplane/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package master contains code for setting up and running a Kubernetes // cluster master. -package master // import "k8s.io/kubernetes/pkg/master" +package controlplane // import "k8s.io/kubernetes/pkg/master" diff --git a/pkg/master/import_known_versions.go b/pkg/controlplane/import_known_versions.go similarity index 98% rename from pkg/master/import_known_versions.go rename to pkg/controlplane/import_known_versions.go index 5c71e5fca77..0c4976fa398 100644 --- a/pkg/master/import_known_versions.go +++ b/pkg/controlplane/import_known_versions.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( // These imports are the API groups the API server will support. diff --git a/pkg/master/import_known_versions_test.go b/pkg/controlplane/import_known_versions_test.go similarity index 99% rename from pkg/master/import_known_versions_test.go rename to pkg/controlplane/import_known_versions_test.go index a5ecc7638ce..9c39f13b411 100644 --- a/pkg/master/import_known_versions_test.go +++ b/pkg/controlplane/import_known_versions_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( "reflect" diff --git a/pkg/master/master.go b/pkg/controlplane/master.go similarity index 99% rename from pkg/master/master.go rename to pkg/controlplane/master.go index faf03a21936..bb0d4de7111 100644 --- a/pkg/master/master.go +++ b/pkg/controlplane/master.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( "context" diff --git a/pkg/master/master_openapi_test.go b/pkg/controlplane/master_openapi_test.go similarity index 99% rename from pkg/master/master_openapi_test.go rename to pkg/controlplane/master_openapi_test.go index beed6be5f01..8af7b7ccbe5 100644 --- a/pkg/master/master_openapi_test.go +++ b/pkg/controlplane/master_openapi_test.go @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane // This test file is separated from master_test.go so we would be able to disable // race check for it. TestValidOpenAPISpec will became extremely slow if -race diff --git a/pkg/master/master_test.go b/pkg/controlplane/master_test.go similarity index 99% rename from pkg/master/master_test.go rename to pkg/controlplane/master_test.go index 05b64fbd688..fc0f15af945 100644 --- a/pkg/master/master_test.go +++ b/pkg/controlplane/master_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( "context" diff --git a/pkg/master/reconcilers/BUILD b/pkg/controlplane/reconcilers/BUILD similarity index 100% rename from pkg/master/reconcilers/BUILD rename to pkg/controlplane/reconcilers/BUILD diff --git a/pkg/master/reconcilers/doc.go b/pkg/controlplane/reconcilers/doc.go similarity index 100% rename from pkg/master/reconcilers/doc.go rename to pkg/controlplane/reconcilers/doc.go diff --git a/pkg/master/reconcilers/endpointsadapter.go b/pkg/controlplane/reconcilers/endpointsadapter.go similarity index 100% rename from pkg/master/reconcilers/endpointsadapter.go rename to pkg/controlplane/reconcilers/endpointsadapter.go diff --git a/pkg/master/reconcilers/endpointsadapter_test.go b/pkg/controlplane/reconcilers/endpointsadapter_test.go similarity index 100% rename from pkg/master/reconcilers/endpointsadapter_test.go rename to pkg/controlplane/reconcilers/endpointsadapter_test.go diff --git a/pkg/master/reconcilers/lease.go b/pkg/controlplane/reconcilers/lease.go similarity index 100% rename from pkg/master/reconcilers/lease.go rename to pkg/controlplane/reconcilers/lease.go diff --git a/pkg/master/reconcilers/lease_test.go b/pkg/controlplane/reconcilers/lease_test.go similarity index 100% rename from pkg/master/reconcilers/lease_test.go rename to pkg/controlplane/reconcilers/lease_test.go diff --git a/pkg/master/reconcilers/mastercount.go b/pkg/controlplane/reconcilers/mastercount.go similarity index 100% rename from pkg/master/reconcilers/mastercount.go rename to pkg/controlplane/reconcilers/mastercount.go diff --git a/pkg/master/reconcilers/none.go b/pkg/controlplane/reconcilers/none.go similarity index 100% rename from pkg/master/reconcilers/none.go rename to pkg/controlplane/reconcilers/none.go diff --git a/pkg/master/reconcilers/reconcilers.go b/pkg/controlplane/reconcilers/reconcilers.go similarity index 100% rename from pkg/master/reconcilers/reconcilers.go rename to pkg/controlplane/reconcilers/reconcilers.go diff --git a/pkg/master/services.go b/pkg/controlplane/services.go similarity index 99% rename from pkg/master/services.go rename to pkg/controlplane/services.go index 972f25c404e..ca895764b4d 100644 --- a/pkg/master/services.go +++ b/pkg/controlplane/services.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( "fmt" diff --git a/pkg/master/storageversionhashdata/BUILD b/pkg/controlplane/storageversionhashdata/BUILD similarity index 100% rename from pkg/master/storageversionhashdata/BUILD rename to pkg/controlplane/storageversionhashdata/BUILD diff --git a/pkg/master/storageversionhashdata/OWNERS b/pkg/controlplane/storageversionhashdata/OWNERS similarity index 100% rename from pkg/master/storageversionhashdata/OWNERS rename to pkg/controlplane/storageversionhashdata/OWNERS diff --git a/pkg/master/storageversionhashdata/data.go b/pkg/controlplane/storageversionhashdata/data.go similarity index 100% rename from pkg/master/storageversionhashdata/data.go rename to pkg/controlplane/storageversionhashdata/data.go diff --git a/pkg/master/tunneler/BUILD b/pkg/controlplane/tunneler/BUILD similarity index 100% rename from pkg/master/tunneler/BUILD rename to pkg/controlplane/tunneler/BUILD diff --git a/pkg/master/tunneler/ssh.go b/pkg/controlplane/tunneler/ssh.go similarity index 100% rename from pkg/master/tunneler/ssh.go rename to pkg/controlplane/tunneler/ssh.go diff --git a/pkg/master/tunneler/ssh_test.go b/pkg/controlplane/tunneler/ssh_test.go similarity index 100% rename from pkg/master/tunneler/ssh_test.go rename to pkg/controlplane/tunneler/ssh_test.go