From 89a0511fcb22caf23427587c026952b2a387f293 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Wed, 4 Oct 2017 16:54:08 -0700 Subject: [PATCH 1/2] move initializer to the generic apiserver move k8s.io/kubernetes/plugin/pkg/admission/initialization to k8s.io/apiserver/pkg/admission/plugin/initialization/initialization.go; move k8s.io/kubernetes/pkg/kubeapiserver/admission/configuration to k8s.io/apiserver/pkg/admission/configuration. --- .../app/options/options_test.go | 3 ++- cmd/kube-apiserver/app/options/plugins.go | 2 -- .../cmd/federation-apiserver/app/plugins.go | 2 -- plugin/pkg/admission/webhook/admission.go | 2 +- .../pkg}/admission/configuration/BUILD | 0 .../configuration/configuration_manager.go | 0 .../configuration_manager_test.go | 0 .../external_admission_hook_manager.go | 0 .../external_admission_hook_manager_test.go | 0 .../configuration/initializer_manager.go | 0 .../configuration/initializer_manager_test.go | 0 .../admission/plugin}/initialization/BUILD | 0 .../plugin}/initialization/initialization.go | 20 ++++++++++++++----- .../initialization/initialization_test.go | 0 .../apiserver/pkg/server/options/admission.go | 4 +++- .../pkg/server/options/admission_test.go | 2 +- .../k8s.io/apiserver/pkg/server/plugins.go | 2 ++ 17 files changed, 24 insertions(+), 13 deletions(-) rename {pkg/kubeapiserver => staging/src/k8s.io/apiserver/pkg}/admission/configuration/BUILD (100%) rename {pkg/kubeapiserver => staging/src/k8s.io/apiserver/pkg}/admission/configuration/configuration_manager.go (100%) rename {pkg/kubeapiserver => staging/src/k8s.io/apiserver/pkg}/admission/configuration/configuration_manager_test.go (100%) rename {pkg/kubeapiserver => staging/src/k8s.io/apiserver/pkg}/admission/configuration/external_admission_hook_manager.go (100%) rename {pkg/kubeapiserver => staging/src/k8s.io/apiserver/pkg}/admission/configuration/external_admission_hook_manager_test.go (100%) rename {pkg/kubeapiserver => staging/src/k8s.io/apiserver/pkg}/admission/configuration/initializer_manager.go (100%) rename {pkg/kubeapiserver => staging/src/k8s.io/apiserver/pkg}/admission/configuration/initializer_manager_test.go (100%) rename {plugin/pkg/admission => staging/src/k8s.io/apiserver/pkg/admission/plugin}/initialization/BUILD (100%) rename {plugin/pkg/admission => staging/src/k8s.io/apiserver/pkg/admission/plugin}/initialization/initialization.go (95%) rename {plugin/pkg/admission => staging/src/k8s.io/apiserver/pkg/admission/plugin}/initialization/initialization_test.go (100%) diff --git a/cmd/kube-apiserver/app/options/options_test.go b/cmd/kube-apiserver/app/options/options_test.go index 14bacec9a49..591a73633a2 100644 --- a/cmd/kube-apiserver/app/options/options_test.go +++ b/cmd/kube-apiserver/app/options/options_test.go @@ -103,7 +103,8 @@ func TestAddFlags(t *testing.T) { MinRequestTimeout: 1800, }, Admission: &apiserveroptions.AdmissionOptions{ - RecommendedPluginOrder: []string{"NamespaceLifecycle"}, + RecommendedPluginOrder: []string{"NamespaceLifecycle", "Initializers"}, + DefaultOffPlugins: []string{"Initializers"}, PluginNames: []string{"AlwaysDeny"}, ConfigFile: "/admission-control-config", Plugins: s.Admission.Plugins, diff --git a/cmd/kube-apiserver/app/options/plugins.go b/cmd/kube-apiserver/app/options/plugins.go index 0e86e7cfdb5..8656eb157ce 100644 --- a/cmd/kube-apiserver/app/options/plugins.go +++ b/cmd/kube-apiserver/app/options/plugins.go @@ -34,7 +34,6 @@ import ( "k8s.io/kubernetes/plugin/pkg/admission/exec" "k8s.io/kubernetes/plugin/pkg/admission/gc" "k8s.io/kubernetes/plugin/pkg/admission/imagepolicy" - "k8s.io/kubernetes/plugin/pkg/admission/initialization" "k8s.io/kubernetes/plugin/pkg/admission/initialresources" "k8s.io/kubernetes/plugin/pkg/admission/limitranger" "k8s.io/kubernetes/plugin/pkg/admission/namespace/autoprovision" @@ -65,7 +64,6 @@ func RegisterAllAdmissionPlugins(plugins *admission.Plugins) { exec.Register(plugins) gc.Register(plugins) imagepolicy.Register(plugins) - initialization.Register(plugins) initialresources.Register(plugins) limitranger.Register(plugins) autoprovision.Register(plugins) diff --git a/federation/cmd/federation-apiserver/app/plugins.go b/federation/cmd/federation-apiserver/app/plugins.go index f8891540354..a10a3edbabe 100644 --- a/federation/cmd/federation-apiserver/app/plugins.go +++ b/federation/cmd/federation-apiserver/app/plugins.go @@ -29,7 +29,6 @@ import ( "k8s.io/kubernetes/plugin/pkg/admission/admit" "k8s.io/kubernetes/plugin/pkg/admission/deny" "k8s.io/kubernetes/plugin/pkg/admission/gc" - "k8s.io/kubernetes/plugin/pkg/admission/initialization" ) // RegisterAllAdmissionPlugins registers all admission plugins @@ -37,6 +36,5 @@ func RegisterAllAdmissionPlugins(plugins *admission.Plugins) { admit.Register(plugins) deny.Register(plugins) gc.Register(plugins) - initialization.Register(plugins) schedulingpolicy.Register(plugins) } diff --git a/plugin/pkg/admission/webhook/admission.go b/plugin/pkg/admission/webhook/admission.go index f6642439144..5037a3dfd8c 100644 --- a/plugin/pkg/admission/webhook/admission.go +++ b/plugin/pkg/admission/webhook/admission.go @@ -38,13 +38,13 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" + "k8s.io/apiserver/pkg/admission/configuration" genericadmissioninit "k8s.io/apiserver/pkg/admission/initializer" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" admissionv1alpha1helper "k8s.io/kubernetes/pkg/apis/admission/v1alpha1" admissioninit "k8s.io/kubernetes/pkg/kubeapiserver/admission" - "k8s.io/kubernetes/pkg/kubeapiserver/admission/configuration" // install the clientgo admission API for use with api registry _ "k8s.io/kubernetes/pkg/apis/admission/install" diff --git a/pkg/kubeapiserver/admission/configuration/BUILD b/staging/src/k8s.io/apiserver/pkg/admission/configuration/BUILD similarity index 100% rename from pkg/kubeapiserver/admission/configuration/BUILD rename to staging/src/k8s.io/apiserver/pkg/admission/configuration/BUILD diff --git a/pkg/kubeapiserver/admission/configuration/configuration_manager.go b/staging/src/k8s.io/apiserver/pkg/admission/configuration/configuration_manager.go similarity index 100% rename from pkg/kubeapiserver/admission/configuration/configuration_manager.go rename to staging/src/k8s.io/apiserver/pkg/admission/configuration/configuration_manager.go diff --git a/pkg/kubeapiserver/admission/configuration/configuration_manager_test.go b/staging/src/k8s.io/apiserver/pkg/admission/configuration/configuration_manager_test.go similarity index 100% rename from pkg/kubeapiserver/admission/configuration/configuration_manager_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/configuration/configuration_manager_test.go diff --git a/pkg/kubeapiserver/admission/configuration/external_admission_hook_manager.go b/staging/src/k8s.io/apiserver/pkg/admission/configuration/external_admission_hook_manager.go similarity index 100% rename from pkg/kubeapiserver/admission/configuration/external_admission_hook_manager.go rename to staging/src/k8s.io/apiserver/pkg/admission/configuration/external_admission_hook_manager.go diff --git a/pkg/kubeapiserver/admission/configuration/external_admission_hook_manager_test.go b/staging/src/k8s.io/apiserver/pkg/admission/configuration/external_admission_hook_manager_test.go similarity index 100% rename from pkg/kubeapiserver/admission/configuration/external_admission_hook_manager_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/configuration/external_admission_hook_manager_test.go diff --git a/pkg/kubeapiserver/admission/configuration/initializer_manager.go b/staging/src/k8s.io/apiserver/pkg/admission/configuration/initializer_manager.go similarity index 100% rename from pkg/kubeapiserver/admission/configuration/initializer_manager.go rename to staging/src/k8s.io/apiserver/pkg/admission/configuration/initializer_manager.go diff --git a/pkg/kubeapiserver/admission/configuration/initializer_manager_test.go b/staging/src/k8s.io/apiserver/pkg/admission/configuration/initializer_manager_test.go similarity index 100% rename from pkg/kubeapiserver/admission/configuration/initializer_manager_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/configuration/initializer_manager_test.go diff --git a/plugin/pkg/admission/initialization/BUILD b/staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization/BUILD similarity index 100% rename from plugin/pkg/admission/initialization/BUILD rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization/BUILD diff --git a/plugin/pkg/admission/initialization/initialization.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization/initialization.go similarity index 95% rename from plugin/pkg/admission/initialization/initialization.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization/initialization.go index a105fc012f4..e536e290dfb 100644 --- a/plugin/pkg/admission/initialization/initialization.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization/initialization.go @@ -24,6 +24,7 @@ import ( "github.com/golang/glog" "k8s.io/api/admissionregistration/v1alpha1" + "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/validation" @@ -32,17 +33,21 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/admission" + "k8s.io/apiserver/pkg/admission/configuration" "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/features" utilfeature "k8s.io/apiserver/pkg/util/feature" clientset "k8s.io/client-go/kubernetes" - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/kubeapiserver/admission/configuration" +) + +const ( + // Name of admission plug-in + PluginName = "Initializers" ) // Register registers a plugin func Register(plugins *admission.Plugins) { - plugins.Register("Initializers", func(config io.Reader) (admission.Interface, error) { + plugins.Register(PluginName, func(config io.Reader) (admission.Interface, error) { return NewInitializer(), nil }) } @@ -183,8 +188,13 @@ func (i *initializer) Admit(a admission.Attributes) (err error) { // Mirror pods are exempt from initialization because they are created and initialized // on the Kubelet before they appear in the API. // TODO: once this moves to REST storage layer, this becomes a pod specific concern - if pod, ok := a.GetObject().(*api.Pod); ok && pod != nil { - if _, isMirror := pod.Annotations[api.MirrorPodAnnotationKey]; isMirror { + if a.GetKind().GroupKind() == v1.SchemeGroupVersion.WithKind("Pod").GroupKind() { + accessor, err := meta.Accessor(a.GetObject()) + if err != nil { + return err + } + annotations := accessor.GetAnnotations() + if _, isMirror := annotations[v1.MirrorPodAnnotationKey]; isMirror { return nil } } diff --git a/plugin/pkg/admission/initialization/initialization_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization/initialization_test.go similarity index 100% rename from plugin/pkg/admission/initialization/initialization_test.go rename to staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization/initialization_test.go 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 5b3e3ab3f40..3bdd0bdcfa8 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/admission.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/admission.go @@ -23,6 +23,7 @@ import ( "github.com/spf13/pflag" "k8s.io/apiserver/pkg/admission" "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/server" "k8s.io/client-go/informers" @@ -53,7 +54,8 @@ func NewAdmissionOptions() *AdmissionOptions { options := &AdmissionOptions{ Plugins: &admission.Plugins{}, PluginNames: []string{}, - RecommendedPluginOrder: []string{lifecycle.PluginName}, + RecommendedPluginOrder: []string{lifecycle.PluginName, initialization.PluginName}, + DefaultOffPlugins: []string{initialization.PluginName}, } server.RegisterAllAdmissionPlugins(options.Plugins) return options diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/admission_test.go b/staging/src/k8s.io/apiserver/pkg/server/options/admission_test.go index 0dfcbccce04..37d824eb65e 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/admission_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/admission_test.go @@ -56,7 +56,7 @@ func TestEnabledPluginNamesMethod(t *testing.T) { actualPluginNames := target.enabledPluginNames() if len(actualPluginNames) != len(scenario.expectedPluginNames) { - t.Errorf("incorrect number of items, got %d, expected = %d", len(actualPluginNames), len(scenario.expectedPluginNames)) + t.Fatalf("incorrect number of items, got %d, expected = %d", len(actualPluginNames), len(scenario.expectedPluginNames)) } for i := range actualPluginNames { if scenario.expectedPluginNames[i] != actualPluginNames[i] { diff --git a/staging/src/k8s.io/apiserver/pkg/server/plugins.go b/staging/src/k8s.io/apiserver/pkg/server/plugins.go index 404e8afc4c8..c54a4f41d88 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/plugins.go +++ b/staging/src/k8s.io/apiserver/pkg/server/plugins.go @@ -19,10 +19,12 @@ package server // This file exists to force the desired plugin implementations to be linked into genericapi pkg. import ( "k8s.io/apiserver/pkg/admission" + "k8s.io/apiserver/pkg/admission/plugin/initialization" "k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle" ) // RegisterAllAdmissionPlugins registers all admission plugins func RegisterAllAdmissionPlugins(plugins *admission.Plugins) { lifecycle.Register(plugins) + initialization.Register(plugins) } From bbac32c299eb0660e89870a7fbc698c79af04b51 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Wed, 4 Oct 2017 17:27:09 -0700 Subject: [PATCH 2/2] generated --- cmd/kube-apiserver/app/options/BUILD | 1 - federation/cmd/federation-apiserver/app/BUILD | 1 - hack/.golint_failures | 4 ++-- pkg/kubeapiserver/admission/BUILD | 1 - plugin/BUILD | 1 - plugin/pkg/admission/webhook/BUILD | 2 +- .../src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json | 8 ++++++++ staging/src/k8s.io/apiserver/pkg/admission/BUILD | 2 ++ .../apiserver/pkg/admission/plugin/initialization/BUILD | 4 ++-- staging/src/k8s.io/apiserver/pkg/server/BUILD | 1 + staging/src/k8s.io/apiserver/pkg/server/options/BUILD | 1 + staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json | 8 ++++++++ staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json | 8 ++++++++ 13 files changed, 33 insertions(+), 9 deletions(-) diff --git a/cmd/kube-apiserver/app/options/BUILD b/cmd/kube-apiserver/app/options/BUILD index c584bb6729b..76b1bbebc76 100644 --- a/cmd/kube-apiserver/app/options/BUILD +++ b/cmd/kube-apiserver/app/options/BUILD @@ -31,7 +31,6 @@ go_library( "//plugin/pkg/admission/exec:go_default_library", "//plugin/pkg/admission/gc:go_default_library", "//plugin/pkg/admission/imagepolicy:go_default_library", - "//plugin/pkg/admission/initialization:go_default_library", "//plugin/pkg/admission/initialresources:go_default_library", "//plugin/pkg/admission/limitranger:go_default_library", "//plugin/pkg/admission/namespace/autoprovision:go_default_library", diff --git a/federation/cmd/federation-apiserver/app/BUILD b/federation/cmd/federation-apiserver/app/BUILD index 313e9369b0c..140386630b9 100644 --- a/federation/cmd/federation-apiserver/app/BUILD +++ b/federation/cmd/federation-apiserver/app/BUILD @@ -61,7 +61,6 @@ go_library( "//plugin/pkg/admission/admit:go_default_library", "//plugin/pkg/admission/deny:go_default_library", "//plugin/pkg/admission/gc:go_default_library", - "//plugin/pkg/admission/initialization:go_default_library", "//vendor/github.com/go-openapi/spec:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/hack/.golint_failures b/hack/.golint_failures index c30b9d49801..c240e3c0661 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -185,7 +185,6 @@ pkg/credentialprovider/rancher pkg/features pkg/kubeapiserver pkg/kubeapiserver/admission -pkg/kubeapiserver/admission/configuration pkg/kubeapiserver/authenticator pkg/kubeapiserver/authorizer pkg/kubeapiserver/authorizer/modes @@ -453,7 +452,6 @@ plugin/cmd/kube-scheduler/app plugin/pkg/admission/antiaffinity plugin/pkg/admission/eventratelimit/apis/eventratelimit plugin/pkg/admission/eventratelimit/apis/eventratelimit/v1alpha1 -plugin/pkg/admission/initialization plugin/pkg/admission/initialresources plugin/pkg/admission/limitranger plugin/pkg/admission/noderestriction @@ -588,6 +586,8 @@ staging/src/k8s.io/apimachinery/pkg/util/validation staging/src/k8s.io/apimachinery/pkg/util/wait staging/src/k8s.io/apimachinery/pkg/util/yaml 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/apis/apiserver staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1 diff --git a/pkg/kubeapiserver/admission/BUILD b/pkg/kubeapiserver/admission/BUILD index 5de49b24ade..0bbe69639ba 100644 --- a/pkg/kubeapiserver/admission/BUILD +++ b/pkg/kubeapiserver/admission/BUILD @@ -38,7 +38,6 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubeapiserver/admission/configuration:all-srcs", "//pkg/kubeapiserver/admission/util:all-srcs", ], tags = ["automanaged"], diff --git a/plugin/BUILD b/plugin/BUILD index f6fece455fa..106463906f0 100644 --- a/plugin/BUILD +++ b/plugin/BUILD @@ -21,7 +21,6 @@ filegroup( "//plugin/pkg/admission/exec:all-srcs", "//plugin/pkg/admission/gc:all-srcs", "//plugin/pkg/admission/imagepolicy:all-srcs", - "//plugin/pkg/admission/initialization:all-srcs", "//plugin/pkg/admission/initialresources:all-srcs", "//plugin/pkg/admission/limitranger:all-srcs", "//plugin/pkg/admission/namespace/autoprovision:all-srcs", diff --git a/plugin/pkg/admission/webhook/BUILD b/plugin/pkg/admission/webhook/BUILD index 79d17e4db4a..319abaa65cf 100644 --- a/plugin/pkg/admission/webhook/BUILD +++ b/plugin/pkg/admission/webhook/BUILD @@ -40,7 +40,6 @@ go_library( "//pkg/apis/admission/install:go_default_library", "//pkg/apis/admission/v1alpha1:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", - "//pkg/kubeapiserver/admission/configuration:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/admission/v1alpha1:go_default_library", "//vendor/k8s.io/api/admissionregistration/v1alpha1:go_default_library", @@ -52,6 +51,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/runtime: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/configuration:go_default_library", "//vendor/k8s.io/apiserver/pkg/admission/initializer:go_default_library", "//vendor/k8s.io/client-go/kubernetes:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", diff --git a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json index e9e92353fb2..8162afbd370 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json @@ -842,10 +842,18 @@ "ImportPath": "k8s.io/apiserver/pkg/admission", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, + { + "ImportPath": "k8s.io/apiserver/pkg/admission/configuration", + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, { "ImportPath": "k8s.io/apiserver/pkg/admission/initializer", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, + { + "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/initialization", + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, { "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/BUILD b/staging/src/k8s.io/apiserver/pkg/admission/BUILD index 8c380dd8892..0aa1466afa3 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/admission/BUILD @@ -62,7 +62,9 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", + "//staging/src/k8s.io/apiserver/pkg/admission/configuration:all-srcs", "//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", ], tags = ["automanaged"], diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization/BUILD b/staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization/BUILD index 05ecb5abaaa..4309e345feb 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization/BUILD @@ -10,10 +10,9 @@ go_library( name = "go_default_library", srcs = ["initialization.go"], deps = [ - "//pkg/api:go_default_library", - "//pkg/kubeapiserver/admission/configuration:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/api/admissionregistration/v1alpha1:go_default_library", + "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/validation:go_default_library", @@ -22,6 +21,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/validation/field: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/configuration:go_default_library", "//vendor/k8s.io/apiserver/pkg/authorization/authorizer:go_default_library", "//vendor/k8s.io/apiserver/pkg/features:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/feature:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/server/BUILD b/staging/src/k8s.io/apiserver/pkg/server/BUILD index e4ae0d1783a..c2785044f24 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/server/BUILD @@ -80,6 +80,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/validation:go_default_library", "//vendor/k8s.io/apimachinery/pkg/version:go_default_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/apis/apiserver/install:go_default_library", "//vendor/k8s.io/apiserver/pkg/audit: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 ed95665e7e3..0f2767d30de 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/server/options/BUILD @@ -29,6 +29,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apiserver/pkg/admission:go_default_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/apis/audit/v1beta1:go_default_library", "//vendor/k8s.io/apiserver/pkg/audit:go_default_library", diff --git a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json index 93c457cd91d..765fe5d00ac 100644 --- a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json @@ -810,10 +810,18 @@ "ImportPath": "k8s.io/apiserver/pkg/admission", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, + { + "ImportPath": "k8s.io/apiserver/pkg/admission/configuration", + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, { "ImportPath": "k8s.io/apiserver/pkg/admission/initializer", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, + { + "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/initialization", + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, { "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle", "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 a808dea4417..ef78da5a025 100644 --- a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json @@ -806,10 +806,18 @@ "ImportPath": "k8s.io/apiserver/pkg/admission", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, + { + "ImportPath": "k8s.io/apiserver/pkg/admission/configuration", + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, { "ImportPath": "k8s.io/apiserver/pkg/admission/initializer", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" }, + { + "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/initialization", + "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" + }, { "ImportPath": "k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle", "Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"