Merge pull request #69080 from tanshanshan/little926

fix  golint in staging/src/k8s.io/apiserver/pkg/admission/plugin/ include namespace/lifecycle,webhook/mutating,webhook/validating
This commit is contained in:
k8s-ci-robot 2018-10-05 04:45:51 -07:00 committed by GitHub
commit 6764bc495e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 6 deletions

View File

@ -528,12 +528,9 @@ staging/src/k8s.io/apiserver/pkg/admission
staging/src/k8s.io/apiserver/pkg/admission/configuration staging/src/k8s.io/apiserver/pkg/admission/configuration
staging/src/k8s.io/apiserver/pkg/admission/initializer 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/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
staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1 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/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
staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1 staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1
staging/src/k8s.io/apiserver/pkg/apis/audit staging/src/k8s.io/apiserver/pkg/apis/audit

View File

@ -56,6 +56,7 @@ type initializerOptions struct {
Initializers []string Initializers []string
} }
// InitializationConfig specifies initialization config
type InitializationConfig interface { type InitializationConfig interface {
Run(stopCh <-chan struct{}) Run(stopCh <-chan struct{})
Initializers() (*v1alpha1.InitializerConfiguration, error) Initializers() (*v1alpha1.InitializerConfiguration, error)

View File

@ -38,7 +38,7 @@ import (
) )
const ( const (
// Name of admission plug-in // PluginName indicates the name of admission plug-in
PluginName = "NamespaceLifecycle" PluginName = "NamespaceLifecycle"
// how long a namespace stays in the force live lookup cache before expiration. // how long a namespace stays in the force live lookup cache before expiration.
forceLiveLookupTTL = 30 * time.Second forceLiveLookupTTL = 30 * time.Second
@ -72,6 +72,7 @@ type Lifecycle struct {
var _ = initializer.WantsExternalKubeInformerFactory(&Lifecycle{}) var _ = initializer.WantsExternalKubeInformerFactory(&Lifecycle{})
var _ = initializer.WantsExternalKubeClientSet(&Lifecycle{}) var _ = initializer.WantsExternalKubeClientSet(&Lifecycle{})
// Admit makes an admission decision based on the request attributes
func (l *Lifecycle) Admit(a admission.Attributes) error { func (l *Lifecycle) Admit(a admission.Attributes) error {
// prevent deletion of immortal namespaces // prevent deletion of immortal namespaces
if a.GetOperation() == admission.Delete && a.GetKind().GroupKind() == v1.SchemeGroupVersion.WithKind("Namespace").GroupKind() && l.immortalNamespaces.Has(a.GetName()) { if a.GetOperation() == admission.Delete && a.GetKind().GroupKind() == v1.SchemeGroupVersion.WithKind("Namespace").GroupKind() && l.immortalNamespaces.Has(a.GetName()) {

View File

@ -28,7 +28,7 @@ import (
) )
const ( const (
// Name of admission plug-in // PluginName indicates the name of admission plug-in
PluginName = "MutatingAdmissionWebhook" PluginName = "MutatingAdmissionWebhook"
) )

View File

@ -25,7 +25,7 @@ import (
) )
const ( const (
// Name of admission plug-in // PluginName indicates the name of admission plug-in
PluginName = "ValidatingAdmissionWebhook" PluginName = "ValidatingAdmissionWebhook"
) )