Update CSV Validation

This commit updates the CRD validation to only accept CSVs where the WebhookDefinition type is valid.
operator-framework · May 6, 2020 · 19a9724 · 19a9724
1 parent 2770864
commit 19a9724
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/crds/operators.coreos.com_clusterserviceversions.yaml b/crds/operators.coreos.com_clusterserviceversions.yaml
@@ -8821,6 +8821,9 @@ spec:
                       description: WebhookAdmissionType is the type of admission webhooks
                         supported by OLM
                       type: string
+                      enum:
+                      - ValidatingAdmissionWebhook
+                      - MutatingAdmissionWebhook
                     webhookPath:
                       type: string
           status:

diff --git a/crds/zz_defs.go b/crds/zz_defs.go
diff --git a/pkg/operators/v1alpha1/clusterserviceversion_types.go b/pkg/operators/v1alpha1/clusterserviceversion_types.go
@@ -164,7 +164,8 @@ const (
 // WebhookDescription provides details to OLM about required webhooks
 // +k8s:openapi-gen=true
 type WebhookDescription struct {
-	GenerateName            string                                          `json:"generateName"`
+	GenerateName string `json:"generateName"`
+	// +kubebuilder:validation:Enum=ValidatingAdmissionWebhook;MutatingAdmissionWebhook
 	Type                    WebhookAdmissionType                            `json:"type"`
 	DeploymentName          string                                          `json:"deploymentName,omitempty"`
 	ContainerPort           int32                                           `json:"containerPort,omitempty"`
@@ -180,9 +181,9 @@ type WebhookDescription struct {
 }
 
 // GetValidatingWebhook returns a ValidatingWebhook generated from the WebhookDescription
-func (w *WebhookDescription) GetValidatingWebhook(name, namespace string, namespaceSelector *metav1.LabelSelector, caBundle []byte) admissionregistrationv1.ValidatingWebhook {
+func (w *WebhookDescription) GetValidatingWebhook(namespace string, namespaceSelector *metav1.LabelSelector, caBundle []byte) admissionregistrationv1.ValidatingWebhook {
 	return admissionregistrationv1.ValidatingWebhook{
-		Name:                    name,
+		Name:                    w.GenerateName,
 		Rules:                   w.Rules,
 		FailurePolicy:           w.FailurePolicy,
 		MatchPolicy:             w.MatchPolicy,
@@ -203,9 +204,9 @@ func (w *WebhookDescription) GetValidatingWebhook(name, namespace string, namesp
 }
 
 // GetMutatingWebhook returns a MutatingWebhook generated from the WebhookDescription
-func (w *WebhookDescription) GetMutatingWebhook(name, namespace string, namespaceSelector *metav1.LabelSelector, caBundle []byte) admissionregistrationv1.MutatingWebhook {
+func (w *WebhookDescription) GetMutatingWebhook(namespace string, namespaceSelector *metav1.LabelSelector, caBundle []byte) admissionregistrationv1.MutatingWebhook {
 	return admissionregistrationv1.MutatingWebhook{
-		Name:                    name,
+		Name:                    w.GenerateName,
 		Rules:                   w.Rules,
 		FailurePolicy:           w.FailurePolicy,
 		MatchPolicy:             w.MatchPolicy,