From d0e89577dbdfbf1fdf09eb88dc16c7e3aadbab02 Mon Sep 17 00:00:00 2001 From: p0lyn0mial Date: Mon, 5 Jun 2017 22:23:42 +0200 Subject: [PATCH] Simply changed the names of packages of some admission plugins. --- cmd/kube-apiserver/app/BUILD | 2 +- cmd/kube-apiserver/app/plugins.go | 10 +++++----- plugin/BUILD | 2 +- plugin/pkg/admission/podpreset/admission.go | 2 +- plugin/pkg/admission/podpreset/admission_test.go | 2 +- .../admission/security/podsecuritypolicy/admission.go | 2 +- .../security/podsecuritypolicy/admission_test.go | 2 +- .../storageclass/{default => setdefault}/BUILD | 0 .../storageclass/{default => setdefault}/admission.go | 2 +- .../{default => setdefault}/admission_test.go | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) rename plugin/pkg/admission/storageclass/{default => setdefault}/BUILD (100%) rename plugin/pkg/admission/storageclass/{default => setdefault}/admission.go (99%) rename plugin/pkg/admission/storageclass/{default => setdefault}/admission_test.go (99%) diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD index e5012da611c..440700eecdb 100644 --- a/cmd/kube-apiserver/app/BUILD +++ b/cmd/kube-apiserver/app/BUILD @@ -66,7 +66,7 @@ go_library( "//plugin/pkg/admission/security/podsecuritypolicy:go_default_library", "//plugin/pkg/admission/securitycontext/scdeny:go_default_library", "//plugin/pkg/admission/serviceaccount:go_default_library", - "//plugin/pkg/admission/storageclass/default:go_default_library", + "//plugin/pkg/admission/storageclass/setdefault:go_default_library", "//plugin/pkg/admission/webhook:go_default_library", "//plugin/pkg/auth/authenticator/token/bootstrap:go_default_library", "//vendor/github.com/go-openapi/spec:go_default_library", diff --git a/cmd/kube-apiserver/app/plugins.go b/cmd/kube-apiserver/app/plugins.go index 7f69f6b7663..1eb710036ba 100644 --- a/cmd/kube-apiserver/app/plugins.go +++ b/cmd/kube-apiserver/app/plugins.go @@ -38,16 +38,16 @@ import ( "k8s.io/kubernetes/plugin/pkg/admission/limitranger" "k8s.io/kubernetes/plugin/pkg/admission/namespace/autoprovision" "k8s.io/kubernetes/plugin/pkg/admission/namespace/exists" - noderestriction "k8s.io/kubernetes/plugin/pkg/admission/noderestriction" + "k8s.io/kubernetes/plugin/pkg/admission/noderestriction" "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/label" "k8s.io/kubernetes/plugin/pkg/admission/podnodeselector" - podpreset "k8s.io/kubernetes/plugin/pkg/admission/podpreset" + "k8s.io/kubernetes/plugin/pkg/admission/podpreset" "k8s.io/kubernetes/plugin/pkg/admission/podtolerationrestriction" "k8s.io/kubernetes/plugin/pkg/admission/resourcequota" - podsecuritypolicy "k8s.io/kubernetes/plugin/pkg/admission/security/podsecuritypolicy" + "k8s.io/kubernetes/plugin/pkg/admission/security/podsecuritypolicy" "k8s.io/kubernetes/plugin/pkg/admission/securitycontext/scdeny" "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount" - storagedefault "k8s.io/kubernetes/plugin/pkg/admission/storageclass/default" + "k8s.io/kubernetes/plugin/pkg/admission/storageclass/setdefault" "k8s.io/kubernetes/plugin/pkg/admission/webhook" ) @@ -75,6 +75,6 @@ func registerAllAdmissionPlugins(plugins *admission.Plugins) { podsecuritypolicy.Register(plugins) scdeny.Register(plugins) serviceaccount.Register(plugins) - storagedefault.Register(plugins) + setdefault.Register(plugins) webhook.Register(plugins) } diff --git a/plugin/BUILD b/plugin/BUILD index 0aaec7ece73..88d9d0e0633 100644 --- a/plugin/BUILD +++ b/plugin/BUILD @@ -36,7 +36,7 @@ filegroup( "//plugin/pkg/admission/security:all-srcs", "//plugin/pkg/admission/securitycontext/scdeny:all-srcs", "//plugin/pkg/admission/serviceaccount:all-srcs", - "//plugin/pkg/admission/storageclass/default:all-srcs", + "//plugin/pkg/admission/storageclass/setdefault:all-srcs", "//plugin/pkg/admission/webhook:all-srcs", "//plugin/pkg/auth:all-srcs", "//plugin/pkg/scheduler:all-srcs", diff --git a/plugin/pkg/admission/podpreset/admission.go b/plugin/pkg/admission/podpreset/admission.go index 4b2165d40d7..972a91f1814 100644 --- a/plugin/pkg/admission/podpreset/admission.go +++ b/plugin/pkg/admission/podpreset/admission.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package admission +package podpreset import ( "fmt" diff --git a/plugin/pkg/admission/podpreset/admission_test.go b/plugin/pkg/admission/podpreset/admission_test.go index 3f3bbb3c5a8..7cfd5c17101 100644 --- a/plugin/pkg/admission/podpreset/admission_test.go +++ b/plugin/pkg/admission/podpreset/admission_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package admission +package podpreset import ( "reflect" diff --git a/plugin/pkg/admission/security/podsecuritypolicy/admission.go b/plugin/pkg/admission/security/podsecuritypolicy/admission.go index a31f5ac189e..1a68ab3ffa7 100644 --- a/plugin/pkg/admission/security/podsecuritypolicy/admission.go +++ b/plugin/pkg/admission/security/podsecuritypolicy/admission.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package admission +package podsecuritypolicy import ( "fmt" diff --git a/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go b/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go index a3bc6d7e5ae..5c6f86d8584 100644 --- a/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go +++ b/plugin/pkg/admission/security/podsecuritypolicy/admission_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package admission +package podsecuritypolicy import ( "fmt" diff --git a/plugin/pkg/admission/storageclass/default/BUILD b/plugin/pkg/admission/storageclass/setdefault/BUILD similarity index 100% rename from plugin/pkg/admission/storageclass/default/BUILD rename to plugin/pkg/admission/storageclass/setdefault/BUILD diff --git a/plugin/pkg/admission/storageclass/default/admission.go b/plugin/pkg/admission/storageclass/setdefault/admission.go similarity index 99% rename from plugin/pkg/admission/storageclass/default/admission.go rename to plugin/pkg/admission/storageclass/setdefault/admission.go index 6ad82338373..2e218bb0eda 100644 --- a/plugin/pkg/admission/storageclass/default/admission.go +++ b/plugin/pkg/admission/storageclass/setdefault/admission.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package admission +package setdefault import ( "fmt" diff --git a/plugin/pkg/admission/storageclass/default/admission_test.go b/plugin/pkg/admission/storageclass/setdefault/admission_test.go similarity index 99% rename from plugin/pkg/admission/storageclass/default/admission_test.go rename to plugin/pkg/admission/storageclass/setdefault/admission_test.go index 207ae870bb4..487ae7f3d1c 100644 --- a/plugin/pkg/admission/storageclass/default/admission_test.go +++ b/plugin/pkg/admission/storageclass/setdefault/admission_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package admission +package setdefault import ( "testing"