Use /status subresource instead of plain manifest field (#534)

* turns PostgresStatus type into a struct with field PostgresClusterStatus * setStatus patch target is now /status subresource * unmarshalling PostgresStatus takes care of previous status field convention * new simple bool functions status.Running(), status.Creating()
2026-10-01 14:35:51 +02:00 · 2019-05-07 12:01:45 +02:00
parent 25e02ad755
commit 0fbfbb23bb
13 changed files with 356 additions and 205 deletions
@@ -2,14 +2,14 @@ package v1

 // 	ClusterStatusUnknown etc : status of a Postgres cluster known to the operator
 const (
-	ClusterStatusUnknown      PostgresStatus = ""
-	ClusterStatusCreating     PostgresStatus = "Creating"
-	ClusterStatusUpdating     PostgresStatus = "Updating"
-	ClusterStatusUpdateFailed PostgresStatus = "UpdateFailed"
-	ClusterStatusSyncFailed   PostgresStatus = "SyncFailed"
-	ClusterStatusAddFailed    PostgresStatus = "CreateFailed"
-	ClusterStatusRunning      PostgresStatus = "Running"
-	ClusterStatusInvalid      PostgresStatus = "Invalid"
+	ClusterStatusUnknown      = ""
+	ClusterStatusCreating     = "Creating"
+	ClusterStatusUpdating     = "Updating"
+	ClusterStatusUpdateFailed = "UpdateFailed"
+	ClusterStatusSyncFailed   = "SyncFailed"
+	ClusterStatusAddFailed    = "CreateFailed"
+	ClusterStatusRunning      = "Running"
+	ClusterStatusInvalid      = "Invalid"
 )

 const (
@@ -8,6 +8,7 @@ import (
 )

 type postgresqlCopy Postgresql
+type postgresStatusCopy PostgresStatus

 // MarshalJSON converts a maintenance window definition to JSON.
 func (m *MaintenanceWindow) MarshalJSON() ([]byte, error) {
@@ -69,6 +70,26 @@ func (m *MaintenanceWindow) UnmarshalJSON(data []byte) error {
 	return nil
 }

+// UnmarshalJSON converts a JSON to the status subresource definition.
+func (ps *PostgresStatus) UnmarshalJSON(data []byte) error {
+	var (
+		tmp    postgresStatusCopy
+		status string
+	)
+
+	err := json.Unmarshal(data, &tmp)
+	if err != nil {
+		metaErr := json.Unmarshal(data, &status)
+		if metaErr != nil {
+			return fmt.Errorf("Could not parse status: %v; err %v", string(data), metaErr)
+		}
+		tmp.PostgresClusterStatus = status
+	}
+	*ps = PostgresStatus(tmp)
+
+	return nil
+}
+
 // UnmarshalJSON converts a JSON into the PostgreSQL object.
 func (p *Postgresql) UnmarshalJSON(data []byte) error {
 	var tmp postgresqlCopy
@@ -81,7 +102,7 @@ func (p *Postgresql) UnmarshalJSON(data []byte) error {
 		}

 		tmp.Error = err.Error()
-		tmp.Status = ClusterStatusInvalid
+		tmp.Status = PostgresStatus{PostgresClusterStatus: ClusterStatusInvalid}

 		*p = Postgresql(tmp)

@@ -91,10 +112,10 @@ func (p *Postgresql) UnmarshalJSON(data []byte) error {

 	if clusterName, err := extractClusterName(tmp2.ObjectMeta.Name, tmp2.Spec.TeamID); err != nil {
 		tmp2.Error = err.Error()
-		tmp2.Status = ClusterStatusInvalid
+		tmp2.Status = PostgresStatus{PostgresClusterStatus: ClusterStatusInvalid}
 	} else if err := validateCloneClusterDescription(&tmp2.Spec.Clone); err != nil {
 		tmp2.Error = err.Error()
-		tmp2.Status = ClusterStatusInvalid
+		tmp2.Status = PostgresStatus{PostgresClusterStatus: ClusterStatusInvalid}
 	} else {
 		tmp2.Spec.ClusterName = clusterName
 	}
@@ -16,7 +16,7 @@ type Postgresql struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`

 	Spec   PostgresSpec   `json:"spec"`
-	Status PostgresStatus `json:"status,omitempty"`
+	Status PostgresStatus `json:"status"`
 	Error  string         `json:"-"`
 }

@@ -129,4 +129,6 @@ type Sidecar struct {
 type UserFlags []string

 // PostgresStatus contains status of the PostgreSQL cluster (running, creation failed etc.)
-type PostgresStatus string
+type PostgresStatus struct {
+	PostgresClusterStatus string `json:"PostgresClusterStatus"`
+}
@@ -85,12 +85,22 @@ func validateCloneClusterDescription(clone *CloneDescription) error {
 }

 // Success of the current Status
-func (status PostgresStatus) Success() bool {
-	return status != ClusterStatusAddFailed &&
-		status != ClusterStatusUpdateFailed &&
-		status != ClusterStatusSyncFailed
+func (postgresStatus PostgresStatus) Success() bool {
+	return postgresStatus.PostgresClusterStatus != ClusterStatusAddFailed &&
+		postgresStatus.PostgresClusterStatus != ClusterStatusUpdateFailed &&
+		postgresStatus.PostgresClusterStatus != ClusterStatusSyncFailed
 }

-func (status PostgresStatus) String() string {
-	return string(status)
+// Running status of cluster
+func (postgresStatus PostgresStatus) Running() bool {
+	return postgresStatus.PostgresClusterStatus == ClusterStatusRunning
+}
+
+// Creating status of cluster
+func (postgresStatus PostgresStatus) Creating() bool {
+	return postgresStatus.PostgresClusterStatus == ClusterStatusCreating
+}
+
+func (postgresStatus PostgresStatus) String() string {
+	return postgresStatus.PostgresClusterStatus
 }
@@ -111,101 +111,139 @@ var maintenanceWindows = []struct {
 	{[]byte(`"Mon:00:00"`), MaintenanceWindow{}, errors.New("incorrect maintenance window format")},
 	{[]byte(`"Mon:00:00-00:00:00"`), MaintenanceWindow{}, errors.New("could not parse end time: incorrect time format")}}

+var postgresStatus = []struct {
+	in  []byte
+	out PostgresStatus
+	err error
+}{
+	{[]byte(`{"PostgresClusterStatus":"Running"}`),
+		PostgresStatus{PostgresClusterStatus: ClusterStatusRunning}, nil},
+	{[]byte(`{"PostgresClusterStatus":""}`),
+		PostgresStatus{PostgresClusterStatus: ClusterStatusUnknown}, nil},
+	{[]byte(`"Running"`),
+		PostgresStatus{PostgresClusterStatus: ClusterStatusRunning}, nil},
+	{[]byte(`""`),
+		PostgresStatus{PostgresClusterStatus: ClusterStatusUnknown}, nil}}
+
 var unmarshalCluster = []struct {
 	in      []byte
 	out     Postgresql
 	marshal []byte
 	err     error
-}{{
-	[]byte(`{
-  "kind": "Postgresql","apiVersion": "acid.zalan.do/v1",
-  "metadata": {"name": "acid-testcluster1"}, "spec": {"teamId": 100}}`),
-	Postgresql{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Postgresql",
-			APIVersion: "acid.zalan.do/v1",
+}{
+	// example with simple status field
+	{
+		in: []byte(`{
+	  "kind": "Postgresql","apiVersion": "acid.zalan.do/v1",
+	  "metadata": {"name": "acid-testcluster1"}, "spec": {"teamId": 100}}`),
+		out: Postgresql{
+			TypeMeta: metav1.TypeMeta{
+				Kind:       "Postgresql",
+				APIVersion: "acid.zalan.do/v1",
+			},
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "acid-testcluster1",
+			},
+			Status: PostgresStatus{PostgresClusterStatus: ClusterStatusInvalid},
+			// This error message can vary between Go versions, so compute it for the current version.
+			Error: json.Unmarshal([]byte(`{"teamId": 0}`), &PostgresSpec{}).Error(),
 		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name: "acid-testcluster1",
+		marshal: []byte(`{"kind":"Postgresql","apiVersion":"acid.zalan.do/v1","metadata":{"name":"acid-testcluster1","creationTimestamp":null},"spec":{"postgresql":{"version":"","parameters":null},"volume":{"size":"","storageClass":""},"patroni":{"initdb":null,"pg_hba":null,"ttl":0,"loop_wait":0,"retry_timeout":0,"maximum_lag_on_failover":0,"slots":null},"resources":{"requests":{"cpu":"","memory":""},"limits":{"cpu":"","memory":""}},"teamId":"","allowedSourceRanges":null,"numberOfInstances":0,"users":null,"clone":{}},"status":"Invalid"}`),
+		err:     nil},
+	// example with /status subresource
+	{
+		in: []byte(`{
+	  "kind": "Postgresql","apiVersion": "acid.zalan.do/v1",
+	  "metadata": {"name": "acid-testcluster1"}, "spec": {"teamId": 100}}`),
+		out: Postgresql{
+			TypeMeta: metav1.TypeMeta{
+				Kind:       "Postgresql",
+				APIVersion: "acid.zalan.do/v1",
+			},
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "acid-testcluster1",
+			},
+			Status: PostgresStatus{PostgresClusterStatus: ClusterStatusInvalid},
+			// This error message can vary between Go versions, so compute it for the current version.
+			Error: json.Unmarshal([]byte(`{"teamId": 0}`), &PostgresSpec{}).Error(),
 		},
-		Status: ClusterStatusInvalid,
-		// This error message can vary between Go versions, so compute it for the current version.
-		Error: json.Unmarshal([]byte(`{"teamId": 0}`), &PostgresSpec{}).Error(),
-	},
-	[]byte(`{"kind":"Postgresql","apiVersion":"acid.zalan.do/v1","metadata":{"name":"acid-testcluster1","creationTimestamp":null},"spec":{"postgresql":{"version":"","parameters":null},"volume":{"size":"","storageClass":""},"patroni":{"initdb":null,"pg_hba":null,"ttl":0,"loop_wait":0,"retry_timeout":0,"maximum_lag_on_failover":0,"slots":null},"resources":{"requests":{"cpu":"","memory":""},"limits":{"cpu":"","memory":""}},"teamId":"","allowedSourceRanges":null,"numberOfInstances":0,"users":null,"clone":{}},"status":"Invalid"}`), nil},
-	{[]byte(`{
-  "kind": "Postgresql",
-  "apiVersion": "acid.zalan.do/v1",
-  "metadata": {
-    "name": "acid-testcluster1"
-  },
-  "spec": {
-    "teamId": "ACID",
-    "volume": {
-      "size": "5Gi",
-      "storageClass": "SSD"
-    },
-    "numberOfInstances": 2,
-    "users": {
-      "zalando": [
-        "superuser",
-        "createdb"
-      ]
-    },
-    "allowedSourceRanges": [
-      "127.0.0.1/32"
-    ],
-    "postgresql": {
-      "version": "9.6",
-      "parameters": {
-        "shared_buffers": "32MB",
-        "max_connections": "10",
-        "log_statement": "all"
-      }
-    },
-    "resources": {
-      "requests": {
-        "cpu": "10m",
-        "memory": "50Mi"
-      },
-      "limits": {
-        "cpu": "300m",
-        "memory": "3000Mi"
-      }
-    },
-    "clone" : {
-     "cluster": "acid-batman"
-     },
-    "patroni": {
-      "initdb": {
-        "encoding": "UTF8",
-        "locale": "en_US.UTF-8",
-        "data-checksums": "true"
-      },
-      "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" : {
-			  "type"     : "logical",
-			  "database" : "foo",
-			  "plugin"   : "pgoutput"
-	       }
+		marshal: []byte(`{"kind":"Postgresql","apiVersion":"acid.zalan.do/v1","metadata":{"name":"acid-testcluster1","creationTimestamp":null},"spec":{"postgresql":{"version":"","parameters":null},"volume":{"size":"","storageClass":""},"patroni":{"initdb":null,"pg_hba":null,"ttl":0,"loop_wait":0,"retry_timeout":0,"maximum_lag_on_failover":0,"slots":null},"resources":{"requests":{"cpu":"","memory":""},"limits":{"cpu":"","memory":""}},"teamId":"","allowedSourceRanges":null,"numberOfInstances":0,"users":null,"clone":{}},"status":{"PostgresClusterStatus":"Invalid"}}`),
+		err:     nil},
+	// example with detailed input manifest
+	{
+		in: []byte(`{
+	  "kind": "Postgresql",
+	  "apiVersion": "acid.zalan.do/v1",
+	  "metadata": {
+	    "name": "acid-testcluster1"
+	  },
+	  "spec": {
+	    "teamId": "ACID",
+	    "volume": {
+	      "size": "5Gi",
+	      "storageClass": "SSD"
+	    },
+	    "numberOfInstances": 2,
+	    "users": {
+	      "zalando": [
+	        "superuser",
+	        "createdb"
+	      ]
+	    },
+	    "allowedSourceRanges": [
+	      "127.0.0.1/32"
+	    ],
+	    "postgresql": {
+	      "version": "9.6",
+	      "parameters": {
+	        "shared_buffers": "32MB",
+	        "max_connections": "10",
+	        "log_statement": "all"
+	      }
+	    },
+	    "resources": {
+	      "requests": {
+	        "cpu": "10m",
+	        "memory": "50Mi"
+	      },
+	      "limits": {
+	        "cpu": "300m",
+	        "memory": "3000Mi"
+	      }
+	    },
+	    "clone" : {
+	     "cluster": "acid-batman"
+	     },
+	    "patroni": {
+	      "initdb": {
+	        "encoding": "UTF8",
+	        "locale": "en_US.UTF-8",
+	        "data-checksums": "true"
+	      },
+	      "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" : {
+					  "type"     : "logical",
+					  "database" : "foo",
+					  "plugin"   : "pgoutput"
+			       }
+			  }
+	  	},
+	  	"maintenanceWindows": [
+	    	"Mon:01:00-06:00",
+	    	"Sat:00:00-04:00",
+	    	"05:00-05:15"
+	  	]
 	  }
-    },
-    "maintenanceWindows": [
-      "Mon:01:00-06:00",
-      "Sat:00:00-04:00",
-      "05:00-05:15"
-    ]
-  }
-}`),
-		Postgresql{
+		}`),
+		out: Postgresql{
 			TypeMeta: metav1.TypeMeta{
 				Kind:       "Postgresql",
 				APIVersion: "acid.zalan.do/v1",
@@ -273,10 +311,12 @@ var unmarshalCluster = []struct {
 			},
 			Error: "",
 		},
-		[]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"},"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"}}}`), nil},
+		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"},"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
 	{
-		[]byte(`{"kind": "Postgresql","apiVersion": "acid.zalan.do/v1","metadata": {"name": "teapot-testcluster1"}, "spec": {"teamId": "acid"}}`),
-		Postgresql{
+		in: []byte(`{"kind": "Postgresql","apiVersion": "acid.zalan.do/v1","metadata": {"name": "teapot-testcluster1"}, "spec": {"teamId": "acid"}}`),
+		out: Postgresql{
 			TypeMeta: metav1.TypeMeta{
 				Kind:       "Postgresql",
 				APIVersion: "acid.zalan.do/v1",
@@ -285,10 +325,12 @@ var unmarshalCluster = []struct {
 				Name: "teapot-testcluster1",
 			},
 			Spec:   PostgresSpec{TeamID: "acid"},
-			Status: ClusterStatusInvalid,
+			Status: PostgresStatus{PostgresClusterStatus: ClusterStatusInvalid},
 			Error:  errors.New("name must match {TEAM}-{NAME} format").Error(),
 		},
-		[]byte(`{"kind":"Postgresql","apiVersion":"acid.zalan.do/v1","metadata":{"name":"teapot-testcluster1","creationTimestamp":null},"spec":{"postgresql":{"version":"","parameters":null},"volume":{"size":"","storageClass":""},"patroni":{"initdb":null,"pg_hba":null,"ttl":0,"loop_wait":0,"retry_timeout":0,"maximum_lag_on_failover":0,"slots":null},"resources":{"requests":{"cpu":"","memory":""},"limits":{"cpu":"","memory":""}},"teamId":"acid","allowedSourceRanges":null,"numberOfInstances":0,"users":null,"clone":{}},"status":"Invalid"}`), nil},
+		marshal: []byte(`{"kind":"Postgresql","apiVersion":"acid.zalan.do/v1","metadata":{"name":"teapot-testcluster1","creationTimestamp":null},"spec":{"postgresql":{"version":"","parameters":null},"volume":{"size":"","storageClass":""},"patroni":{"initdb":null,"pg_hba":null,"ttl":0,"loop_wait":0,"retry_timeout":0,"maximum_lag_on_failover":0,"slots":null},"resources":{"requests":{"cpu":"","memory":""},"limits":{"cpu":"","memory":""}},"teamId":"acid","allowedSourceRanges":null,"numberOfInstances":0,"users":null,"clone":{}},"status":{"PostgresClusterStatus":"Invalid"}}`),
+		err:     nil},
+	// clone example
 	{
 		in: []byte(`{"kind": "Postgresql","apiVersion": "acid.zalan.do/v1","metadata": {"name": "acid-testcluster1"}, "spec": {"teamId": "acid", "clone": {"cluster": "team-batman"}}}`),
 		out: Postgresql{
@@ -308,22 +350,26 @@ var unmarshalCluster = []struct {
 			},
 			Error: "",
 		},
-		marshal: []byte(`{"kind":"Postgresql","apiVersion":"acid.zalan.do/v1","metadata":{"name":"acid-testcluster1","creationTimestamp":null},"spec":{"postgresql":{"version":"","parameters":null},"volume":{"size":"","storageClass":""},"patroni":{"initdb":null,"pg_hba":null,"ttl":0,"loop_wait":0,"retry_timeout":0,"maximum_lag_on_failover":0,"slots":null},"resources":{"requests":{"cpu":"","memory":""},"limits":{"cpu":"","memory":""}},"teamId":"acid","allowedSourceRanges":null,"numberOfInstances":0,"users":null,"clone":{"cluster":"team-batman"}}}`), err: nil},
-	{[]byte(`{"kind": "Postgresql","apiVersion": "acid.zalan.do/v1"`),
-		Postgresql{},
-		[]byte{},
-		errors.New("unexpected end of JSON input")},
-	{[]byte(`{"kind":"Postgresql","apiVersion":"acid.zalan.do/v1","metadata":{"name":"acid-testcluster","creationTimestamp":qaz},"spec":{"postgresql":{"version":"","parameters":null},"volume":{"size":"","storageClass":""},"patroni":{"initdb":null,"pg_hba":null,"ttl":0,"loop_wait":0,"retry_timeout":0,"maximum_lag_on_failover":0,"slots":null},"resources":{"requests":{"cpu":"","memory":""},"limits":{"cpu":"","memory":""}},"teamId":"acid","allowedSourceRanges":null,"numberOfInstances":0,"users":null,"clone":{}},"status":"Invalid"}`),
-		Postgresql{},
-		[]byte{},
-		errors.New("invalid character 'q' looking for beginning of value")}}
+		marshal: []byte(`{"kind":"Postgresql","apiVersion":"acid.zalan.do/v1","metadata":{"name":"acid-testcluster1","creationTimestamp":null},"spec":{"postgresql":{"version":"","parameters":null},"volume":{"size":"","storageClass":""},"patroni":{"initdb":null,"pg_hba":null,"ttl":0,"loop_wait":0,"retry_timeout":0,"maximum_lag_on_failover":0,"slots":null},"resources":{"requests":{"cpu":"","memory":""},"limits":{"cpu":"","memory":""}},"teamId":"acid","allowedSourceRanges":null,"numberOfInstances":0,"users":null,"clone":{"cluster":"team-batman"}},"status":{"PostgresClusterStatus":""}}`),
+		err:     nil},
+	// erroneous examples
+	{
+		in:      []byte(`{"kind": "Postgresql","apiVersion": "acid.zalan.do/v1"`),
+		out:     Postgresql{},
+		marshal: []byte{},
+		err:     errors.New("unexpected end of JSON input")},
+	{
+		in:      []byte(`{"kind":"Postgresql","apiVersion":"acid.zalan.do/v1","metadata":{"name":"acid-testcluster","creationTimestamp":qaz},"spec":{"postgresql":{"version":"","parameters":null},"volume":{"size":"","storageClass":""},"patroni":{"initdb":null,"pg_hba":null,"ttl":0,"loop_wait":0,"retry_timeout":0,"maximum_lag_on_failover":0,"slots":null},"resources":{"requests":{"cpu":"","memory":""},"limits":{"cpu":"","memory":""}},"teamId":"acid","allowedSourceRanges":null,"numberOfInstances":0,"users":null,"clone":{}},"status":{"PostgresClusterStatus":"Invalid"}}`),
+		out:     Postgresql{},
+		marshal: []byte{},
+		err:     errors.New("invalid character 'q' looking for beginning of value")}}

 var postgresqlList = []struct {
 	in  []byte
 	out PostgresqlList
 	err error
 }{
-	{[]byte(`{"apiVersion":"v1","items":[{"apiVersion":"acid.zalan.do/v1","kind":"Postgresql","metadata":{"labels":{"team":"acid"},"name":"acid-testcluster42","namespace":"default","resourceVersion":"30446957","selfLink":"/apis/acid.zalan.do/v1/namespaces/default/postgresqls/acid-testcluster42","uid":"857cd208-33dc-11e7-b20a-0699041e4b03"},"spec":{"allowedSourceRanges":["185.85.220.0/22"],"numberOfInstances":1,"postgresql":{"version":"9.6"},"teamId":"acid","volume":{"size":"10Gi"}},"status":"Running"}],"kind":"List","metadata":{},"resourceVersion":"","selfLink":""}`),
+	{[]byte(`{"apiVersion":"v1","items":[{"apiVersion":"acid.zalan.do/v1","kind":"Postgresql","metadata":{"labels":{"team":"acid"},"name":"acid-testcluster42","namespace":"default","resourceVersion":"30446957","selfLink":"/apis/acid.zalan.do/v1/namespaces/default/postgresqls/acid-testcluster42","uid":"857cd208-33dc-11e7-b20a-0699041e4b03"},"spec":{"allowedSourceRanges":["185.85.220.0/22"],"numberOfInstances":1,"postgresql":{"version":"9.6"},"teamId":"acid","volume":{"size":"10Gi"}},"status":{"PostgresClusterStatus":"Running"}}],"kind":"List","metadata":{},"resourceVersion":"","selfLink":""}`),
 		PostgresqlList{
 			TypeMeta: metav1.TypeMeta{
 				Kind:       "List",
@@ -350,8 +396,10 @@ var postgresqlList = []struct {
 					AllowedSourceRanges: []string{"185.85.220.0/22"},
 					NumberOfInstances:   1,
 				},
-				Status: ClusterStatusRunning,
-				Error:  "",
+				Status: PostgresStatus{
+					PostgresClusterStatus: ClusterStatusRunning,
+				},
+				Error: "",
 			}},
 		},
 		nil},
@@ -469,6 +517,25 @@ func TestMarshalMaintenanceWindow(t *testing.T) {
 	}
 }

+func TestUnmarshalPostgresStatus(t *testing.T) {
+	for _, tt := range postgresStatus {
+		var ps PostgresStatus
+		err := ps.UnmarshalJSON(tt.in)
+		if err != nil {
+			if tt.err == nil || err.Error() != tt.err.Error() {
+				t.Errorf("CR status unmarshal expected error: %v, got %v", tt.err, err)
+			}
+			continue
+			//} else if tt.err != nil {
+			//t.Errorf("Expected error: %v", tt.err)
+		}
+
+		if !reflect.DeepEqual(ps, tt.out) {
+			t.Errorf("Expected status: %#v, got: %#v", tt.out, ps)
+		}
+	}
+}
+
 func TestPostgresUnmarshal(t *testing.T) {
 	for _, tt := range unmarshalCluster {
 		var cluster Postgresql
@@ -494,12 +561,26 @@ func TestMarshal(t *testing.T) {
 			continue
 		}

+		// Unmarshal and marshal example to capture api changes
+		var cluster Postgresql
+		err := cluster.UnmarshalJSON(tt.marshal)
+		if err != nil {
+			if tt.err == nil || err.Error() != tt.err.Error() {
+				t.Errorf("Backwards compatibility unmarshal expected error: %v, got: %v", tt.err, err)
+			}
+			continue
+		}
+		expected, err := json.Marshal(cluster)
+		if err != nil {
+			t.Errorf("Backwards compatibility marshal error: %v", err)
+		}
+
 		m, err := json.Marshal(tt.out)
 		if err != nil {
 			t.Errorf("Marshal error: %v", err)
 		}
-		if !bytes.Equal(m, tt.marshal) {
-			t.Errorf("Marshal Postgresql \nexpected: %q, \ngot:      %q", string(tt.marshal), string(m))
+		if !bytes.Equal(m, expected) {
+			t.Errorf("Marshal Postgresql \nexpected: %q, \ngot:      %q", string(expected), string(m))
 		}
 	}
 }
@@ -479,6 +479,22 @@ func (in *PostgresSpec) DeepCopy() *PostgresSpec {
 	return out
 }

+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PostgresStatus) DeepCopyInto(out *PostgresStatus) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PostgresStatus.
+func (in *PostgresStatus) DeepCopy() *PostgresStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(PostgresStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PostgresUsersConfiguration) DeepCopyInto(out *PostgresUsersConfiguration) {
 	*out = *in
@@ -501,6 +517,7 @@ func (in *Postgresql) DeepCopyInto(out *Postgresql) {
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
+	out.Status = in.Status
 	return
 }