diff --git a/hack/.golint_failures b/hack/.golint_failures index f9e25ee471..99b22e73c0 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -548,12 +548,9 @@ staging/src/k8s.io/apiserver/pkg/admission staging/src/k8s.io/apiserver/pkg/admission/configuration staging/src/k8s.io/apiserver/pkg/admission/initializer 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/config/apis/webhookadmission staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1 -staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/testcerts -staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/validating 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/staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization/initialization.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization/initialization.go index 1bb59da5d5..9ebd2db3f7 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization/initialization.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/initialization/initialization.go @@ -56,6 +56,7 @@ type initializerOptions struct { Initializers []string } +// InitializationConfig specifies initialization config type InitializationConfig interface { Run(stopCh <-chan struct{}) Initializers() (*v1alpha1.InitializerConfiguration, error) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go index 81c24f6a5a..ab01c0aaa7 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go @@ -38,7 +38,7 @@ import ( ) const ( - // Name of admission plug-in + // PluginName indicates the name of admission plug-in PluginName = "NamespaceLifecycle" // how long a namespace stays in the force live lookup cache before expiration. forceLiveLookupTTL = 30 * time.Second @@ -72,6 +72,7 @@ type Lifecycle struct { var _ = initializer.WantsExternalKubeInformerFactory(&Lifecycle{}) var _ = initializer.WantsExternalKubeClientSet(&Lifecycle{}) +// Admit makes an admission decision based on the request attributes func (l *Lifecycle) Admit(a admission.Attributes) error { // prevent deletion of immortal namespaces if a.GetOperation() == admission.Delete && a.GetKind().GroupKind() == v1.SchemeGroupVersion.WithKind("Namespace").GroupKind() && l.immortalNamespaces.Has(a.GetName()) { diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/plugin.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/plugin.go index f03b1b3422..33572b24b5 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/plugin.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/plugin.go @@ -28,7 +28,7 @@ import ( ) const ( - // Name of admission plug-in + // PluginName indicates the name of admission plug-in PluginName = "MutatingAdmissionWebhook" ) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/validating/plugin.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/validating/plugin.go index 8417ccffb1..7f79b9d7a0 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/validating/plugin.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/validating/plugin.go @@ -25,7 +25,7 @@ import ( ) const ( - // Name of admission plug-in + // PluginName indicates the name of admission plug-in PluginName = "ValidatingAdmissionWebhook" )