pkg/risk/adminack: Refactor to take a version callback

Returning just the version, instead of the whole Release.  Slightly
more work setup-side to wrap the optr.currentVersion call, but it
makes the required information more transparent.

Author: wking

pkg/cvo/cvo.go

@@ -325,7 +325,7 @@ func New(
 		risks = append(risks, source)
 	}
 	risks = append(risks, deletionrisk.New("ResourceDeletionInProgress", optr.currentVersion))
-	if source, err := adminack.New("AdminAck", optr.currentVersion, cmConfigManagedInformer, cmConfigInformer, riskSourceCallback); err != nil {
+	if source, err := adminack.New("AdminAck", func() string { return optr.currentVersion().Version }, cmConfigManagedInformer, cmConfigInformer, riskSourceCallback); err != nil {
 		return optr, err
 	} else {
 		risks = append(risks, source)

pkg/risk/adminack/adminack.go

@@ -35,14 +35,14 @@ var adminAckGateRegexp = regexp.MustCompile(adminAckGateFmt)
 
 type adminAck struct {
 	name             string
-	currentVersion   func() configv1.Release
+	currentVersion   func() string
 	adminGatesLister listerscorev1.ConfigMapNamespaceLister
 	adminAcksLister  listerscorev1.ConfigMapNamespaceLister
 	lastSeen         []configv1.ConditionalUpdateRisk
 }
 
 // New returns a new update-risk source, tracking administrator acknowledgements.
-func New(name string, currentVersion func() configv1.Release, adminGatesInformer, adminAcksInformer informerscorev1.ConfigMapInformer, changeCallback func()) (risk.Source, error) {
+func New(name string, currentVersion func() string, adminGatesInformer, adminAcksInformer informerscorev1.ConfigMapInformer, changeCallback func()) (risk.Source, error) {
 	adminGatesLister := adminGatesInformer.Lister().ConfigMaps(internal.ConfigManagedNamespace)
 	adminAcksLister := adminAcksInformer.Lister().ConfigMaps(internal.ConfigNamespace)
 	source := &adminAck{name: name, currentVersion: currentVersion, adminGatesLister: adminGatesLister, adminAcksLister: adminAcksLister}
@@ -92,8 +92,8 @@ func (a *adminAck) Risks(_ context.Context, versions []string) ([]configv1.Condi
 }
 
 func (a *adminAck) risks() ([]configv1.ConditionalUpdateRisk, semver.Version, error) {
-	currentRelease := a.currentVersion()
-	version, err := semver.Parse(currentRelease.Version)
+	currentVersion := a.currentVersion()
+	version, err := semver.Parse(currentVersion)
 	if err != nil {
 		return []configv1.ConditionalUpdateRisk{{
 			Name:          fmt.Sprintf("%sUnknown", a.name),

pkg/risk/adminack/adminack_test.go

@@ -285,7 +285,7 @@ func Test_New(t *testing.T) {
 	for _, tt := range tests {
 		{
 			t.Run(tt.name, func(t *testing.T) {
-				source, err := New("AdminAck", func() configv1.Release { return configv1.Release{Version: "4.21.0"} }, cmInformer, cmInformer, nil)
+				source, err := New("AdminAck", func() string { return "4.21.0" }, cmInformer, cmInformer, nil)
 				if err != nil {
 					t.Fatal(err)
 				}