Merge pull request #94338 from JeremyShih/fix-golint-error-in-admissionregistration

fixed golint error in pkg/apis/admissionregistration/validation
This commit is contained in:
Kubernetes Prow Robot 2020-09-02 10:37:19 -07:00 committed by GitHub
commit cc14d5f3a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 3 deletions

View File

@ -8,7 +8,6 @@ pkg/apis/abac/v1beta1
pkg/apis/admission
pkg/apis/admissionregistration/v1
pkg/apis/admissionregistration/v1beta1
pkg/apis/admissionregistration/validation
pkg/apis/apps/v1
pkg/apis/apps/v1beta1
pkg/apis/apps/v1beta2

View File

@ -27,6 +27,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
return RegisterDefaults(scheme)
}
// SetDefaults_ValidatingWebhook sets defaults for webhook validating
func SetDefaults_ValidatingWebhook(obj *admissionregistrationv1.ValidatingWebhook) {
if obj.FailurePolicy == nil {
policy := admissionregistrationv1.Fail
@ -50,6 +51,7 @@ func SetDefaults_ValidatingWebhook(obj *admissionregistrationv1.ValidatingWebhoo
}
}
// SetDefaults_MutatingWebhook sets defaults for webhook mutating
func SetDefaults_MutatingWebhook(obj *admissionregistrationv1.MutatingWebhook) {
if obj.FailurePolicy == nil {
policy := admissionregistrationv1.Fail
@ -77,6 +79,7 @@ func SetDefaults_MutatingWebhook(obj *admissionregistrationv1.MutatingWebhook) {
}
}
// SetDefaults_Rule sets defaults for webhook rule
func SetDefaults_Rule(obj *admissionregistrationv1.Rule) {
if obj.Scope == nil {
s := admissionregistrationv1.AllScopes

View File

@ -21,6 +21,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
)
// GroupName is the group name used in this package
const GroupName = "admissionregistration.k8s.io"
// SchemeGroupVersion is group version used to register these objects
@ -33,7 +34,8 @@ func Resource(resource string) schema.GroupResource {
var (
localSchemeBuilder = &admissionregistrationv1.SchemeBuilder
AddToScheme = localSchemeBuilder.AddToScheme
// AddToScheme handler to add items to the schema
AddToScheme = localSchemeBuilder.AddToScheme
)
func init() {

View File

@ -27,6 +27,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
return RegisterDefaults(scheme)
}
// SetDefaults_ValidatingWebhook sets defaults for webhook validating
func SetDefaults_ValidatingWebhook(obj *admissionregistrationv1beta1.ValidatingWebhook) {
if obj.FailurePolicy == nil {
policy := admissionregistrationv1beta1.Ignore
@ -59,6 +60,7 @@ func SetDefaults_ValidatingWebhook(obj *admissionregistrationv1beta1.ValidatingW
}
}
// SetDefaults_MutatingWebhook sets defaults for webhook mutating
func SetDefaults_MutatingWebhook(obj *admissionregistrationv1beta1.MutatingWebhook) {
if obj.FailurePolicy == nil {
policy := admissionregistrationv1beta1.Ignore
@ -95,6 +97,7 @@ func SetDefaults_MutatingWebhook(obj *admissionregistrationv1beta1.MutatingWebho
}
}
// SetDefaults_Rule sets defaults for webhook rule
func SetDefaults_Rule(obj *admissionregistrationv1beta1.Rule) {
if obj.Scope == nil {
s := admissionregistrationv1beta1.AllScopes

View File

@ -21,6 +21,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
)
// GroupName is the group name used in this package
const GroupName = "admissionregistration.k8s.io"
// SchemeGroupVersion is group version used to register these objects
@ -33,7 +34,8 @@ func Resource(resource string) schema.GroupResource {
var (
localSchemeBuilder = &admissionregistrationv1beta1.SchemeBuilder
AddToScheme = localSchemeBuilder.AddToScheme
// AddToScheme handler to add items to the schema
AddToScheme = localSchemeBuilder.AddToScheme
)
func init() {

View File

@ -496,6 +496,7 @@ func validatingHasNoSideEffects(webhooks []admissionregistration.ValidatingWebho
return true
}
// ValidateValidatingWebhookConfigurationUpdate validates update of validating webhook configuration
func ValidateValidatingWebhookConfigurationUpdate(newC, oldC *admissionregistration.ValidatingWebhookConfiguration, requestGV schema.GroupVersion) field.ErrorList {
return validateValidatingWebhookConfiguration(newC, validationOptions{
requireNoSideEffects: requireNoSideEffects(requestGV) && validatingHasNoSideEffects(oldC.Webhooks),
@ -504,6 +505,7 @@ func ValidateValidatingWebhookConfigurationUpdate(newC, oldC *admissionregistrat
})
}
// ValidateMutatingWebhookConfigurationUpdate validates update of mutating webhook configuration
func ValidateMutatingWebhookConfigurationUpdate(newC, oldC *admissionregistration.MutatingWebhookConfiguration, requestGV schema.GroupVersion) field.ErrorList {
return validateMutatingWebhookConfiguration(newC, validationOptions{
requireNoSideEffects: requireNoSideEffects(requestGV) && mutatingHasNoSideEffects(oldC.Webhooks),