deprecate snake_case manifest parameters

docs/user.md

@@ -351,7 +351,7 @@ metadata:
   name: acid-minimal-cluster
 spec:
   ...
-  init_containers:
+  initContainers:
     - name: "container-name"
       image: "company/image:tag"
       env:
@@ -359,7 +359,7 @@ spec:
           value: "any-k8s-env-things"
 ```
 
-`init_containers` accepts full `v1.Container` definition.
+`initContainers` accepts full `v1.Container` definition.
 
 
 ## Increase volume size

manifests/complete-postgres-manifest.yaml

@@ -4,7 +4,7 @@ kind: postgresql
 metadata:
   name: acid-test-cluster
 spec:
-  init_containers:
+  initContainers:
   - name: date
     image: busybox
     command: [ "/bin/date" ]
@@ -58,7 +58,7 @@ spec:
     loop_wait: &loop_wait 10
     retry_timeout: 10
     maximum_lag_on_failover: 33554432
-  # restore a Postgres DB with point-in-time-recovery 
+  # restore a Postgres DB with point-in-time-recovery
   # with a non-empty timestamp, clone from an S3 bucket using the latest backup before the timestamp
   # with an empty/absent timestamp, clone from an existing alive cluster using pg_basebackup
   # clone:

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

@@ -120,6 +120,15 @@ func (p *Postgresql) UnmarshalJSON(data []byte) error {
 		tmp2.Spec.ClusterName = clusterName
 	}
 
+	if tmp2.Spec.InitContainersOld != nil && tmp2.Spec.InitContainers == nil {
+		tmp2.Spec.InitContainers = tmp2.Spec.InitContainersOld
+		tmp2.Spec.InitContainersOld = nil
+	}
+	if tmp2.Spec.PodPriorityClassNameOld != "" && tmp2.Spec.PodPriorityClassName == "" {
+		tmp2.Spec.PodPriorityClassName = tmp2.Spec.PodPriorityClassNameOld
+		tmp2.Spec.PodPriorityClassNameOld = ""
+	}
+
 	*p = tmp2
 
 	return nil

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

@@ -53,12 +53,16 @@ type PostgresSpec struct {
 	Databases             map[string]string    `json:"databases,omitempty"`
 	Tolerations           []v1.Toleration      `json:"tolerations,omitempty"`
 	Sidecars              []Sidecar            `json:"sidecars,omitempty"`
-	InitContainers        []v1.Container       `json:"init_containers,omitempty"`
+	InitContainers        []v1.Container       `json:"initContainers,omitempty"`
-	PodPriorityClassName  string               `json:"pod_priority_class_name,omitempty"`
+	PodPriorityClassName  string               `json:"podPriorityClassName,omitempty"`
 	ShmVolume             *bool                `json:"enableShmVolume,omitempty"`
 	EnableLogicalBackup   bool                 `json:"enableLogicalBackup,omitempty"`
 	LogicalBackupSchedule string               `json:"logicalBackupSchedule,omitempty"`
 	StandbyCluster        *StandbyDescription  `json:"standby"`
+
+	// deprectaed json tags
+	InitContainersOld       []v1.Container `json:"init_containers,omitempty"`
+	PodPriorityClassNameOld string         `json:"pod_priority_class_name,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

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

@@ -179,6 +179,7 @@ var unmarshalCluster = []struct {
 	  },
 	  "spec": {
 	    "teamId": "ACID",
+		"pod_priority_class_name": "spilo-pod-priority",
 	    "volume": {
 	      "size": "5Gi",
 	      "storageClass": "SSD",
@@ -261,6 +262,7 @@ var unmarshalCluster = []struct {
 						"log_statement":   "all",
 					},
 				},
+				PodPriorityClassName: "spilo-pod-priority",
 				Volume: Volume{
 					Size:         "5Gi",
 					StorageClass: "SSD",
@@ -313,7 +315,7 @@ var unmarshalCluster = []struct {
 			},
 			Error: "",
 		},
-		marshal: []byte(`{"kind":"Postgresql","apiVersion":"acid.zalan.do/v1","metadata":{"name":"acid-testcluster1","creationTimestamp":null},"spec":{"postgresql":{"version":"9.6","parameters":{"log_statement":"all","max_connections":"10","shared_buffers":"32MB"}},"volume":{"size":"5Gi","storageClass":"SSD", "subPath": "subdir"},"patroni":{"initdb":{"data-checksums":"true","encoding":"UTF8","locale":"en_US.UTF-8"},"pg_hba":["hostssl all all 0.0.0.0/0 md5","host    all all 0.0.0.0/0 md5"],"ttl":30,"loop_wait":10,"retry_timeout":10,"maximum_lag_on_failover":33554432,"slots":{"permanent_logical_1":{"database":"foo","plugin":"pgoutput","type":"logical"}}},"resources":{"requests":{"cpu":"10m","memory":"50Mi"},"limits":{"cpu":"300m","memory":"3000Mi"}},"teamId":"ACID","allowedSourceRanges":["127.0.0.1/32"],"numberOfInstances":2,"users":{"zalando":["superuser","createdb"]},"maintenanceWindows":["Mon:01:00-06:00","Sat:00:00-04:00","05:00-05:15"],"clone":{"cluster":"acid-batman"}},"status":{"PostgresClusterStatus":""}}`),
+		marshal: []byte(`{"kind":"Postgresql","apiVersion":"acid.zalan.do/v1","metadata":{"name":"acid-testcluster1","creationTimestamp":null},"spec":{"postgresql":{"version":"9.6","parameters":{"log_statement":"all","max_connections":"10","shared_buffers":"32MB"}},"podPriorityClassName":"spilo-pod-priority","volume":{"size":"5Gi","storageClass":"SSD", "subPath": "subdir"},"patroni":{"initdb":{"data-checksums":"true","encoding":"UTF8","locale":"en_US.UTF-8"},"pg_hba":["hostssl all all 0.0.0.0/0 md5","host    all all 0.0.0.0/0 md5"],"ttl":30,"loop_wait":10,"retry_timeout":10,"maximum_lag_on_failover":33554432,"slots":{"permanent_logical_1":{"database":"foo","plugin":"pgoutput","type":"logical"}}},"resources":{"requests":{"cpu":"10m","memory":"50Mi"},"limits":{"cpu":"300m","memory":"3000Mi"}},"teamId":"ACID","allowedSourceRanges":["127.0.0.1/32"],"numberOfInstances":2,"users":{"zalando":["superuser","createdb"]},"maintenanceWindows":["Mon:01:00-06:00","Sat:00:00-04:00","05:00-05:15"],"clone":{"cluster":"acid-batman"}},"status":{"PostgresClusterStatus":""}}`),
 		err:     nil},
 	// example with teamId set in input
 	{