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

add new options to crds.go

This commit is contained in:
Felix Kunde 2022-03-01 14:39:19 +01:00
parent e805f60b77
commit e61add5f6f
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
e2e/tests/test_e2e.py
View File

@ -479,6 +479,8 @@ class EndToEndTestCase(unittest.TestCase):
'spec': { 'spec': {
'enableConnectionPooler': True, 'enableConnectionPooler': True,
'enableReplicaConnectionPooler': True, 'enableReplicaConnectionPooler': True,
'enableMasterPoolerLoadBalancer': True,
'enableReplicaPoolerLoadBalancer': True,
} }
}) })
self.eventuallyEqual(lambda: k8s.get_operator_state(), {"0": "idle"}, "Operator does not get in sync") self.eventuallyEqual(lambda: k8s.get_operator_state(), {"0": "idle"}, "Operator does not get in sync")
@ -488,18 +490,6 @@ class EndToEndTestCase(unittest.TestCase):
self.eventuallyEqual(lambda: k8s.count_running_pods(replica_pooler_label), 2, "No pooler replica pods found") self.eventuallyEqual(lambda: k8s.count_running_pods(replica_pooler_label), 2, "No pooler replica pods found")
self.eventuallyEqual(lambda: k8s.count_services_with_label(pooler_label), 2, "No pooler service found") self.eventuallyEqual(lambda: k8s.count_services_with_label(pooler_label), 2, "No pooler service found")
self.eventuallyEqual(lambda: k8s.count_secrets_with_label(pooler_label), 1, "Pooler secret not created") self.eventuallyEqual(lambda: k8s.count_secrets_with_label(pooler_label), 1, "Pooler secret not created")
k8s.api.custom_objects_api.patch_namespaced_custom_object(
'acid.zalan.do', 'v1', 'default',
'postgresqls', 'acid-minimal-cluster',
{
'spec': {
'enableMasterPoolerLoadBalancer': True,
'enableReplicaPoolerLoadBalancer': True,
}
})
self.eventuallyEqual(lambda: k8s.get_operator_state(), {"0": "idle"}, "Operator does not get in sync")
self.eventuallyEqual(lambda: k8s.get_service_type(master_pooler_label+","+pooler_label), self.eventuallyEqual(lambda: k8s.get_service_type(master_pooler_label+","+pooler_label),
'LoadBalancer', 'LoadBalancer',
"Expected LoadBalancer service type for master pooler pod, found {}") "Expected LoadBalancer service type for master pooler pod, found {}")
@ -584,6 +574,7 @@ class EndToEndTestCase(unittest.TestCase):
'spec': { 'spec': {
'enableConnectionPooler': False, 'enableConnectionPooler': False,
'enableReplicaConnectionPooler': False, 'enableReplicaConnectionPooler': False,
'enableReplicaPoolerLoadBalancer': False,
} }
}) })

6
pkg/apis/acid.zalan.do/v1/crds.go
View File

@ -302,9 +302,15 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
"enableMasterLoadBalancer": { "enableMasterLoadBalancer": {
Type: "boolean", Type: "boolean",
}, },
"enableMasterPoolerLoadBalancer": {
Type: "boolean",
},
"enableReplicaLoadBalancer": { "enableReplicaLoadBalancer": {
Type: "boolean", Type: "boolean",
}, },
"enableReplicaPoolerLoadBalancer": {
Type: "boolean",
},
"enableShmVolume": { "enableShmVolume": {
Type: "boolean", Type: "boolean",
}, },

4
pkg/cluster/k8sres.go
View File

@ -1684,10 +1684,6 @@ func (c *Cluster) generateService(role PostgresRole, spec *acidv1.PostgresSpec)
if c.shouldCreateLoadBalancerForService(role, spec) { if c.shouldCreateLoadBalancerForService(role, spec) {
c.configureLoadBalanceService(&serviceSpec, spec.AllowedSourceRanges) c.configureLoadBalanceService(&serviceSpec, spec.AllowedSourceRanges)
} else if role == Replica {
// before PR #258, the replica service was only created if allocated a LB
// now we always create the service but warn if the LB is absent
c.logger.Debugf("No load balancer created for the replica service")
} }
service := &v1.Service{ service := &v1.Service{