From ca8131877ad4fcab76388360e04ff9eb05af41a4 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Thu, 26 Oct 2017 14:19:49 -0700 Subject: [PATCH] remove the nesting directory webhook/webhook --- cmd/kube-apiserver/app/BUILD | 2 +- cmd/kube-apiserver/app/server.go | 2 +- hack/.golint_failures | 2 +- pkg/kubeapiserver/admission/BUILD | 4 ++-- pkg/kubeapiserver/admission/init_test.go | 2 +- pkg/kubeapiserver/admission/initializer.go | 2 +- staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json | 2 +- staging/src/k8s.io/apiserver/pkg/admission/BUILD | 2 +- .../pkg/admission/plugin/webhook/{webhook => }/BUILD | 4 ++-- .../pkg/admission/plugin/webhook/{webhook => }/admission.go | 0 .../admission/plugin/webhook/{webhook => }/admission_test.go | 0 .../admission/plugin/webhook/{webhook => }/admissionreview.go | 0 .../admission/plugin/webhook/{webhook => }/authentication.go | 0 .../plugin/webhook/{webhook => }/authentication_test.go | 0 .../pkg/admission/plugin/webhook/{webhook => }/certs_test.go | 0 .../pkg/admission/plugin/webhook/{webhook => }/config.go | 0 .../pkg/admission/plugin/webhook/{webhook => }/doc.go | 0 .../pkg/admission/plugin/webhook/{webhook => }/gencerts.sh | 0 .../pkg/admission/plugin/webhook/{webhook => }/rules.go | 0 .../pkg/admission/plugin/webhook/{webhook => }/rules_test.go | 0 .../admission/plugin/webhook/{webhook => }/serviceresolver.go | 0 .../plugin/webhook/{webhook => }/serviceresolver_test.go | 0 staging/src/k8s.io/apiserver/pkg/server/BUILD | 2 +- staging/src/k8s.io/apiserver/pkg/server/options/BUILD | 2 +- staging/src/k8s.io/apiserver/pkg/server/options/admission.go | 2 +- staging/src/k8s.io/apiserver/pkg/server/plugins.go | 2 +- staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json | 2 +- staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json | 2 +- 28 files changed, 17 insertions(+), 17 deletions(-) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/{webhook => }/BUILD (95%) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/{webhook => }/admission.go (100%) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/{webhook => }/admission_test.go (100%) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/{webhook => }/admissionreview.go (100%) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/{webhook => }/authentication.go (100%) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/{webhook => }/authentication_test.go (100%) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/{webhook => }/certs_test.go (100%) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/{webhook => }/config.go (100%) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/{webhook => }/doc.go (100%) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/{webhook => }/gencerts.sh (100%) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/{webhook => }/rules.go (100%) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/{webhook => }/rules_test.go (100%) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/{webhook => }/serviceresolver.go (100%) rename staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/{webhook => }/serviceresolver_test.go (100%) diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD index fa5fdda3fd0..9578945265a 100644 --- a/cmd/kube-apiserver/app/BUILD +++ b/cmd/kube-apiserver/app/BUILD @@ -59,7 +59,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/apiserver/pkg/admission:go_default_library", - "//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook:go_default_library", + "//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook:go_default_library", "//vendor/k8s.io/apiserver/pkg/authentication/authenticator:go_default_library", "//vendor/k8s.io/apiserver/pkg/authorization/authorizer:go_default_library", "//vendor/k8s.io/apiserver/pkg/server:go_default_library", diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index a018365f5ff..b594e26dee0 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -44,7 +44,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" utilwait "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" - "k8s.io/apiserver/pkg/admission/plugin/webhook/webhook" + "k8s.io/apiserver/pkg/admission/plugin/webhook" "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authorization/authorizer" genericapiserver "k8s.io/apiserver/pkg/server" diff --git a/hack/.golint_failures b/hack/.golint_failures index 518e188b15a..0a95290f06a 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -534,7 +534,7 @@ staging/src/k8s.io/apiserver/pkg/admission staging/src/k8s.io/apiserver/pkg/admission/configuration staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle -staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook +staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook staging/src/k8s.io/apiserver/pkg/apis/apiserver staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1 staging/src/k8s.io/apiserver/pkg/apis/audit diff --git a/pkg/kubeapiserver/admission/BUILD b/pkg/kubeapiserver/admission/BUILD index e4d780ec59a..25880122a92 100644 --- a/pkg/kubeapiserver/admission/BUILD +++ b/pkg/kubeapiserver/admission/BUILD @@ -13,7 +13,7 @@ go_test( library = ":go_default_library", deps = [ "//vendor/k8s.io/apiserver/pkg/admission:go_default_library", - "//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook:go_default_library", + "//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook:go_default_library", ], ) @@ -27,7 +27,7 @@ go_library( "//pkg/quota:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//vendor/k8s.io/apiserver/pkg/admission:go_default_library", - "//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook:go_default_library", + "//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook:go_default_library", "//vendor/k8s.io/apiserver/pkg/authorization/authorizer:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", ], diff --git a/pkg/kubeapiserver/admission/init_test.go b/pkg/kubeapiserver/admission/init_test.go index ae0077292ef..b1b2c1e90dc 100644 --- a/pkg/kubeapiserver/admission/init_test.go +++ b/pkg/kubeapiserver/admission/init_test.go @@ -21,7 +21,7 @@ import ( "testing" "k8s.io/apiserver/pkg/admission" - "k8s.io/apiserver/pkg/admission/plugin/webhook/webhook" + "k8s.io/apiserver/pkg/admission/plugin/webhook" ) type doNothingAdmission struct{} diff --git a/pkg/kubeapiserver/admission/initializer.go b/pkg/kubeapiserver/admission/initializer.go index 551c2314b5e..2906a33cad2 100644 --- a/pkg/kubeapiserver/admission/initializer.go +++ b/pkg/kubeapiserver/admission/initializer.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apiserver/pkg/admission" - "k8s.io/apiserver/pkg/admission/plugin/webhook/webhook" + "k8s.io/apiserver/pkg/admission/plugin/webhook" "k8s.io/apiserver/pkg/authorization/authorizer" clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" diff --git a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json index 66a5f116f42..f1e2078d1ba 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json @@ -867,7 +867,7 @@ "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { - "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/webhook", + "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { diff --git a/staging/src/k8s.io/apiserver/pkg/admission/BUILD b/staging/src/k8s.io/apiserver/pkg/admission/BUILD index 294e34eafa0..761a7b14957 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/admission/BUILD @@ -68,7 +68,7 @@ filegroup( "//staging/src/k8s.io/apiserver/pkg/admission/initializer:all-srcs", "//staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization:all-srcs", "//staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle:all-srcs", - "//staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook:all-srcs", + "//staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook:all-srcs", ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/BUILD b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/BUILD similarity index 95% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/BUILD rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/BUILD index 78d3909277d..5a29c15d29a 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/BUILD @@ -11,7 +11,7 @@ go_library( "rules.go", "serviceresolver.go", ], - importpath = "k8s.io/apiserver/pkg/admission/plugin/webhook/webhook", + importpath = "k8s.io/apiserver/pkg/admission/plugin/webhook", visibility = ["//visibility:public"], deps = [ "//vendor/github.com/golang/glog:go_default_library", @@ -44,7 +44,7 @@ go_test( "rules_test.go", "serviceresolver_test.go", ], - importpath = "k8s.io/apiserver/pkg/admission/plugin/webhook/webhook", + importpath = "k8s.io/apiserver/pkg/admission/plugin/webhook", library = ":go_default_library", deps = [ "//vendor/k8s.io/api/admission/v1alpha1:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/admission.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/admission.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/admission.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/admission.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/admission_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/admission_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/admission_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/admission_test.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/admissionreview.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/admissionreview.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/admissionreview.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/admissionreview.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/authentication.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/authentication.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/authentication.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/authentication.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/authentication_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/authentication_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/authentication_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/authentication_test.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/certs_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/certs_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/certs_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/certs_test.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/config.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/config.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/doc.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/doc.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/doc.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/doc.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/gencerts.sh b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/gencerts.sh similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/gencerts.sh rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/gencerts.sh diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/rules.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/rules.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/rules.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/rules.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/rules_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/rules_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/rules_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/rules_test.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/serviceresolver.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/serviceresolver.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/serviceresolver.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/serviceresolver.go diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/serviceresolver_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/serviceresolver_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook/serviceresolver_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/serviceresolver_test.go diff --git a/staging/src/k8s.io/apiserver/pkg/server/BUILD b/staging/src/k8s.io/apiserver/pkg/server/BUILD index 77a1caaa5fd..3d56d3a2664 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/server/BUILD @@ -85,7 +85,7 @@ go_library( "//vendor/k8s.io/apiserver/pkg/admission:go_default_library", "//vendor/k8s.io/apiserver/pkg/admission/plugin/initialization:go_default_library", "//vendor/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle:go_default_library", - "//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook:go_default_library", + "//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook:go_default_library", "//vendor/k8s.io/apiserver/pkg/apis/apiserver/install:go_default_library", "//vendor/k8s.io/apiserver/pkg/audit:go_default_library", "//vendor/k8s.io/apiserver/pkg/audit/policy:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/BUILD b/staging/src/k8s.io/apiserver/pkg/server/options/BUILD index 422e9a22cfc..6672d1a5cc0 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/server/options/BUILD @@ -32,7 +32,7 @@ go_library( "//vendor/k8s.io/apiserver/pkg/admission/initializer:go_default_library", "//vendor/k8s.io/apiserver/pkg/admission/plugin/initialization:go_default_library", "//vendor/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle:go_default_library", - "//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/webhook:go_default_library", + "//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook:go_default_library", "//vendor/k8s.io/apiserver/pkg/apis/audit/v1beta1:go_default_library", "//vendor/k8s.io/apiserver/pkg/audit:go_default_library", "//vendor/k8s.io/apiserver/pkg/audit/policy:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/admission.go b/staging/src/k8s.io/apiserver/pkg/server/options/admission.go index 184afdbe888..601a26d23aa 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/admission.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/admission.go @@ -26,7 +26,7 @@ import ( "k8s.io/apiserver/pkg/admission/initializer" "k8s.io/apiserver/pkg/admission/plugin/initialization" "k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle" - "k8s.io/apiserver/pkg/admission/plugin/webhook/webhook" + "k8s.io/apiserver/pkg/admission/plugin/webhook" "k8s.io/apiserver/pkg/server" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" diff --git a/staging/src/k8s.io/apiserver/pkg/server/plugins.go b/staging/src/k8s.io/apiserver/pkg/server/plugins.go index 99ed7e89136..e744c8ae2a0 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/plugins.go +++ b/staging/src/k8s.io/apiserver/pkg/server/plugins.go @@ -21,7 +21,7 @@ import ( "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission/plugin/initialization" "k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle" - "k8s.io/apiserver/pkg/admission/plugin/webhook/webhook" + "k8s.io/apiserver/pkg/admission/plugin/webhook" ) // RegisterAllAdmissionPlugins registers all admission plugins diff --git a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json index c33a5028a4e..97568ddeb2b 100644 --- a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json @@ -835,7 +835,7 @@ "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { - "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/webhook", + "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { diff --git a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json index cf8e793bcc1..53f68ce2b05 100644 --- a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json @@ -831,7 +831,7 @@ "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, { - "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook/webhook", + "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/webhook", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, {