Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed golint error in pkg/apis/admissionregistration/validation #94338

Merged
merged 1 commit into from Sep 2, 2020
Merged

fixed golint error in pkg/apis/admissionregistration/validation #94338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion hack/.golint_failures
View file
Open in desktop
Expand Up @@ -8,7 +8,6 @@ pkg/apis/abac/v1beta1
pkg/apis/admission
pkg/apis/admissionregistration/v1
pkg/apis/admissionregistration/v1beta1
pkg/apis/admissionregistration/validation
liggitt marked this conversation as resolved.
Show resolved Hide resolved
pkg/apis/apps/v1
pkg/apis/apps/v1beta1
pkg/apis/apps/v1beta2
Expand Down
3 changes: 3 additions & 0 deletions pkg/apis/admissionregistration/v1/defaults.go
View file
Open in desktop
Expand Up @@ -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) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The name of defaulting methods is fixed and cannot be changed without also changing the generated defaulters. That is not currently planned, due to the wide ripples in all codebases that depend on generated defaults.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes on names of method are all removed now.

if obj.FailurePolicy == nil {
policy := admissionregistrationv1.Fail
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion pkg/apis/admissionregistration/v1/register.go
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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() {
Expand Down
3 changes: 3 additions & 0 deletions pkg/apis/admissionregistration/v1beta1/defaults.go
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion pkg/apis/admissionregistration/v1beta1/register.go
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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() {
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/admissionregistration/validation/validation.go
View file
Open in desktop
Expand Up @@ -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),
Expand All @@ -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),
Expand Down