Skip to content

Commit

Permalink
ARO-6250: Revise cluster upgrade condition
Browse files Browse the repository at this point in the history
  • Loading branch information
edisonLcardenas committed Aug 27, 2024
1 parent 04ff2d4 commit f952c27
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion pkg/util/version/clusterversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,20 @@ func ClusterVersionIsLessThan4_4(ctx context.Context, configcli configclient.Int
}

func IsClusterUpgrading(cv *configv1.ClusterVersion) bool {
return cv.Spec.DesiredUpdate != nil
var isUpgrading bool
if c := findClusterOperatorStatusCondition(cv.Status.Conditions, configv1.OperatorProgressing); c != nil && c.Status == configv1.ConditionTrue {
isUpgrading = true
} else {
isUpgrading = false
}
return isUpgrading
}

func findClusterOperatorStatusCondition(conditions []configv1.ClusterOperatorStatusCondition, name configv1.ClusterStatusConditionType) *configv1.ClusterOperatorStatusCondition {
for i := range conditions {
if conditions[i].Type == name {
return &conditions[i]
}
}
return nil
}

0 comments on commit f952c27

Please sign in to comment.