Set default, min, and max values on Webhook ports

Problem: Operator Authors can create CSVs that define Webhooks with containerPorts set outside the range of 1-65535, which prevents the ValidatingWebhookConfiguration or MutatingWebhookConfiguration from being created due to failed validation. Solution: Update the CSV's CRD Validation to include the proper min and max values for webhookDescription ContainerPort field. If the containerPort is not defined, default to 443.
operator-framework · Oct 27, 2020 · 0369ef6 · 0369ef6
1 parent 0e65642
commit 0369ef6
Show file tree

Hide file tree

Showing 14 changed files with 497 additions and 16 deletions.
diff --git a/deploy/chart/crds/0000_50_olm_00-clusterserviceversions.crd.yaml b/deploy/chart/crds/0000_50_olm_00-clusterserviceversions.crd.yaml
@@ -8704,6 +8704,9 @@ spec:
                     containerPort:
                       type: integer
                       format: int32
+                      default: 443
+                      maximum: 65535
+                      minimum: 1
                     conversionCRDs:
                       type: array
                       items:

diff --git a/go.mod b/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/onsi/gomega v1.9.0
 	github.com/openshift/api v0.0.0-20200331152225-585af27e34fd
 	github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
-	github.com/operator-framework/api v0.3.16
+	github.com/operator-framework/api v0.3.20
 	github.com/operator-framework/operator-registry v1.13.6
 	github.com/otiai10/copy v1.2.0
 	github.com/pkg/errors v0.9.1

diff --git a/go.sum b/go.sum
@@ -599,8 +599,8 @@ github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 h1:kMiuiZXH1Gd
 github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0/go.mod h1:uUQ4LClRO+fg5MF/P6QxjMCb1C9f7Oh4RKepftDnEJE=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/operator-framework/api v0.3.7-0.20200602203552-431198de9fc2/go.mod h1:Xbje9x0SHmh0nihE21kpesB38vk3cyxnE6JdDS8Jo1Q=
-github.com/operator-framework/api v0.3.16 h1:rMePhgntSMdU5mIifF78WaQa99oGR/RKQ4H6+Hrpv+o=
-github.com/operator-framework/api v0.3.16/go.mod h1:Xbje9x0SHmh0nihE21kpesB38vk3cyxnE6JdDS8Jo1Q=
+github.com/operator-framework/api v0.3.20 h1:2Ks8GXXl/H2sV9ll2iQBUO65ABQ5VuzN3IKEZCJWljo=
+github.com/operator-framework/api v0.3.20/go.mod h1:Xbje9x0SHmh0nihE21kpesB38vk3cyxnE6JdDS8Jo1Q=
 github.com/operator-framework/operator-registry v1.13.6 h1:h/dIjQQS7uneQNRifrSz7h0xg4Xyjg6C9f6XZofbMPg=
 github.com/operator-framework/operator-registry v1.13.6/go.mod h1:YhnIzOVjRU2ZwZtzt+fjcjW8ujJaSFynBEu7QVKaSdU=
 github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=

diff --git a/manifests/0000_50_olm_00-clusterserviceversions.crd.yaml b/manifests/0000_50_olm_00-clusterserviceversions.crd.yaml
@@ -8704,6 +8704,9 @@ spec:
                     containerPort:
                       type: integer
                       format: int32
+                      default: 443
+                      maximum: 65535
+                      minimum: 1
                     conversionCRDs:
                       type: array
                       items:

diff --git a/vendor/github.com/operator-framework/api/LICENSE b/vendor/github.com/operator-framework/api/LICENSE
diff --git a/...r/github.com/operator-framework/api/crds/operators.coreos.com_clusterserviceversions.yaml b/...r/github.com/operator-framework/api/crds/operators.coreos.com_clusterserviceversions.yaml
diff --git a/vendor/github.com/operator-framework/api/crds/zz_defs.go b/vendor/github.com/operator-framework/api/crds/zz_defs.go
diff --git a/vendor/github.com/operator-framework/api/pkg/manifests/bundle.go b/vendor/github.com/operator-framework/api/pkg/manifests/bundle.go
diff --git a/...r/github.com/operator-framework/api/pkg/operators/v1alpha1/clusterserviceversion_types.go b/...r/github.com/operator-framework/api/pkg/operators/v1alpha1/clusterserviceversion_types.go
diff --git a/vendor/github.com/operator-framework/api/pkg/validation/errors/error.go b/vendor/github.com/operator-framework/api/pkg/validation/errors/error.go