Skip to content

Bug 1978376: pkg/cvo/upgradeable: Enable admin-ack logic #645

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

Merged
openshift-merge-robot merged 1 commit into from
Aug 30, 2021
Merged

Bug 1978376: pkg/cvo/upgradeable: Enable admin-ack logic #645

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
6 changes: 0 additions & 6 deletions pkg/cvo/cvo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3756,12 +3756,6 @@ func TestOperator_upgradeableSync(t *testing.T) {
optr.cmConfigLister = cmInformerLister.Lister().ConfigMaps("test")

optr.upgradeableChecks = optr.defaultUpgradeableChecks()

// This Upgradeable check must be added here since it is not active in 4.9 but present to allow
// back port to 4.8 where it will first become active.
optr.upgradeableChecks = append(optr.upgradeableChecks,
&clusterAdminAcksCompletedUpgradeable{optr.cmConfigManagedLister, optr.cmConfigLister, optr.cvLister, optr.name})

optr.eventRecorder = record.NewFakeRecorder(100)

if tt.gateCm != nil {
Expand Down
17 changes: 9 additions & 8 deletions pkg/cvo/upgradeable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,10 +380,14 @@ func (check *clusterAdminAcksCompletedUpgradeable) Check() *configv1.ClusterOper
return nil
}

// Since there are no admin ack gates in this initial release the Upgradeable check
// clusterAdminAcksCompletedUpgradeable is not included.
func (optr *Operator) defaultUpgradeableChecks() []upgradeableCheck {
return []upgradeableCheck{
&clusterAdminAcksCompletedUpgradeable{
adminGatesLister: optr.cmConfigManagedLister,
adminAcksLister: optr.cmConfigLister,
cvLister: optr.cvLister,
cvoName: optr.name,
},
&clusterOperatorsUpgradeable{coLister: optr.coLister},
&clusterVersionOverridesUpgradeable{name: optr.name, cvLister: optr.cvLister},
&clusterManifestDeleteInProgressUpgradeable{},
Expand All @@ -394,8 +398,7 @@ func (optr *Operator) addFunc(obj interface{}) {
cm := obj.(*corev1.ConfigMap)
if cm.Name == internal.AdminGatesConfigMap || cm.Name == internal.AdminAcksConfigMap {
klog.V(4).Infof("ConfigMap %s/%s added.", cm.Namespace, cm.Name)
// When clusterAdminAcksCompletedUpgradeable upgardeable check added we will call
// optr.setUpgradeableConditions() here
optr.setUpgradeableConditions()
}
}

Expand All @@ -405,8 +408,7 @@ func (optr *Operator) updateFunc(oldObj, newObj interface{}) {
oldCm := oldObj.(*corev1.ConfigMap)
if !equality.Semantic.DeepEqual(cm, oldCm) {
klog.V(4).Infof("ConfigMap %s/%s updated.", cm.Namespace, cm.Name)
// When clusterAdminAcksCompletedUpgradeable upgardeable check added we will call
// optr.setUpgradeableConditions() here
optr.setUpgradeableConditions()
}
}
}
Expand All @@ -415,8 +417,7 @@ func (optr *Operator) deleteFunc(obj interface{}) {
cm := obj.(*corev1.ConfigMap)
if cm.Name == internal.AdminGatesConfigMap || cm.Name == internal.AdminAcksConfigMap {
klog.V(4).Infof("ConfigMap %s/%s deleted.", cm.Namespace, cm.Name)
// When clusterAdminAcksCompletedUpgradeable upgardeable check added we will call
// optr.setUpgradeableConditions() here
optr.setUpgradeableConditions()
}
}

Expand Down