diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index fec3777a0..d17ac3e5b 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -852,339 +852,339 @@ }, { "ImportPath": "k8s.io/api/admission/v1beta1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/admissionregistration/v1alpha1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/admissionregistration/v1beta1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/apps/v1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/apps/v1beta1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/apps/v1beta2", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/authentication/v1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/authentication/v1beta1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/authorization/v1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/authorization/v1beta1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/autoscaling/v1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/autoscaling/v2beta1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/batch/v1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/batch/v1beta1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/batch/v2alpha1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/certificates/v1beta1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/coordination/v1beta1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/core/v1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/events/v1beta1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/extensions/v1beta1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/networking/v1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/policy/v1beta1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/rbac/v1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/rbac/v1alpha1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/rbac/v1beta1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/scheduling/v1alpha1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/scheduling/v1beta1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/settings/v1alpha1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/storage/v1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/storage/v1alpha1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/api/storage/v1beta1", - "Rev": "70491ec73e10be2989242c913738f049a37e72c7" + "Rev": "91bfdbcf0c2cab32ec1236cee4c300793abea68a" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/equality", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/errors", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/meta", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/resource", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/validation", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/validation/path", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/fields", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/labels", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/selection", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/types", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/cache", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/clock", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/diff", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/errors", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/framer", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/intstr", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/json", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/naming", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/net", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/rand", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/runtime", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/sets", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/uuid", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/wait", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/waitgroup", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/yaml", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/version", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/pkg/watch", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", - "Rev": "d128f427fda3db9a4d1ebbf3d54b4949a3356662" + "Rev": "a7b7e4de06b2ae7e2f98c92bb5cc63b1e5b7839e" }, { "ImportPath": "k8s.io/client-go/discovery", diff --git a/pkg/server/options/admission.go b/pkg/server/options/admission.go index d28d07e95..b53c05f62 100644 --- a/pkg/server/options/admission.go +++ b/pkg/server/options/admission.go @@ -93,11 +93,13 @@ func (a *AdmissionOptions) AddFlags(fs *pflag.FlagSet) { } fs.StringSliceVar(&a.EnablePlugins, "enable-admission-plugins", a.EnablePlugins, ""+ - "admission plugins that should be enabled in addition to default enabled ones. "+ + "admission plugins that should be enabled in addition to default enabled ones ("+ + strings.Join(a.defaultEnabledPluginNames(), ", ")+"). "+ "Comma-delimited list of admission plugins: "+strings.Join(a.Plugins.Registered(), ", ")+". "+ "The order of plugins in this flag does not matter.") fs.StringSliceVar(&a.DisablePlugins, "disable-admission-plugins", a.DisablePlugins, ""+ - "admission plugins that should be disabled although they are in the default enabled plugins list. "+ + "admission plugins that should be disabled although they are in the default enabled plugins list ("+ + strings.Join(a.defaultEnabledPluginNames(), ", ")+"). "+ "Comma-delimited list of admission plugins: "+strings.Join(a.Plugins.Registered(), ", ")+". "+ "The order of plugins in this flag does not matter.") fs.StringVar(&a.ConfigFile, "admission-control-config-file", a.ConfigFile, @@ -218,3 +220,15 @@ func (a *AdmissionOptions) enabledPluginNames() []string { return orderedPlugins } + +//Return names of plugins which are enabled by default +func (a *AdmissionOptions) defaultEnabledPluginNames() []string { + defaultOnPluginNames := []string{} + for _, pluginName := range a.RecommendedPluginOrder { + if !a.DefaultOffPlugins.Has(pluginName) { + defaultOnPluginNames = append(defaultOnPluginNames, pluginName) + } + } + + return defaultOnPluginNames +}