Fix connection pooler deployment selectors #1213
Merged
+92
−20
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…r deployment selector.
Jan-M
requested review from
CyberDem0n,
FxKu,
RafiaSabih,
avaczi,
erthalion and
sdudoladov
as code owners
Jan-M
commented
Nov 16, 2020
pkg/cluster/connection_pooler.go
Outdated
| // not interfere with it (it lists all the pods via labels, and if there would | ||
| // be no difference, it will recreate also pooler pods). | ||
| func (c *Cluster) connectionPoolerLabelsSelector(role PostgresRole) *metav1.LabelSelector { | ||
| func (c *Cluster) connectionPoolerLabelsSelector(role PostgresRole, moreLabels bool) *metav1.LabelSelector { |
Member
Author
There was a problem hiding this comment.
Maybe we can rename this function now to not be called "Selector" - that would be more fitting
Jan-M
commented
Nov 16, 2020
e2e/tests/test_e2e.py
Outdated
| } | ||
| }) | ||
|
|
||
| time.sleep(10) |
Member
Author
There was a problem hiding this comment.
no more sleeps, artificially slowing things down. lets talk about the issue here
FxKu
reviewed
Nov 19, 2020
pkg/cluster/connection_pooler.go
Outdated
| podTemplate := &v1.PodTemplateSpec{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Labels: c.connectionPoolerLabelsSelector(role).MatchLabels, | ||
| Labels: c.connectionPoolerLabels(role, false).MatchLabels, |
Member
There was a problem hiding this comment.
question here is: Does it have to be the same list of what's in the selector? Or has the selector only be contained in the pod template label list (for watching)
Jan-M
commented
Nov 23, 2020
| metadata: | ||
| labels: | ||
| application: db-connection-pooler | ||
| connection-pooler: acid-minimal-cluster-pooler |
Member
Author
There was a problem hiding this comment.
kubectl create -f minimal-fake-pooler-deployment.yaml
The Deployment "acid-minimal-cluster-pooler" is invalid: spec.template.metadata.labels: Invalid value: map[string]string{"application":"db-connection-pooler", "connection-pooler":"acid-minimal-cluster-pooler"}: `selector` does not match template `labels`
Member
Author
|
👍 |
Member
Author
|
👍 |
1 similar comment
Member
|
👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The currently generated deployment selectors are not correct, including too many labels.
The selector should include:
application: db-connection-poolerconnection-pooler: <name><-repl>These two elements identify all the pods belonging to the deployment. Compare with the test manifest.
When the operator behaves properly the included e2e test should be green, and the deployment adjusted.
This PR should ideally also contain some documentation on the involved objects and their labels:
deployments and service come to mind, and the statefulset could also be mentioned, having similar selector.