public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

wait longer for service update

This commit is contained in:
Felix Kunde 2020-02-13 12:11:36 +01:00
parent 64b5cd1e95
commit d3cf93b5cf
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
e2e/tests/test_e2e.py
View File

@ -77,7 +77,7 @@ class EndToEndTestCase(unittest.TestCase):
k8s.api.custom_objects_api.patch_namespaced_custom_object( k8s.api.custom_objects_api.patch_namespaced_custom_object(
"acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_enable_lbs) "acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_enable_lbs)
# wait for service recreation # wait for service recreation
time.sleep(10) time.sleep(30)
master_svc_type = k8s.get_service_type(cluster_label + ',spilo-role=master') master_svc_type = k8s.get_service_type(cluster_label + ',spilo-role=master')
self.assertEqual(master_svc_type, 'LoadBalancer', self.assertEqual(master_svc_type, 'LoadBalancer',
@ -97,7 +97,7 @@ class EndToEndTestCase(unittest.TestCase):
k8s.api.custom_objects_api.patch_namespaced_custom_object( k8s.api.custom_objects_api.patch_namespaced_custom_object(
"acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_disable_lbs) "acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_disable_lbs)
# wait for service recreation # wait for service recreation
time.sleep(10) time.sleep(30)
master_svc_type = k8s.get_service_type(cluster_label + ',spilo-role=master') master_svc_type = k8s.get_service_type(cluster_label + ',spilo-role=master')
self.assertEqual(master_svc_type, 'ClusterIP', self.assertEqual(master_svc_type, 'ClusterIP',
@ -107,7 +107,6 @@ class EndToEndTestCase(unittest.TestCase):
self.assertEqual(repl_svc_type, 'ClusterIP', self.assertEqual(repl_svc_type, 'ClusterIP',
"Expected ClusterIP service type for replica, found {}".format(repl_svc_type)) "Expected ClusterIP service type for replica, found {}".format(repl_svc_type))
"""
@timeout_decorator.timeout(TEST_TIMEOUT_SEC) @timeout_decorator.timeout(TEST_TIMEOUT_SEC)
def test_min_resource_limits(self): def test_min_resource_limits(self):
''' '''
@ -337,7 +336,6 @@ class EndToEndTestCase(unittest.TestCase):
} }
} }
k8s.update_config(unpatch_custom_service_annotations) k8s.update_config(unpatch_custom_service_annotations)
"""
def assert_master_is_unique(self, namespace='default', version="acid-minimal-cluster"): def assert_master_is_unique(self, namespace='default', version="acid-minimal-cluster"):
''' '''

4
pkg/cluster/resources.go
View File

@ -395,7 +395,8 @@ func (c *Cluster) updateService(role PostgresRole, newService *v1.Service) error
} }
} }
// when disabling LoadBalancers patch does not work because of LoadBalancerSourceRanges field (even if nil) // now, patch the service spec, but when disabling LoadBalancers do update instead
// patch does not work because of LoadBalancerSourceRanges field (even if set to nil)
oldServiceType := c.Services[role].Spec.Type oldServiceType := c.Services[role].Spec.Type
newServiceType := newService.Spec.Type newServiceType := newService.Spec.Type
if newServiceType == "ClusterIP" && newServiceType != oldServiceType { if newServiceType == "ClusterIP" && newServiceType != oldServiceType {
@ -411,7 +412,6 @@ func (c *Cluster) updateService(role PostgresRole, newService *v1.Service) error
return fmt.Errorf("could not form patch for the service %q: %v", serviceName, err) return fmt.Errorf("could not form patch for the service %q: %v", serviceName, err)
} }
// update the service spec
svc, err = c.KubeClient.Services(serviceName.Namespace).Patch( svc, err = c.KubeClient.Services(serviceName.Namespace).Patch(
serviceName.Name, serviceName.Name,
types.MergePatchType, types.MergePatchType,