diff --git a/pkg/cvo/cvo_test.go b/pkg/cvo/cvo_test.go index bacb2ceac3..f175188424 100644 --- a/pkg/cvo/cvo_test.go +++ b/pkg/cvo/cvo_test.go @@ -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 { diff --git a/pkg/cvo/upgradeable.go b/pkg/cvo/upgradeable.go index 9c893f32e2..6b46261e6d 100644 --- a/pkg/cvo/upgradeable.go +++ b/pkg/cvo/upgradeable.go @@ -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{}, @@ -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() } } @@ -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() } } } @@ -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() } }