featuregates: store rendered minimum component version in featuregate accessor

Signed-off-by: Peter Hunt <pehunt@redhat.com>

Author: haircommander

pkg/operator/configobserver/featuregates/featuregate.go

@@ -14,17 +14,22 @@ type FeatureGate interface {
 	Enabled(key configv1.FeatureGateName) bool
 	// KnownFeatures returns a slice of strings describing the FeatureGate's known features.
 	KnownFeatures() []configv1.FeatureGateName
+	// RenderedMinimumComponentVersion returns the minimum component version that caused this set of features
+	// to be generated.
+	RenderedMinimumComponentVersions() []configv1.RequiredMinimumComponentVersion
 }
 
 type featureGate struct {
-	enabled  []configv1.FeatureGateName
-	disabled []configv1.FeatureGateName
+	enabled         []configv1.FeatureGateName
+	disabled        []configv1.FeatureGateName
+	renderedVersion []configv1.RequiredMinimumComponentVersion
 }
 
-func NewFeatureGate(enabled, disabled []configv1.FeatureGateName) FeatureGate {
+func NewFeatureGate(enabled, disabled []configv1.FeatureGateName, renderedVersion []configv1.RequiredMinimumComponentVersion) FeatureGate {
 	return &featureGate{
-		enabled:  enabled,
-		disabled: disabled,
+		enabled:         enabled,
+		disabled:        disabled,
+		renderedVersion: renderedVersion,
 	}
 }
 
@@ -46,3 +51,7 @@ func (f *featureGate) KnownFeatures() []configv1.FeatureGateName {
 
 	return allKnown
 }
+
+func (f *featureGate) RenderedMinimumComponentVersions() []configv1.RequiredMinimumComponentVersion {
+	return f.renderedVersion
+}

pkg/operator/configobserver/featuregates/hardcoded_featuregate_reader.go

@@ -62,7 +62,8 @@ func (c *hardcodedFeatureGateAccess) AreInitialFeatureGatesObserved() bool {
 }
 
 func (c *hardcodedFeatureGateAccess) CurrentFeatureGates() (FeatureGate, error) {
-	return NewFeatureGate(c.enabled, c.disabled), c.readErr
+	// TODO FIXME not hardcoded
+	return NewFeatureGate(c.enabled, c.disabled, nil), c.readErr
 }
 
 // NewHardcodedFeatureGateAccessFromFeatureGate returns a FeatureGateAccess that is static and initialised from

pkg/operator/configobserver/featuregates/simple_featuregate_reader.go

@@ -50,8 +50,9 @@ type FeatureGateAccess interface {
 }
 
 type Features struct {
-	Enabled  []configv1.FeatureGateName
-	Disabled []configv1.FeatureGateName
+	Enabled                          []configv1.FeatureGateName
+	Disabled                         []configv1.FeatureGateName
+	RenderedMinimumComponentVersions []configv1.RequiredMinimumComponentVersion
 }
 
 type FeatureChange struct {
@@ -263,10 +264,12 @@ func (c *defaultFeatureGateAccess) CurrentFeatureGates() (FeatureGate, error) {
 	}
 	retEnabled := make([]configv1.FeatureGateName, len(c.currentFeatures.Enabled))
 	retDisabled := make([]configv1.FeatureGateName, len(c.currentFeatures.Disabled))
+	retRenderedMinimumComponentVersions := make([]configv1.RequiredMinimumComponentVersion, len(c.currentFeatures.RenderedMinimumComponentVersions))
 	copy(retEnabled, c.currentFeatures.Enabled)
 	copy(retDisabled, c.currentFeatures.Disabled)
+	copy(retRenderedMinimumComponentVersions, c.currentFeatures.RenderedMinimumComponentVersions)
 
-	return NewFeatureGate(retEnabled, retDisabled), nil
+	return NewFeatureGate(retEnabled, retDisabled, retRenderedMinimumComponentVersions), nil
 }
 
 func (c *defaultFeatureGateAccess) runWorker(ctx context.Context) {
@@ -310,6 +313,11 @@ func featuresFromFeatureGate(featureGate *configv1.FeatureGate, desiredVersion s
 		break
 	}
 
+	features.RenderedMinimumComponentVersions = make([]configv1.RequiredMinimumComponentVersion, 0, len(featureGate.Status.RenderedMinimumComponentVersions))
+	for _, cv := range featureGate.Status.RenderedMinimumComponentVersions {
+		features.RenderedMinimumComponentVersions = append(features.RenderedMinimumComponentVersions, cv)
+	}
+
 	if !found {
 		return Features{}, fmt.Errorf("missing desired version %q in featuregates.config.openshift.io/cluster", desiredVersion)
 	}