Add observedGeneration field to status of postgresql resource

Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>

Author: mikkeloscar

manifests/postgresql.crd.yaml

@@ -4189,6 +4189,9 @@ spec:
             properties:
               PostgresClusterStatus:
                 type: string
+              observedGeneration:
+                format: int64
+                type: integer
             required:
             - PostgresClusterStatus
             type: object

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

@@ -301,6 +301,7 @@ type UserFlags []string
 // PostgresStatus contains status of the PostgreSQL cluster (running, creation failed etc.)
 type PostgresStatus struct {
 	PostgresClusterStatus string `json:"PostgresClusterStatus"`
+	ObservedGeneration    int64  `json:"observedGeneration,omitempty"`
 }
 
 // ConnectionPooler Options for connection pooler

pkg/cluster/cluster.go

@@ -275,6 +275,7 @@ func (c *Cluster) Create() (err error) {
 		currentStatus := c.Status.DeepCopy()
 		pg := c.Postgresql.DeepCopy()
 		pg.Status.PostgresClusterStatus = acidv1.ClusterStatusRunning
+		pg.Status.ObservedGeneration = pgCreateStatus.Generation
 
 		if err != nil {
 			c.logger.Warningf("cluster created failed: %v", err)
@@ -998,6 +999,7 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error {
 	defer func() {
 		currentStatus := newSpec.Status.DeepCopy()
 		newSpec.Status.PostgresClusterStatus = acidv1.ClusterStatusRunning
+		newSpec.Status.ObservedGeneration = newSpec.Generation
 
 		if updateFailed {
 			newSpec.Status.PostgresClusterStatus = acidv1.ClusterStatusUpdateFailed

pkg/cluster/sync.go

@@ -44,6 +44,9 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error {
 	c.setSpec(newSpec)
 
 	defer func() {
+		// update observedGeneration to reflect that the latest spec
+		// was processed
+		newSpec.Status.ObservedGeneration = newSpec.Generation
 		if err != nil {
 			c.logger.Warningf("error while syncing cluster state: %v", err)
 			newSpec.Status.PostgresClusterStatus = acidv1.ClusterStatusSyncFailed

pkg/cluster/util_test.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"github.com/zalando/postgres-operator/mocks"
 	acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1"
 	fakeacidv1 "github.com/zalando/postgres-operator/pkg/generated/clientset/versioned/fake"
@@ -589,9 +590,16 @@ func TestInheritedAnnotations(t *testing.T) {
 	// + new PVC
 	cluster.KubeClient.PersistentVolumeClaims(namespace).Create(context.TODO(), &CreatePVCs(namespace, clusterName, filterLabels, 4, "1Gi").Items[3], metav1.CreateOptions{})
 
+	newSpec, err = cluster.KubeClient.Postgresqls(namespace).Update(context.TODO(), newSpec, metav1.UpdateOptions{})
+	assert.NoError(t, err)
+
+	generation := newSpec.Generation
+
 	err = cluster.Update(cluster.Postgresql.DeepCopy(), newSpec)
 	assert.NoError(t, err)
 
+	require.Equal(t, generation, cluster.Postgresql.Status.ObservedGeneration)
+
 	err = checkResourcesInheritedAnnotations(cluster, result)
 	assert.NoError(t, err)