Merge branch 'master' into bump-v1.4.0
This commit is contained in:
		
						commit
						61295d8aef
					
				|  | @ -94,7 +94,7 @@ spec: | ||||||
|                 s3_secret_access_key: |                 s3_secret_access_key: | ||||||
|                   type: string |                   type: string | ||||||
|                 s3_force_path_style: |                 s3_force_path_style: | ||||||
|                   type: string |                   type: boolean | ||||||
|                 s3_wal_path: |                 s3_wal_path: | ||||||
|                   type: string |                   type: string | ||||||
|                 timestamp: |                 timestamp: | ||||||
|  |  | ||||||
|  | @ -58,7 +58,7 @@ spec: | ||||||
|                 s3_secret_access_key: |                 s3_secret_access_key: | ||||||
|                   type: string |                   type: string | ||||||
|                 s3_force_path_style: |                 s3_force_path_style: | ||||||
|                   type: string |                   type: boolean | ||||||
|                 s3_wal_path: |                 s3_wal_path: | ||||||
|                   type: string |                   type: string | ||||||
|                 timestamp: |                 timestamp: | ||||||
|  |  | ||||||
|  | @ -160,7 +160,7 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{ | ||||||
| 								Type: "string", | 								Type: "string", | ||||||
| 							}, | 							}, | ||||||
| 							"s3_force_path_style": { | 							"s3_force_path_style": { | ||||||
| 								Type: "string", | 								Type: "boolean", | ||||||
| 							}, | 							}, | ||||||
| 							"s3_wal_path": { | 							"s3_wal_path": { | ||||||
| 								Type: "string", | 								Type: "string", | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue