Skip to content

Commit a0928c6

Browse files
authored
K8SPG-938 fix conditions (#1435)
* K8SPG-938 fix conditions * add test * add unit test * delete comment
1 parent 32278ca commit a0928c6

File tree

2 files changed

+344
-127
lines changed

2 files changed

+344
-127
lines changed

percona/controller/pgcluster/status.go

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,13 @@ func updateConditions(cr *v2.PerconaPGCluster, status *v1beta1.PostgresClusterSt
157157

158158
syncPgbackrestFromPostgresToPercona(cr, status)
159159

160-
repoCondition := meta.FindStatusCondition(status.Conditions, postgrescluster.ConditionRepoHostReady)
160+
repoCondition := meta.FindStatusCondition(cr.Status.Conditions, postgrescluster.ConditionRepoHostReady)
161161
if repoCondition == nil || repoCondition.Status != metav1.ConditionTrue {
162162
setClusterNotReadyCondition(metav1.ConditionFalse, postgrescluster.ConditionRepoHostReady)
163163
return
164164
}
165165

166-
backupCondition := meta.FindStatusCondition(status.Conditions, postgrescluster.ConditionReplicaCreate)
166+
backupCondition := meta.FindStatusCondition(cr.Status.Conditions, postgrescluster.ConditionReplicaCreate)
167167
if backupCondition == nil || backupCondition.Status != metav1.ConditionTrue {
168168
setClusterNotReadyCondition(metav1.ConditionFalse, postgrescluster.ConditionReplicaCreate)
169169
return
@@ -175,21 +175,14 @@ func updateConditions(cr *v2.PerconaPGCluster, status *v1beta1.PostgresClusterSt
175175

176176
func syncConditionsFromPostgresToPercona(cr *v2.PerconaPGCluster, postgresStatus *v1beta1.PostgresClusterStatus) {
177177
for _, pcCond := range postgresStatus.Conditions {
178-
existing := meta.FindStatusCondition(cr.Status.Conditions, pcCond.Type)
179-
if existing != nil {
180-
continue
181-
}
182-
183-
newCond := metav1.Condition{
178+
_ = meta.SetStatusCondition(&cr.Status.Conditions, metav1.Condition{
184179
Type: pcCond.Type,
185180
Status: pcCond.Status,
186181
Reason: pcCond.Reason,
187182
Message: pcCond.Message,
188183
LastTransitionTime: pcCond.LastTransitionTime,
189184
ObservedGeneration: cr.Generation,
190-
}
191-
192-
cr.Status.Conditions = append(cr.Status.Conditions, newCond)
185+
})
193186
}
194187
}
195188

0 commit comments

Comments
 (0)