Merge pull request openshift#71 from awgreene/default-containerPorts

Default containerPort to 443
openshift-cherrypick-robot · Oct 27, 2020 · 1b99ae1 · 1b99ae1
2 parents 69e6f9b + 63792c8
commit 1b99ae1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/crds/operators.coreos.com_clusterserviceversions.yaml b/crds/operators.coreos.com_clusterserviceversions.yaml
@@ -8704,6 +8704,7 @@ spec:
                     containerPort:
                       type: integer
                       format: int32
+                      default: 443
                       maximum: 65535
                       minimum: 1
                     conversionCRDs:

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
@@ -175,6 +175,7 @@ type WebhookDescription struct {
 	DeploymentName string               `json:"deploymentName,omitempty"`
 	// +kubebuilder:validation:Maximum=65535
 	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:default=443
 	ContainerPort           int32                                           `json:"containerPort,omitempty"`
 	TargetPort              *intstr.IntOrString                             `json:"targetPort,omitempty"`
 	Rules                   []admissionregistrationv1.RuleWithOperations    `json:"rules,omitempty"`
@@ -191,9 +192,6 @@ 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,
@@ -218,9 +216,6 @@ 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,