Skip to content

WIP: pkg/internal/constants: Deprecate Upgradeable* subcondition constants #1391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wking wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −5
Open

WIP: pkg/internal/constants: Deprecate Upgradeable* subcondition constants #1391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkg/cvo/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,11 +638,11 @@ func setUpgradeableCondition(ctx context.Context, cvStatus *configv1.ClusterVers
}

// remove obsolete subconditions
resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, internal.UpgradeableAdminAckRequired)
resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, internal.UpgradeableDeletesInProgress)
resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, internal.UpgradeableClusterOperators)
resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, internal.UpgradeableClusterVersionOverrides)
resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, internal.UpgradeableUpgradeInProgress)
resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, internal.UpgradeableAdminAckRequired) //nolint:staticcheck // Ignore SA1019 until 5.1
resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, internal.UpgradeableDeletesInProgress) //nolint:staticcheck // Ignore SA1019 until 5.1
resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, internal.UpgradeableClusterOperators) //nolint:staticcheck // Ignore SA1019 until 5.1
resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, internal.UpgradeableClusterVersionOverrides) //nolint:staticcheck // Ignore SA1019 until 5.1
resourcemerge.RemoveOperatorStatusCondition(&cvStatus.Conditions, internal.UpgradeableUpgradeInProgress) //nolint:staticcheck // Ignore SA1019 until 5.1

if len(risks) == 0 {
if err != nil {
Expand Down
15 changes: 15 additions & 0 deletions pkg/internal/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,33 @@ const (

// UpgradeableAdminAckRequired is False if there is API removed from the Kubernetes API server which requires admin
// consideration, and thus update to the next minor or major version is blocked.
//
// Deprecated: In 5.0, we stopped populating Upgradeable* subconditions, and now populate Upgradeable directly.
// The constants remain so we can remove them from 5.0 ClusterVersion status, but we will remove the constants themselves in 5.1.
UpgradeableAdminAckRequired configv1.ClusterStatusConditionType = "UpgradeableAdminAckRequired"
// UpgradeableDeletesInProgress is False if deleting resources is in progress, and thus update to the next minor or major
// version is blocked.
//
// Deprecated: In 5.0, we stopped populating Upgradeable* subconditions, and now populate Upgradeable directly.
// The constants remain so we can remove them from 5.0 ClusterVersion status, but we will remove the constants themselves in 5.1.
UpgradeableDeletesInProgress configv1.ClusterStatusConditionType = "UpgradeableDeletesInProgress"
// UpgradeableClusterOperators is False if something is wrong with Cluster Operators, and thus update to the next minor or major
// version is blocked.
//
// Deprecated: In 5.0, we stopped populating Upgradeable* subconditions, and now populate Upgradeable directly.
// The constants remain so we can remove them from 5.0 ClusterVersion status, but we will remove the constants themselves in 5.1.
UpgradeableClusterOperators configv1.ClusterStatusConditionType = "UpgradeableClusterOperators"
// UpgradeableClusterVersionOverrides is False if there are overrides in the Cluster Version, and thus update to the next minor or major
// version is blocked.
//
// Deprecated: In 5.0, we stopped populating Upgradeable* subconditions, and now populate Upgradeable directly.
// The constants remain so we can remove them from 5.0 ClusterVersion status, but we will remove the constants themselves in 5.1.
UpgradeableClusterVersionOverrides configv1.ClusterStatusConditionType = "UpgradeableClusterVersionOverrides"

// UpgradeableUpgradeInProgress is True if an update is in progress.
//
// Deprecated: In 5.0, we stopped populating Upgradeable* subconditions, and now populate Upgradeable directly.
// The constants remain so we can remove them from 5.0 ClusterVersion status, but we will remove the constants themselves in 5.1.
UpgradeableUpgradeInProgress configv1.ClusterStatusConditionType = "UpgradeableUpgradeInProgress"

// ConditionalUpdateConditionTypeRecommended is a type of the condition present on a conditional update
Expand Down