Merge pull request #7919 from cybozu-go/remove-missing-field-in-crd

ceph: remove an missing field in crd
2021-05-18 10:10:17 +02:00
parent e368c3e389 c2adbdd8a8
commit f15bb5d480
13 changed files with 0 additions and 19 deletions
@@ -36,7 +36,6 @@ spec:
      codingChunks: 1
  preservePoolsOnDelete: true
  gateway:
-    type: s3
    # sslCertificateRef:
    port: 80
    # securePort: 443
@@ -47,7 +47,6 @@ spec:
      codingChunks: 1
  preservePoolsOnDelete: true
  gateway:
-    type: s3
    sslCertificateRef:
    port: 80
    # securePort: 443
@@ -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)
@@ -56,7 +56,6 @@ metadata:
  namespace: new-rook-ceph-namespace
 spec:
  gateway:
-    type: s3
    port: 80
    # securePort: 443
    instances: 1
@@ -43,7 +43,6 @@ metadata:
  namespace: rook-ceph # namespace:cluster
 spec:
  gateway:
-    type: s3
    port: 80
    # securePort: 443
    instances: 1
@@ -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)
@@ -17,7 +17,6 @@ spec:
      size: 1
  preservePoolsOnDelete: false
  gateway:
-    type: s3
    port: 80
    # securePort: 443
    instances: 1
@@ -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)
@@ -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
 ```
@@ -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
@@ -401,7 +401,6 @@ spec:
      size: 1
      requireSafeReplicaSize: false
  gateway:
-    type: s3
    port: ` + strconv.Itoa(port) + `
    instances: ` + strconv.Itoa(replicaCount) + `
  healthCheck:
@@ -353,7 +353,6 @@ spec:
      size: 1
      requireSafeReplicaSize: false
  gateway:
-    type: s3
    sslCertificateRef:
    port: ` + strconv.Itoa(port) + `
    instances: ` + strconv.Itoa(replicaCount) + `
@@ -17,7 +17,6 @@ spec:
      size: 1
  preservePoolsOnDelete: false
  gateway:
-    type: s3
    port: 80
    # securePort: 443
    instances: 1