Ensure podAnnotations are removed from pods if reset in the config #2826
+255
−15
Conversation
This file contains 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
hughcapet
force-pushed
the
fix/pod-annotations-removal
branch
from
799c015 to
93d718e
Compare
hughcapet
requested review from
sdudoladov,
Jan-M,
FxKu,
jopadi,
idanovinda and
macedigital
as code owners
hughcapet
force-pushed
the
fix/pod-annotations-removal
branch
from
93d718e to
2c9ceed
Compare
|
👍 |
FxKu
reviewed
Jan 7, 2025
| } | ||
| } | ||
| annotationToRemove = strings.TrimSuffix(annotationToRemove, ",") + `}}}` | ||
| annotationToRemoveTemplate = strings.TrimSuffix(annotationToRemoveTemplate, ",") + `}}}}}` |
There was a problem hiding this comment.
can we not use json marshalling here? This concatenating {{{ + }}} looks a bit "ugly".
FxKu
reviewed
Jan 7, 2025
| @@ -1060,7 +1097,6 @@ func (c *Cluster) syncConnectionPoolerWorker(oldSpec, newSpec *acidv1.Postgresql | |||
| if err != nil { | |||
| return syncReason, err | |||
| } | |||
| c.ConnectionPooler[role].Deployment = deployment | |||
There was a problem hiding this comment.
so we change to update internal deployment only if every sync step works, right? Have to think about consequences it might have
FxKu
reviewed
Jan 7, 2025
| listOptions := metav1.ListOptions{ | ||
| LabelSelector: labels.Set(c.connectionPoolerLabels(role, true).MatchLabels).String(), | ||
| } | ||
| pods, err = c.listPoolerPods(listOptions) |
There was a problem hiding this comment.
ToDo for me: Check if we can go with a version of pods we now fetch before changing annotations? Or do we need to fetch them again for the following steps?
FxKu
reviewed
Jan 7, 2025
| return err | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Sorry, another thinking out loud comment: We already introduced patch code for annotations. Could it not be reused?
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.
fix use case when an annotation is removed from the
podAnnotationssetting (should be reflected for the running Pods and Pod templates)