Merge branch 'master' into feature/initcontainer_sidecar_toggle

charts/postgres-operator/crds/operatorconfigurations.yaml

@@ -302,3 +302,7 @@ spec:
                   pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
                 scalyr_server_url:
                   type: string
+        status:
+          type: object
+          additionalProperties:
+            type: string

manifests/operatorconfiguration.crd.yaml

@@ -278,3 +278,7 @@ spec:
                   pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
                 scalyr_server_url:
                   type: string
+        status:
+          type: object
+          additionalProperties:
+            type: string

manifests/postgresql.crd.yaml

@@ -325,3 +325,7 @@ spec:
                   type: string
                 subPath:
                   type: string
+        status:
+          type: object
+          additionalProperties:
+            type: string

pkg/apis/acid.zalan.do/v1/crds.go

@@ -578,6 +578,14 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					},
 				},
 			},
+			"status": {
+				Type: "object",
+				AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
+					Schema: &apiextv1beta1.JSONSchemaProps{
+						Type: "string",
+					},
+				},
+			},
 		},
 	},
 }
@@ -1000,6 +1008,14 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 					},
 				},
 			},
+			"status": {
+				Type: "object",
+				AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
+					Schema: &apiextv1beta1.JSONSchemaProps{
+						Type: "string",
+					},
+				},
+			},
 		},
 	},
 }