minor fixes

docs/reference/cluster_manifest.md

@@ -108,7 +108,7 @@ These parameters are grouped directly under  the `spec` key in the manifest.
   for details on tolerations and possible values of those keys. When set, this
   value overrides the `pod_toleration` setting from the operator. Optional.
 
-* **pod_priority_class_name**
+* **podPriorityClassName**
    a name of the [priority
    class](https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass)
    that should be assigned to the cluster pods. When not specified, the value

manifests/postgresql-operator-default-configuration.yaml

@@ -5,21 +5,15 @@ metadata:
 configuration:
   etcd_host: ""
   docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9
+  # enable_shm_volume: true
   max_instances: -1
   min_instances: -1
   resync_period: 30m
   repair_period: 5m
-<<<<<<< HEAD
   # set_memory_request_to_limit: false
   # sidecar_docker_images:
   #   example: "exampleimage:exampletag"
   workers: 4
-=======
-  # enable_shm_volume: true
-
-  #sidecar_docker_images:
-  # example: "exampleimage:exampletag"
->>>>>>> master
   users:
     replication_username: standby
     super_username: postgres

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

@@ -60,7 +60,7 @@ type PostgresSpec struct {
 	LogicalBackupSchedule string               `json:"logicalBackupSchedule,omitempty"`
 	StandbyCluster        *StandbyDescription  `json:"standby"`
 
-	// deprectaed json tags
+	// deprecated json tags
 	InitContainersOld       []v1.Container `json:"init_containers,omitempty"`
 	PodPriorityClassNameOld string         `json:"pod_priority_class_name,omitempty"`
 }