Merge pull request #4694 from egafford/secure-port-for-ceph-object-manifests

ceph: add securePort values for objectstore integration tests

cluster/charts/rook-ceph/templates/resources.yaml

@@ -306,11 +306,7 @@ spec:
                   type: integer
                   minimum: 1
                   maximum: 65535
-                securePort:
-                  type: integer
-                  minimum: 1
-                  maximum: 65535
-                  nullable: true
+                securePort: {}
                 instances:
                   type: integer
                 annotations: {}

cluster/examples/kubernetes/ceph/common.yaml

@@ -360,11 +360,7 @@ spec:
                   type: integer
                   minimum: 1
                   maximum: 65535
-                securePort:
-                  type: integer
-                  minimum: 1
-                  maximum: 65535
-                  nullable: true
+                securePort: {}
                 instances:
                   type: integer
                 annotations: {}

cluster/examples/kubernetes/ceph/upgrade-from-v1.1-crds.yaml

@@ -290,11 +290,7 @@ spec:
                   type: integer
                   minimum: 1
                   maximum: 65535
-                securePort:
-                  type: integer
-                  minimum: 1
-                  maximum: 65535
-                  nullable: true
+                securePort: {}
                 instances:
                   type: integer
                 annotations: {}

pkg/operator/ceph/object/rgw.go

@@ -349,6 +349,10 @@ func validateStore(context *clusterd.Context, s cephv1.CephObjectStore) error {
 	if s.Namespace == "" {
 		return errors.New("missing namespace")
 	}
+	securePort := s.Spec.Gateway.SecurePort
+	if securePort < 0 || securePort > 65535 {
+		return errors.Errorf("securePort value of %d must be between 0 and 65535", securePort)
+	}
 	if err := pool.ValidatePoolSpec(context, s.Namespace, &s.Spec.MetadataPool); err != nil {
 		return errors.Wrapf(err, "invalid metadata pool spec")
 	}

tests/framework/installer/ceph_manifests.go

@@ -379,11 +379,7 @@ spec:
                   type: integer
                   minimum: 1
                   maximum: 65535
-                securePort:
-                  type: integer
-                  minimum: 1
-                  maximum: 65535
-                  nullable: true
+                securePort: {}
                 instances:
                   type: integer
                 annotations: {}