From 88e89956e0105b6939298e7c10f09ea5711a4f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Mu=C3=9Fler?= <janm81@gmail.com>
Date: Mon, 26 Oct 2020 23:24:03 +0100
Subject: [PATCH] Verify explicit sync of deployment.

---
 e2e/scripts/cleanup.sh | 7 +++++++
 e2e/tests/k8s_api.py   | 8 ++++++++
 e2e/tests/test_e2e.py  | 2 ++
 3 files changed, 17 insertions(+)
 create mode 100755 e2e/scripts/cleanup.sh

diff --git a/e2e/scripts/cleanup.sh b/e2e/scripts/cleanup.sh
new file mode 100755
index 000000000..2c82388ae
--- /dev/null
+++ b/e2e/scripts/cleanup.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+kubectl delete postgresql acid-minimal-cluster
+kubectl delete deployments -l application=db-connection-pooler,cluster-name=acid-minimal-cluster
+kubectl delete statefulsets -l application=spilo,cluster-name=acid-minimal-cluster
+kubectl delete services -l application=spilo,cluster-name=acid-minimal-cluster
+kubectl delete configmap postgres-operator
+kubectl delete deployment postgres-operator
\ No newline at end of file
diff --git a/e2e/tests/k8s_api.py b/e2e/tests/k8s_api.py
index 1f481120e..f1930efdf 100644
--- a/e2e/tests/k8s_api.py
+++ b/e2e/tests/k8s_api.py
@@ -9,6 +9,7 @@ import yaml
 
 from datetime import datetime
 from kubernetes import client, config
+from kubernetes.client.rest import ApiException
 
 class K8sApi:
 
@@ -222,6 +223,13 @@ class K8s:
     def get_patroni_running_members(self, pod="acid-minimal-cluster-0"):
         result = self.get_patroni_state(pod)
         return list(filter(lambda x: "State" in x and x["State"] == "running", result))
+
+    def get_deployment_replica_count(self, name="acid-minimal-cluster-pooler", namespace="default"):
+        try:
+            deployment = self.api.apps_v1.read_namespaced_deployment(name, namespace)
+            return deployment.spec.replicas
+        except ApiException as e:
+            return None
     
     def get_statefulset_image(self, label_selector="application=spilo,cluster-name=acid-minimal-cluster", namespace='default'):
         ssets = self.api.apps_v1.list_namespaced_stateful_set(namespace, label_selector=label_selector, limit=1)
diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py
index dbe513631..1f9a6f725 100644
--- a/e2e/tests/test_e2e.py
+++ b/e2e/tests/test_e2e.py
@@ -162,6 +162,7 @@ class EndToEndTestCase(unittest.TestCase):
                 }
             })
 
+        self.eventuallyEqual(lambda: k8s.get_deployment_replica_count(), 2, "Deployment replicas is 2 default")
         self.eventuallyEqual(lambda: k8s.count_running_pods("connection-pooler=acid-minimal-cluster-pooler"), 2, "No pooler pods found")
         self.eventuallyEqual(lambda: k8s.count_services_with_label('application=db-connection-pooler,cluster-name=acid-minimal-cluster'), 1, "No pooler service found")
 
@@ -177,6 +178,7 @@ class EndToEndTestCase(unittest.TestCase):
                 }
             })
 
+        self.eventuallyEqual(lambda: k8s.get_deployment_replica_count(), 3, "Deployment replicas is scaled to 3")
         self.eventuallyEqual(lambda: k8s.count_running_pods("connection-pooler=acid-minimal-cluster-pooler"), 3, "Scale up of pooler pods does not work")
 
         # turn it off, keeping config should be overwritten by false