From 17e5c757c0585529eb14e80954202b9b08d7e404 Mon Sep 17 00:00:00 2001
From: Felix Kunde <felix-kunde@gmx.de>
Date: Mon, 11 Nov 2019 12:59:47 +0100
Subject: [PATCH] reflect latest changes in master

---
 .../templates/customrresourcedefinition.yaml     |  8 ++++++++
 manifests/operatorconfiguration.crd.yaml         |  4 ++++
 manifests/postgresql.crd.yaml                    |  4 ++++
 pkg/apis/acid.zalan.do/v1/crds.go                | 16 ++++++++++++++++
 4 files changed, 32 insertions(+)

diff --git a/charts/postgres-operator/templates/customrresourcedefinition.yaml b/charts/postgres-operator/templates/customrresourcedefinition.yaml
index 0fbafe3de..59b36c48c 100644
--- a/charts/postgres-operator/templates/customrresourcedefinition.yaml
+++ b/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:
diff --git a/manifests/operatorconfiguration.crd.yaml b/manifests/operatorconfiguration.crd.yaml
index 4772bf1ca..c564fa82f 100644
--- a/manifests/operatorconfiguration.crd.yaml
+++ b/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:
diff --git a/manifests/postgresql.crd.yaml b/manifests/postgresql.crd.yaml
index 107391676..6f6db601e 100644
--- a/manifests/postgresql.crd.yaml
+++ b/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:
diff --git a/pkg/apis/acid.zalan.do/v1/crds.go b/pkg/apis/acid.zalan.do/v1/crds.go
index d26fac723..5b9f3ecf2 100644
--- a/pkg/apis/acid.zalan.do/v1/crds.go
+++ b/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",
 						},