return kind and apiVersion to validation and minor fixes

manifests/operatorconfiguration.crd.yaml

@@ -16,15 +16,25 @@ spec:
     status: {}
   validation:
     openAPIV3Schema:
+      type: object
       required:
+        - kind
+        - apiVersion
         - configuration
       properties:
+        kind:
+          type: string
+          enum:
+            - OperatorConfiguration
+        apiVersion:
+          type: string
+          enum:
+            - acid.zalan.do/v1
         configuration:
           type: object
           properties:
             etcd_host:
               type: string
-              nullable: true
             docker_image:
               type: string
             max_instances:
@@ -107,7 +117,6 @@ spec:
                     type: string
                 watched_namespace:
                   type: string
-                  nullable: true
             postgres_pod_resources:
               type: object
               properties:

manifests/postgresql-operator-default-configuration.yaml

@@ -36,7 +36,7 @@ configuration:
     oauth_token_secret_name: postgresql-operator
     pdb_name_format: "postgres-{cluster}-pdb"
     pod_antiaffinity_topology_key: "kubernetes.io/hostname"
-    # pod_environment_configmap: ""
+    pod_environment_configmap: ""
     pod_management_policy: "ordered_ready"
     pod_role_label: spilo-role
     pod_service_account_name: operator
@@ -44,8 +44,8 @@ configuration:
     secret_name_template: "{username}.{cluster}.credentials.{tprkind}.{tprgroup}"
     # spilo_fsgroup: 103
     spilo_privileged: false
-    # toleration: {}
-    # watched_namespace: ""
+    toleration: {}
+    watched_namespace: ""
   postgres_pod_resources:
     default_cpu_limit: "3"
     default_cpu_request: 100m
@@ -59,7 +59,7 @@ configuration:
     resource_check_interval: 3s
     resource_check_timeout: 10m
   load_balancer:
-    # db_hosted_zone: ""
+    db_hosted_zone: ""
     enable_master_load_balancer: false
     enable_replica_load_balancer: false
     # custom_service_annotations:
@@ -71,9 +71,9 @@ configuration:
     # additional_secret_mount: "some-secret-name"
     # additional_secret_mount_path: "/some/dir"
     aws_region: eu-central-1
-    # kube_iam_role: ""
-    # log_s3_bucket: ""
-    # wal_s3_bucket: ""
+    kube_iam_role: ""
+    log_s3_bucket: ""
+    wal_s3_bucket: ""
   logical_backup:
     log_s3_bucket: ""
     logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup"
@@ -90,7 +90,7 @@ configuration:
     # enable_admin_role_for_users: true
     enable_team_superuser: false
     enable_teams_api: false
-    # pam_configuration: ""
+    pam_configuration: ""
     pam_role_name: zalandos
     # postgres_superuser_teams:
     #   - postgres_superusers

manifests/postgresql.crd.yaml

@@ -16,18 +16,31 @@ spec:
     status: {}
   validation:
     openAPIV3Schema:
+      type: object
       required:
+        - kind
+        - apiVersion
         - spec
       properties:
+        kind:
+          type: string
+          enum:
+            - postgresql
+        apiVersion:
+          type: string
+          enum:
+            - acid.zalan.do/v1
         spec:
           type: object
           required:
             - numberOfInstances
             - teamId
             - postgresql
+          additionalProperties: true
           properties:
             allowedSourceRanges:
               type: array
+              nullable: true
               items:
                 type: string
                 pattern: '^(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\/(\d|[1-2]\d|3[0-2])$'
@@ -108,6 +121,8 @@ spec:
                   type: integer
                 maximum_lag_on_failover:
                   type: integer
+            pod_priority_class_name:  # deprecated
+              type: string
             podPriorityClassName:
               type: string
             postgresql: