From c2adbdd8a88b39d983091651debd2c7500e482a5 Mon Sep 17 00:00:00 2001 From: Satoru Takeuchi Date: Mon, 17 May 2021 07:51:13 +0000 Subject: [PATCH] ceph: remove an missing field in crd `CephObjectStore->gateway->type` is not used. Rook has only supported s3-like interface and hasn't had no code which handles `type` field. In addition, this field was removed from CRD in the following commit. ceph: auto-gen crds 31db03fece6d11c3054a6488b96d1c6ad3722b84 Signed-off-by: Satoru Takeuchi --- Documentation/ceph-object-store-crd.md | 1 - Documentation/ceph-object.md | 1 - cluster/examples/kubernetes/ceph/object-ec.yaml | 2 -- .../examples/kubernetes/ceph/object-multisite-pull-realm.yaml | 1 - cluster/examples/kubernetes/ceph/object-multisite.yaml | 1 - cluster/examples/kubernetes/ceph/object-openshift.yaml | 2 -- cluster/examples/kubernetes/ceph/object-test.yaml | 1 - cluster/examples/kubernetes/ceph/object.yaml | 2 -- design/ceph/object/store.md | 3 --- design/common/object-bucket.md | 2 -- tests/framework/installer/ceph_manifests.go | 1 - tests/framework/installer/ceph_manifests_v1.5.go | 1 - tests/manifests/test-object.yaml | 1 - 13 files changed, 19 deletions(-) diff --git a/Documentation/ceph-object-store-crd.md b/Documentation/ceph-object-store-crd.md index 73061d3d8..e46cdbe52 100644 --- a/Documentation/ceph-object-store-crd.md +++ b/Documentation/ceph-object-store-crd.md @@ -36,7 +36,6 @@ spec: codingChunks: 1 preservePoolsOnDelete: true gateway: - type: s3 # sslCertificateRef: port: 80 # securePort: 443 diff --git a/Documentation/ceph-object.md b/Documentation/ceph-object.md index 1099a234b..6a9270425 100644 --- a/Documentation/ceph-object.md +++ b/Documentation/ceph-object.md @@ -47,7 +47,6 @@ spec: codingChunks: 1 preservePoolsOnDelete: true gateway: - type: s3 sslCertificateRef: port: 80 # securePort: 443 diff --git a/cluster/examples/kubernetes/ceph/object-ec.yaml b/cluster/examples/kubernetes/ceph/object-ec.yaml index 6d3306a26..cc0448e57 100644 --- a/cluster/examples/kubernetes/ceph/object-ec.yaml +++ b/cluster/examples/kubernetes/ceph/object-ec.yaml @@ -42,8 +42,6 @@ spec: preservePoolsOnDelete: true # The gateway service configuration gateway: - # type of the gateway (s3) - type: s3 # A reference to the secret in the rook namespace where the ssl certificate is stored sslCertificateRef: # The port that RGW pods will listen on (http) diff --git a/cluster/examples/kubernetes/ceph/object-multisite-pull-realm.yaml b/cluster/examples/kubernetes/ceph/object-multisite-pull-realm.yaml index 11045221f..2d678eb9c 100644 --- a/cluster/examples/kubernetes/ceph/object-multisite-pull-realm.yaml +++ b/cluster/examples/kubernetes/ceph/object-multisite-pull-realm.yaml @@ -56,7 +56,6 @@ metadata: namespace: new-rook-ceph-namespace spec: gateway: - type: s3 port: 80 # securePort: 443 instances: 1 diff --git a/cluster/examples/kubernetes/ceph/object-multisite.yaml b/cluster/examples/kubernetes/ceph/object-multisite.yaml index 3938aa966..247d825c4 100644 --- a/cluster/examples/kubernetes/ceph/object-multisite.yaml +++ b/cluster/examples/kubernetes/ceph/object-multisite.yaml @@ -43,7 +43,6 @@ metadata: namespace: rook-ceph # namespace:cluster spec: gateway: - type: s3 port: 80 # securePort: 443 instances: 1 diff --git a/cluster/examples/kubernetes/ceph/object-openshift.yaml b/cluster/examples/kubernetes/ceph/object-openshift.yaml index 7c8355962..c2ce7b9ed 100644 --- a/cluster/examples/kubernetes/ceph/object-openshift.yaml +++ b/cluster/examples/kubernetes/ceph/object-openshift.yaml @@ -44,8 +44,6 @@ spec: preservePoolsOnDelete: true # The gateway service configuration gateway: - # type of the gateway (s3) - type: s3 # A reference to the secret in the rook namespace where the ssl certificate is stored # sslCertificateRef: # The port that RGW pods will listen on (http) diff --git a/cluster/examples/kubernetes/ceph/object-test.yaml b/cluster/examples/kubernetes/ceph/object-test.yaml index bdb182752..d53b5f346 100644 --- a/cluster/examples/kubernetes/ceph/object-test.yaml +++ b/cluster/examples/kubernetes/ceph/object-test.yaml @@ -17,7 +17,6 @@ spec: size: 1 preservePoolsOnDelete: false gateway: - type: s3 port: 80 # securePort: 443 instances: 1 diff --git a/cluster/examples/kubernetes/ceph/object.yaml b/cluster/examples/kubernetes/ceph/object.yaml index 80ba09073..430c9c60d 100644 --- a/cluster/examples/kubernetes/ceph/object.yaml +++ b/cluster/examples/kubernetes/ceph/object.yaml @@ -44,8 +44,6 @@ spec: preservePoolsOnDelete: false # The gateway service configuration gateway: - # type of the gateway (s3) - type: s3 # A reference to the secret in the rook namespace where the ssl certificate is stored # sslCertificateRef: # The port that RGW pods will listen on (http) diff --git a/design/ceph/object/store.md b/design/ceph/object/store.md index f19b4527e..e34316440 100644 --- a/design/ceph/object/store.md +++ b/design/ceph/object/store.md @@ -30,7 +30,6 @@ spec: dataChunks: 6 codingChunks: 2 gateway: - type: s3 port: 80 securePort: 443 instances: 3 @@ -90,9 +89,7 @@ The RGW service can be configured to listen on both http and https by specifying ```yaml gateway: - type: s3 sslCertificateRef: my-ssl-cert-secret - port: 80 securePort: 443 instances: 1 ``` diff --git a/design/common/object-bucket.md b/design/common/object-bucket.md index 2d5a3dce3..b68c410dd 100644 --- a/design/common/object-bucket.md +++ b/design/common/object-bucket.md @@ -50,7 +50,6 @@ spec: dataChunks: 6 codingChunks: 2 gateway: - type: s3 port: 80 securePort: 443 instances: 3 @@ -109,7 +108,6 @@ The RGW service can be configured to listen on both http and https by specifying ```yaml gateway: - type: s3 sslCertificateRef: my-ssl-cert-secret port: 80 securePort: 443 diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index 6673e845f..27bea4795 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -401,7 +401,6 @@ spec: size: 1 requireSafeReplicaSize: false gateway: - type: s3 port: ` + strconv.Itoa(port) + ` instances: ` + strconv.Itoa(replicaCount) + ` healthCheck: diff --git a/tests/framework/installer/ceph_manifests_v1.5.go b/tests/framework/installer/ceph_manifests_v1.5.go index bd742dc6c..ed4d68f07 100644 --- a/tests/framework/installer/ceph_manifests_v1.5.go +++ b/tests/framework/installer/ceph_manifests_v1.5.go @@ -353,7 +353,6 @@ spec: size: 1 requireSafeReplicaSize: false gateway: - type: s3 sslCertificateRef: port: ` + strconv.Itoa(port) + ` instances: ` + strconv.Itoa(replicaCount) + ` diff --git a/tests/manifests/test-object.yaml b/tests/manifests/test-object.yaml index bdb182752..d53b5f346 100644 --- a/tests/manifests/test-object.yaml +++ b/tests/manifests/test-object.yaml @@ -17,7 +17,6 @@ spec: size: 1 preservePoolsOnDelete: false gateway: - type: s3 port: 80 # securePort: 443 instances: 1