webhook registration: always set side effects

kubewarden · Apr 12, 2021 · e8acfcc · e8acfcc
1 parent c2dd5fc
commit e8acfcc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/internal/pkg/admission/mutating-webhook.go b/internal/pkg/admission/mutating-webhook.go
@@ -47,6 +47,11 @@ func (r *Reconciler) mutatingWebhookRegistration(
 	if len(apiVersions) == 0 {
 		apiVersions = []string{"*"}
 	}
+	sideEffects := clusterAdmissionPolicy.Spec.SideEffects
+	if sideEffects == nil {
+		noneSideEffects := admissionregistrationv1.SideEffectClassNone
+		sideEffects = &noneSideEffects
+	}
 	return &admissionregistrationv1.MutatingWebhookConfiguration{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: clusterAdmissionPolicy.Name,
@@ -75,7 +80,7 @@ func (r *Reconciler) mutatingWebhookRegistration(
 				MatchPolicy:             clusterAdmissionPolicy.Spec.MatchPolicy,
 				NamespaceSelector:       clusterAdmissionPolicy.Spec.NamespaceSelector,
 				ObjectSelector:          clusterAdmissionPolicy.Spec.ObjectSelector,
-				SideEffects:             clusterAdmissionPolicy.Spec.SideEffects,
+				SideEffects:             sideEffects,
 				TimeoutSeconds:          clusterAdmissionPolicy.Spec.TimeoutSeconds,
 				AdmissionReviewVersions: []string{"v1"},
 			},

diff --git a/internal/pkg/admission/validating-webhook.go b/internal/pkg/admission/validating-webhook.go
@@ -47,6 +47,11 @@ func (r *Reconciler) validatingWebhookRegistration(
 	if len(apiVersions) == 0 {
 		apiVersions = []string{"*"}
 	}
+	sideEffects := clusterAdmissionPolicy.Spec.SideEffects
+	if sideEffects == nil {
+		noneSideEffects := admissionregistrationv1.SideEffectClassNone
+		sideEffects = &noneSideEffects
+	}
 	return &admissionregistrationv1.ValidatingWebhookConfiguration{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: clusterAdmissionPolicy.Name,
@@ -75,7 +80,7 @@ func (r *Reconciler) validatingWebhookRegistration(
 				MatchPolicy:             clusterAdmissionPolicy.Spec.MatchPolicy,
 				NamespaceSelector:       clusterAdmissionPolicy.Spec.NamespaceSelector,
 				ObjectSelector:          clusterAdmissionPolicy.Spec.ObjectSelector,
-				SideEffects:             clusterAdmissionPolicy.Spec.SideEffects,
+				SideEffects:             sideEffects,
 				TimeoutSeconds:          clusterAdmissionPolicy.Spec.TimeoutSeconds,
 				AdmissionReviewVersions: []string{"v1"},
 			},