@@ -212,10 +212,7 @@ func (cv1 *HookConfigV1) ConvertAndCheck(c *HookConfig) error {
212212 return fmt .Errorf ("invalid kubernetesValidating config [%d]: %w" , i , err )
213213 }
214214
215- validating , err := convertValidating (rawValidating )
216- if err != nil {
217- return err
218- }
215+ validating := convertValidating (rawValidating )
219216
220217 c .KubernetesValidating = append (c .KubernetesValidating , validating )
221218 }
@@ -237,10 +234,7 @@ func (cv1 *HookConfigV1) ConvertAndCheck(c *HookConfig) error {
237234 return fmt .Errorf ("invalid kubernetesMutating config [%d]: %w" , i , err )
238235 }
239236
240- mutating , err := convertMutating (rawMutating )
241- if err != nil {
242- return err
243- }
237+ mutating := convertMutating (rawMutating )
244238
245239 c .KubernetesMutating = append (c .KubernetesMutating , mutating )
246240 }
@@ -421,7 +415,7 @@ func (cv1 *HookConfigV1) CheckAdmission(kubeConfigs []htypes.OnKubernetesEventCo
421415 return allErr
422416}
423417
424- func convertValidating (cfgV1 KubernetesAdmissionConfigV1 ) ( htypes.ValidatingConfig , error ) {
418+ func convertValidating (cfgV1 KubernetesAdmissionConfigV1 ) htypes.ValidatingConfig {
425419 cfg := htypes.ValidatingConfig {}
426420
427421 cfg .Group = cfgV1 .Group
@@ -435,23 +429,28 @@ func convertValidating(cfgV1 KubernetesAdmissionConfigV1) (htypes.ValidatingConf
435429 Name : cfgV1 .Name ,
436430 Rules : cfgV1 .Rules ,
437431 }
432+
438433 if cfgV1 .Namespace != nil {
439434 webhook .NamespaceSelector = cfgV1 .Namespace .LabelSelector
440435 }
436+
441437 if cfgV1 .LabelSelector != nil {
442438 webhook .ObjectSelector = cfgV1 .LabelSelector
443439 }
440+
444441 if cfgV1 .FailurePolicy != nil {
445442 webhook .FailurePolicy = cfgV1 .FailurePolicy
446443 } else {
447444 defaultFailurePolicy := v1 .FailurePolicyType (app .ValidatingWebhookSettings .DefaultFailurePolicy )
448445 webhook .FailurePolicy = & defaultFailurePolicy
449446 }
447+
450448 if cfgV1 .SideEffects != nil {
451449 webhook .SideEffects = cfgV1 .SideEffects
452450 } else {
453451 webhook .SideEffects = & DefaultSideEffects
454452 }
453+
455454 if cfgV1 .TimeoutSeconds != nil {
456455 webhook .TimeoutSeconds = cfgV1 .TimeoutSeconds
457456 } else {
@@ -463,13 +462,14 @@ func convertValidating(cfgV1 KubernetesAdmissionConfigV1) (htypes.ValidatingConf
463462 cfg .Webhook = & admission.ValidatingWebhookConfig {
464463 ValidatingWebhook : webhook ,
465464 }
465+
466466 cfg .Webhook .Metadata .LogLabels = map [string ]string {}
467467 cfg .Webhook .Metadata .MetricLabels = map [string ]string {}
468468
469- return cfg , nil
469+ return cfg
470470}
471471
472- func convertMutating (cfgV1 KubernetesAdmissionConfigV1 ) ( htypes.MutatingConfig , error ) {
472+ func convertMutating (cfgV1 KubernetesAdmissionConfigV1 ) htypes.MutatingConfig {
473473 cfg := htypes.MutatingConfig {}
474474
475475 cfg .Group = cfgV1 .Group
@@ -484,22 +484,27 @@ func convertMutating(cfgV1 KubernetesAdmissionConfigV1) (htypes.MutatingConfig,
484484 Name : cfgV1 .Name ,
485485 Rules : cfgV1 .Rules ,
486486 }
487+
487488 if cfgV1 .Namespace != nil {
488489 webhook .NamespaceSelector = cfgV1 .Namespace .LabelSelector
489490 }
491+
490492 if cfgV1 .LabelSelector != nil {
491493 webhook .ObjectSelector = cfgV1 .LabelSelector
492494 }
495+
493496 if cfgV1 .FailurePolicy != nil {
494497 webhook .FailurePolicy = cfgV1 .FailurePolicy
495498 } else {
496499 webhook .FailurePolicy = & DefaultFailurePolicy
497500 }
501+
498502 if cfgV1 .SideEffects != nil {
499503 webhook .SideEffects = cfgV1 .SideEffects
500504 } else {
501505 webhook .SideEffects = & DefaultSideEffects
502506 }
507+
503508 if cfgV1 .TimeoutSeconds != nil {
504509 webhook .TimeoutSeconds = cfgV1 .TimeoutSeconds
505510 } else {
@@ -511,10 +516,11 @@ func convertMutating(cfgV1 KubernetesAdmissionConfigV1) (htypes.MutatingConfig,
511516 cfg .Webhook = & admission.MutatingWebhookConfig {
512517 MutatingWebhook : webhook ,
513518 }
519+
514520 cfg .Webhook .Metadata .LogLabels = map [string ]string {}
515521 cfg .Webhook .Metadata .MetricLabels = map [string ]string {}
516522
517- return cfg , nil
523+ return cfg
518524}
519525
520526func (cv1 * HookConfigV1 ) CheckConversion (kubeConfigs []htypes.OnKubernetesEventConfig , cfgV1 KubernetesConversionConfigV1 ) error {
0 commit comments