Merge branch 'master' into bump-v1.4.0

2020-02-21 16:41:38 +01:00 · 2020-02-21 16:41:38 +01:00 · 61295d8aef
parent b65e76c95f 7b94060d17
commit 61295d8aef
3 changed files with 3 additions and 3 deletions
--- a/charts/postgres-operator/crds/postgresqls.yaml
+++ b/charts/postgres-operator/crds/postgresqls.yaml
@ -94,7 +94,7 @@ spec:
                s3_secret_access_key:
                  type: string
                s3_force_path_style:
-                  type: string
+                  type: boolean
                s3_wal_path:
                  type: string
                timestamp:
--- a/manifests/postgresql.crd.yaml
+++ b/manifests/postgresql.crd.yaml
@ -58,7 +58,7 @@ spec:
                s3_secret_access_key:
                  type: string
                s3_force_path_style:
-                  type: string
+                  type: boolean
                s3_wal_path:
                  type: string
                timestamp:
--- a/pkg/apis/acid.zalan.do/v1/crds.go
+++ b/pkg/apis/acid.zalan.do/v1/crds.go
@ -160,7 +160,7 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 								Type: "string",
 							},
 							"s3_force_path_style": {
-								Type: "string",
+								Type: "boolean",
 							},
 							"s3_wal_path": {
 								Type: "string",