Merge pull request #70 from awgreene/webhook-port-values

Bug 1891898: Set min and max values on Webhook Container Port

Author: awgreene

crds/operators.coreos.com_clusterserviceversions.yaml

@@ -8704,6 +8704,8 @@ spec:
                     containerPort:
                       type: integer
                       format: int32
+                      maximum: 65535
+                      minimum: 1
                     conversionCRDs:
                       type: array
                       items:

crds/zz_defs.go

@@ -171,8 +171,10 @@ const (
 type WebhookDescription struct {
 	GenerateName string `json:"generateName"`
 	// +kubebuilder:validation:Enum=ValidatingAdmissionWebhook;MutatingAdmissionWebhook;ConversionWebhook
-	Type                    WebhookAdmissionType                            `json:"type"`
-	DeploymentName          string                                          `json:"deploymentName,omitempty"`
+	Type           WebhookAdmissionType `json:"type"`
+	DeploymentName string               `json:"deploymentName,omitempty"`
+	// +kubebuilder:validation:Maximum=65535
+	// +kubebuilder:validation:Minimum=1
 	ContainerPort           int32                                           `json:"containerPort,omitempty"`
 	TargetPort              *intstr.IntOrString                             `json:"targetPort,omitempty"`
 	Rules                   []admissionregistrationv1.RuleWithOperations    `json:"rules,omitempty"`
@@ -189,6 +191,9 @@ type WebhookDescription struct {
 
 // GetValidatingWebhook returns a ValidatingWebhook generated from the WebhookDescription
 func (w *WebhookDescription) GetValidatingWebhook(namespace string, namespaceSelector *metav1.LabelSelector, caBundle []byte) admissionregistrationv1.ValidatingWebhook {
+	if w.ContainerPort == 0 {
+		w.ContainerPort = 443
+	}
 	return admissionregistrationv1.ValidatingWebhook{
 		Name:                    w.GenerateName,
 		Rules:                   w.Rules,
@@ -213,6 +218,9 @@ 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 {
+	if w.ContainerPort == 0 {
+		w.ContainerPort = 443
+	}
 	return admissionregistrationv1.MutatingWebhook{
 		Name:                    w.GenerateName,
 		Rules:                   w.Rules,