Skip to content

Commit

Permalink
fixed golint error in pkg/apis/admissionregistration
Browse files Browse the repository at this point in the history
  • Loading branch information
joremysh committed Aug 31, 2020
1 parent 74b0476 commit 4ee5cdc
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 3 deletions.
1 change: 0 additions & 1 deletion hack/.golint_failures
Original file line number Diff line number Diff line change
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
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
Original file line number Diff line number Diff line change
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) {
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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

0 comments on commit 4ee5cdc

Please sign in to comment.