Unverified Commit 6764bc49 authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub

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
parents 5b9eb1c7 3de8767d
...@@ -528,12 +528,9 @@ staging/src/k8s.io/apiserver/pkg/admission ...@@ -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
......
...@@ -56,6 +56,7 @@ type initializerOptions struct { ...@@ -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)
......
...@@ -38,7 +38,7 @@ import ( ...@@ -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 { ...@@ -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()) {
......
...@@ -28,7 +28,7 @@ import ( ...@@ -28,7 +28,7 @@ import (
) )
const ( const (
// Name of admission plug-in // PluginName indicates the name of admission plug-in
PluginName = "MutatingAdmissionWebhook" PluginName = "MutatingAdmissionWebhook"
) )
......
...@@ -25,7 +25,7 @@ import ( ...@@ -25,7 +25,7 @@ import (
) )
const ( const (
// Name of admission plug-in // PluginName indicates the name of admission plug-in
PluginName = "ValidatingAdmissionWebhook" PluginName = "ValidatingAdmissionWebhook"
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment