Merge pull request #34 from awgreene/update-webhook-description

Update webhook description
operator-framework · May 6, 2020 · 7856a40 · 7856a40
2 parents 363b6d8 + 19a9724
commit 7856a40
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/crds/operators.coreos.com_clusterserviceversions.yaml b/crds/operators.coreos.com_clusterserviceversions.yaml
@@ -8687,7 +8687,7 @@ spec:
                   type: object
                   required:
                   - admissionReviewVersions
-                  - name
+                  - generateName
                   - sideEffects
                   - type
                   properties:
@@ -8702,11 +8702,11 @@ spec:
                       type: string
                     failurePolicy:
                       type: string
+                    generateName:
+                      type: string
                     matchPolicy:
                       description: MatchPolicyType specifies the type of match policy
                       type: string
-                    name:
-                      type: string
                     objectSelector:
                       description: A label selector is a label query over a set of
                         resources. The result of matchLabels and matchExpressions
@@ -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 {
-	Name                    string                                          `json:"name"`
+	GenerateName string `json:"generateName"`
+	// +kubebuilder:validation:Enum=ValidatingAdmissionWebhook;MutatingAdmissionWebhook
 	Type                    WebhookAdmissionType                            `json:"type"`
 	DeploymentName          string                                          `json:"deploymentName,omitempty"`
 	ContainerPort           int32                                           `json:"containerPort,omitempty"`
@@ -182,7 +183,7 @@ type WebhookDescription struct {
 // GetValidatingWebhook returns a ValidatingWebhook generated from the WebhookDescription
 func (w *WebhookDescription) GetValidatingWebhook(namespace string, namespaceSelector *metav1.LabelSelector, caBundle []byte) admissionregistrationv1.ValidatingWebhook {
 	return admissionregistrationv1.ValidatingWebhook{
-		Name:                    w.Name,
+		Name:                    w.GenerateName,
 		Rules:                   w.Rules,
 		FailurePolicy:           w.FailurePolicy,
 		MatchPolicy:             w.MatchPolicy,
@@ -205,7 +206,7 @@ func (w *WebhookDescription) GetValidatingWebhook(namespace string, namespaceSel
 // GetMutatingWebhook returns a MutatingWebhook generated from the WebhookDescription
 func (w *WebhookDescription) GetMutatingWebhook(namespace string, namespaceSelector *metav1.LabelSelector, caBundle []byte) admissionregistrationv1.MutatingWebhook {
 	return admissionregistrationv1.MutatingWebhook{
-		Name:                    w.Name,
+		Name:                    w.GenerateName,
 		Rules:                   w.Rules,
 		FailurePolicy:           w.FailurePolicy,
 		MatchPolicy:             w.MatchPolicy,
@@ -365,7 +366,7 @@ const (
 	CSVReasonInterOperatorGroupOwnerConflict             ConditionReason = "InterOperatorGroupOwnerConflict"
 	CSVReasonCannotModifyStaticOperatorGroupProvidedAPIs ConditionReason = "CannotModifyStaticOperatorGroupProvidedAPIs"
 	CSVReasonDetectedClusterChange                       ConditionReason = "DetectedClusterChange"
-	CSVReasonUnsupportedWebhookRules                     ConditionReason = "UnsupportedWebhookRules"
+	CSVReasonInvalidWebhookDescription                   ConditionReason = "InvalidWebhookDescription"
 )
 
 // HasCaResources returns true if the CSV has owned APIServices or Webhooks.