reflect latest changes in master

charts/postgres-operator/templates/customrresourcedefinition.yaml

@@ -172,6 +172,10 @@ spec:
                   type: integer
                 maximum_lag_on_failover:
                   type: integer
+            podAnnotations:
+              type: object
+              additionalProperties:
+                type: string
             pod_priority_class_name:  # deprecated
               type: string
             podPriorityClassName:
@@ -465,6 +469,10 @@ spec:
                     type: string
                 cluster_name_label:
                   type: string
+                custom_pod_annotations:
+                  type: object
+                  additionalProperties:
+                    type: string
                 enable_pod_antiaffinity:
                   type: boolean
                 enable_pod_disruption_budget:

manifests/operatorconfiguration.crd.yaml

@@ -74,6 +74,10 @@ spec:
                     type: string
                 cluster_name_label:
                   type: string
+                custom_pod_annotations:
+                  type: object
+                  additionalProperties:
+                    type: string
                 enable_pod_antiaffinity:
                   type: boolean
                 enable_pod_disruption_budget:

manifests/postgresql.crd.yaml

@@ -132,6 +132,10 @@ spec:
                   type: integer
                 maximum_lag_on_failover:
                   type: integer
+            podAnnotations:
+              type: object
+              additionalProperties:
+                type: string
             pod_priority_class_name:  # deprecated
               type: string
             podPriorityClassName:

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

@@ -285,6 +285,14 @@ var PostgresCRDResourceValidation = apiextv1beta1.JSONSchemaProps{
 						},
 					},
 				},
+				"podAnnotations": {
+					Type: "object",
+					AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
+						Schema: &apiextv1beta1.JSONSchemaProps{
+							Type: "string",
+						},
+					},
+				},
 				"pod_priority_class_name": {
 					Type:        "string",
 					Description: "Deprecated",
@@ -661,6 +669,14 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.JSONSchemaProps{
 						"cluster_name_label": {
 							Type: "string",
 						},
+						"custom_pod_annotations": {
+							Type: "object",
+							AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
+								Schema: &apiextv1beta1.JSONSchemaProps{
+									Type: "string",
+								},
+							},
+						},
 						"enable_pod_antiaffinity": {
 							Type: "boolean",
 						},