reflect latest changes in master

This commit is contained in:
Felix Kunde
2019-11-26 11:16:02 +01:00
parent 2f0facd2f5
commit 17e5c757c0
4 changed files with 32 additions and 0 deletions
+16
View File
@@ -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",
},