From ddfa26e6bd53844a9de4b13d0a944c13aa657224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Mu=C3=9Fler?= <janm81@gmail.com>
Date: Fri, 13 Nov 2020 21:53:13 +0100
Subject: [PATCH] Build failing e2e displaying the problem of currently
 generated pooler deployment selector.

---
 e2e/scripts/watch_objects.sh                  |  3 +-
 e2e/tests/test_e2e.py                         | 29 ++++++++++++++++
 manifests/minimal-fake-pooler-deployment.yaml | 34 +++++++++++++++++++
 manifests/postgres-operator.yaml              |  2 ++
 4 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 manifests/minimal-fake-pooler-deployment.yaml

diff --git a/e2e/scripts/watch_objects.sh b/e2e/scripts/watch_objects.sh
index 52364f247..4c9b82404 100755
--- a/e2e/scripts/watch_objects.sh
+++ b/e2e/scripts/watch_objects.sh
@@ -16,7 +16,8 @@ echo 'Statefulsets'
 kubectl get statefulsets --all-namespaces
 echo
 echo 'Deployments'
-kubectl get deployments --all-namespaces -l application=db-connection-pooler -l name=postgres-operator
+kubectl get deployments --all-namespaces -l application=db-connection-pooler
+kubectl get deployments --all-namespaces -l application=postgres-operator
 echo
 echo
 echo 'Step from operator deployment'
diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py
index f863123bd..ab98541cb 100644
--- a/e2e/tests/test_e2e.py
+++ b/e2e/tests/test_e2e.py
@@ -152,6 +152,35 @@ class EndToEndTestCase(unittest.TestCase):
             print('Operator log: {}'.format(k8s.get_operator_log()))
             raise
 
+    def test_a_overwrite_pooler_deployment(self):
+        result = self.k8s.create_with_kubectl("manifests/minimal-fake-pooler-deployment.yaml")
+        self.eventuallyEqual(lambda: self.k8s.get_operator_state(), {"0": "idle"}, "Operator does not get in sync")
+
+        self.k8s.api.custom_objects_api.patch_namespaced_custom_object(
+        'acid.zalan.do', 'v1', 'default',
+        'postgresqls', 'acid-minimal-cluster',
+        {
+            'spec': {
+                'enableConnectionPooler': True
+            }
+        })
+
+        self.eventuallyEqual(lambda: self.k8s.get_deployment_replica_count(name="acid-minimal-cluster-pooler"), 2,
+                             "Operator did not succeed in overwriting labels")
+
+        self.k8s.api.custom_objects_api.patch_namespaced_custom_object(
+        'acid.zalan.do', 'v1', 'default',
+        'postgresqls', 'acid-minimal-cluster',
+        {
+            'spec': {
+                'enableConnectionPooler': False
+            }
+        })
+
+        self.eventuallyEqual(lambda: self.k8s.count_running_pods("connection-pooler=acid-minimal-cluster-pooler"),
+                             0, "Pooler pods not scaled down")
+
+
     @timeout_decorator.timeout(TEST_TIMEOUT_SEC)
     def test_enable_disable_connection_pooler(self):
         '''
diff --git a/manifests/minimal-fake-pooler-deployment.yaml b/manifests/minimal-fake-pooler-deployment.yaml
new file mode 100644
index 000000000..fdbdc4c55
--- /dev/null
+++ b/manifests/minimal-fake-pooler-deployment.yaml
@@ -0,0 +1,34 @@
+# will not run but is good enough for tests to fail
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: acid-minimal-cluster-pooler
+  labels:
+    application: db-connection-pooler
+    connection-pooler: acid-minimal-cluster-pooler
+    cluster-name: acid-minimal-cluster
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      application: db-connection-pooler
+      connection-pooler: acid-minimal-cluster-pooler
+  template:
+    metadata:
+      labels:
+        application: db-connection-pooler
+        connection-pooler: acid-minimal-cluster-pooler
+    spec:
+      serviceAccountName: postgres-operator
+      containers:
+      - name: postgres-operator
+        image: registry.opensource.zalan.do/acid/pgbouncer:master-11
+        imagePullPolicy: IfNotPresent
+        resources:
+          requests:
+            cpu: 100m
+            memory: 250Mi
+          limits:
+            cpu: 500m
+            memory: 500Mi
+        env: []
diff --git a/manifests/postgres-operator.yaml b/manifests/postgres-operator.yaml
index 16719a5d9..ac319631b 100644
--- a/manifests/postgres-operator.yaml
+++ b/manifests/postgres-operator.yaml
@@ -2,6 +2,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: postgres-operator
+  labels:
+    application: postgres-operator
 spec:
   replicas: 1
   strategy: