From 1182c83e2feee375242157fbe96d444cc7ad791c Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Tue, 16 Jul 2019 15:50:43 +0200 Subject: [PATCH 1/2] change app label for logical backup pod --- e2e/tests/test_e2e.py | 3 ++- pkg/cluster/k8sres.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py index c232ba7ac..e9b024a74 100644 --- a/e2e/tests/test_e2e.py +++ b/e2e/tests/test_e2e.py @@ -307,7 +307,8 @@ def wait_for_master_failover(self, expected_master_nodes, namespace='default'): time.sleep(self.RETRY_TIMEOUT_SEC) def get_logical_backup_job(self, namespace='default'): - return self.api.batch_v1_beta1.list_namespaced_cron_job(namespace, label_selector="application=spilo") + return self.api.batch_v1_beta1.list_namespaced_cron_job( + namespace, label_selector="application=spilo-logical-backup") def wait_for_logical_backup_job(self, expected_num_of_jobs): while (len(self.get_logical_backup_job().items) != expected_num_of_jobs): diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go index 54b123a18..66759ff16 100644 --- a/pkg/cluster/k8sres.go +++ b/pkg/cluster/k8sres.go @@ -1465,7 +1465,7 @@ func (c *Cluster) generateLogicalBackupJob() (*batchv1beta1.CronJob, error) { // re-use the method that generates DB pod templates if podTemplate, err = generatePodTemplate( c.Namespace, - c.labelsSet(true), + labels, logicalBackupContainer, []v1.Container{}, []v1.Container{}, From d294d7057ebbba146863c34b9257d3043fcaacc4 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Tue, 16 Jul 2019 18:13:42 +0200 Subject: [PATCH 2/2] fix test --- e2e/tests/test_e2e.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py index e9b024a74..c232ba7ac 100644 --- a/e2e/tests/test_e2e.py +++ b/e2e/tests/test_e2e.py @@ -307,8 +307,7 @@ def wait_for_master_failover(self, expected_master_nodes, namespace='default'): time.sleep(self.RETRY_TIMEOUT_SEC) def get_logical_backup_job(self, namespace='default'): - return self.api.batch_v1_beta1.list_namespaced_cron_job( - namespace, label_selector="application=spilo-logical-backup") + return self.api.batch_v1_beta1.list_namespaced_cron_job(namespace, label_selector="application=spilo") def wait_for_logical_backup_job(self, expected_num_of_jobs): while (len(self.get_logical_backup_job().items) != expected_num_of_jobs):