Merge pull request #1127 from hongkailiu/cleanup

NO-ISSUE: Simplify the preconditions code

Author: openshift-merge-bot[bot]

pkg/payload/precondition/clusterversion/gianthop.go

@@ -14,26 +14,24 @@ import (
 
 // GiantHop blocks giant hops from the version that is currently being reconciled.
 type GiantHop struct {
-	key    string
 	lister configv1listers.ClusterVersionLister
 }
 
 // NewGiantHop returns a new GiantHop precondition check.
 func NewGiantHop(lister configv1listers.ClusterVersionLister) *GiantHop {
 	return &GiantHop{
-		key:    "version",
 		lister: lister,
 	}
 }
 
-// Name returns Name for the precondition.
+// Name returns the name of the precondition.
 func (p *GiantHop) Name() string { return "ClusterVersionGiantHop" }
 
 // Run runs the GiantHop precondition, blocking giant hops from the
 // version that is currently being reconciled.  It returns a
 // PreconditionError when possible.
 func (p *GiantHop) Run(ctx context.Context, releaseContext precondition.ReleaseContext) error {
-	cv, err := p.lister.Get(p.key)
+	cv, err := p.lister.Get("version")
 	if apierrors.IsNotFound(err) || meta.IsNoMatchError(err) {
 		return nil
 	}

pkg/payload/precondition/clusterversion/recommendedupdate.go

@@ -16,22 +16,20 @@ import (
 
 // RecommendedUpdate checks if clusterversion is upgradeable currently.
 type RecommendedUpdate struct {
-	key    string
 	lister configv1listers.ClusterVersionLister
 }
 
 // NewRecommendedUpdate returns a new RecommendedUpdate precondition check.
 func NewRecommendedUpdate(lister configv1listers.ClusterVersionLister) *RecommendedUpdate {
 	return &RecommendedUpdate{
-		key:    "version",
 		lister: lister,
 	}
 }
 
 // Run runs the RecommendedUpdate precondition.
 // Returns PreconditionError when possible, if the requested target release is Recommended=False.
 func (ru *RecommendedUpdate) Run(ctx context.Context, releaseContext precondition.ReleaseContext) error {
-	clusterVersion, err := ru.lister.Get(ru.key)
+	clusterVersion, err := ru.lister.Get("version")
 	if apierrors.IsNotFound(err) || meta.IsNoMatchError(err) {
 		return nil
 	}
@@ -121,5 +119,5 @@ func (ru *RecommendedUpdate) Run(ctx context.Context, releaseContext preconditio
 	return nil
 }
 
-// Name returns Name for the precondition.
+// Name returns the name of the precondition.
 func (ru *RecommendedUpdate) Name() string { return "ClusterVersionRecommendedUpdate" }

pkg/payload/precondition/clusterversion/rollback.go

@@ -15,26 +15,24 @@ import (
 
 // Rollback blocks rollbacks from the version that is currently being reconciled.
 type Rollback struct {
-	key    string
 	lister configv1listers.ClusterVersionLister
 }
 
 // NewRollback returns a new Rollback precondition check.
 func NewRollback(lister configv1listers.ClusterVersionLister) *Rollback {
 	return &Rollback{
-		key:    "version",
 		lister: lister,
 	}
 }
 
-// Name returns Name for the precondition.
+// Name returns the name of the precondition.
 func (p *Rollback) Name() string { return "ClusterVersionRollback" }
 
 // Run runs the Rollback precondition, blocking rollbacks from the
 // version that is currently being reconciled.  It returns a
 // PreconditionError when possible.
 func (p *Rollback) Run(ctx context.Context, releaseContext precondition.ReleaseContext) error {
-	cv, err := p.lister.Get(p.key)
+	cv, err := p.lister.Get("version")
 	if apierrors.IsNotFound(err) || meta.IsNoMatchError(err) {
 		return nil
 	}

pkg/payload/precondition/clusterversion/upgradeable.go

@@ -17,14 +17,12 @@ import (
 
 // Upgradeable checks if clusterversion is upgradeable currently.
 type Upgradeable struct {
-	key    string
 	lister configv1listers.ClusterVersionLister
 }
 
 // NewUpgradeable returns a new Upgradeable precondition check.
 func NewUpgradeable(lister configv1listers.ClusterVersionLister) *Upgradeable {
 	return &Upgradeable{
-		key:    "version",
 		lister: lister,
 	}
 }
@@ -49,7 +47,7 @@ func ClusterVersionOverridesCondition(cv *configv1.ClusterVersion) *configv1.Clu
 // If the feature gate `key` is not found, or the api for clusterversion doesn't exist, this check is inert and always returns nil error.
 // Otherwise, if Upgradeable condition is set to false in the object, it returns an PreconditionError when possible.
 func (pf *Upgradeable) Run(ctx context.Context, releaseContext precondition.ReleaseContext) error {
-	cv, err := pf.lister.Get(pf.key)
+	cv, err := pf.lister.Get("version")
 	if apierrors.IsNotFound(err) || meta.IsNoMatchError(err) {
 		return nil
 	}
@@ -119,5 +117,5 @@ func (pf *Upgradeable) Run(ctx context.Context, releaseContext precondition.Rele
 	}
 }
 
-// Name returns Name for the precondition.
+// Name returns the name of the precondition.
 func (pf *Upgradeable) Name() string { return "ClusterVersionUpgradeable" }

pkg/payload/precondition/precondition.go

@@ -44,7 +44,7 @@ type Precondition interface {
 	// Run executes the precondition checks ands returns an error when the precondition fails.
 	Run(ctx context.Context, releaseContext ReleaseContext) error
 
-	// Name returns a human friendly name for the precondition.
+	// Name returns a human friendly name of the precondition.
 	Name() string
 }