K8SPG-938 fix conditions #1435
+344
−127
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -157,13 +157,13 @@ func updateConditions(cr *v2.PerconaPGCluster, status *v1beta1.PostgresClusterSt | |
|
|
||
| syncPgbackrestFromPostgresToPercona(cr, status) | ||
|
|
||
| repoCondition := meta.FindStatusCondition(cr.Status.Conditions, postgrescluster.ConditionRepoHostReady) | ||
| if repoCondition == nil || repoCondition.Status != metav1.ConditionTrue { | ||
| setClusterNotReadyCondition(metav1.ConditionFalse, postgrescluster.ConditionRepoHostReady) | ||
| return | ||
| } | ||
|
|
||
| backupCondition := meta.FindStatusCondition(cr.Status.Conditions, postgrescluster.ConditionReplicaCreate) | ||
| if backupCondition == nil || backupCondition.Status != metav1.ConditionTrue { | ||
| setClusterNotReadyCondition(metav1.ConditionFalse, postgrescluster.ConditionReplicaCreate) | ||
| return | ||
|
|
@@ -175,21 +175,14 @@ func updateConditions(cr *v2.PerconaPGCluster, status *v1beta1.PostgresClusterSt | |
|
|
||
| func syncConditionsFromPostgresToPercona(cr *v2.PerconaPGCluster, postgresStatus *v1beta1.PostgresClusterStatus) { | ||
| for _, pcCond := range postgresStatus.Conditions { | ||
| _ = meta.SetStatusCondition(&cr.Status.Conditions, metav1.Condition{ | ||
|
Contributor
There was a problem hiding this comment. Adding this comment here regarding unit testing. Agreeing with @egegunes, IMO we could add comprehensive unit test
Contributor
Author
There was a problem hiding this comment. updateConditions is already covered by integration tests. Should I add unit tests for it as well, or replace the integration tests with unit tests? |
||
| Type: pcCond.Type, | ||
| Status: pcCond.Status, | ||
| Reason: pcCond.Reason, | ||
| Message: pcCond.Message, | ||
| LastTransitionTime: pcCond.LastTransitionTime, | ||
| ObservedGeneration: cr.Generation, | ||
| }) | ||
| } | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since status and cr are already synced, does it matter switching to cr.Status from status? Just trying to understand if this change needs to be made after all.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right. After sync they're the same. I'm suggesting cr.Status.Conditions mainly for consistency - setClusterNotReadyCondition uses it, so the checks should too. But it's not critical, we can keep status.Conditions.
WDYT?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sounds good!