Updated FeatureGate logic to use cluster profiles.

Author: vr4manta

pkg/destroy/bootstrap/bootstrap.go

@@ -16,6 +16,7 @@ import (
 	"github.com/openshift/installer/pkg/infrastructure/openstack/preprovision"
 	infra "github.com/openshift/installer/pkg/infrastructure/platform"
 	ibmcloudtfvars "github.com/openshift/installer/pkg/tfvars/ibmcloud"
+	"github.com/openshift/installer/pkg/types"
 	typesazure "github.com/openshift/installer/pkg/types/azure"
 	"github.com/openshift/installer/pkg/types/featuregates"
 	ibmcloudtypes "github.com/openshift/installer/pkg/types/ibmcloud"
@@ -69,7 +70,14 @@ func Destroy(ctx context.Context, dir string) (err error) {
 		}
 	}
 
-	fg := featuregates.FeatureGateFromFeatureSets(configv1.FeatureSets, metadata.FeatureSet, metadata.CustomFeatureSet)
+	// Get cluster profile for new FeatureGate access.  Blank is no longer an option, so default to
+	// SelfManaged.
+	clusterProfile := types.GetClusterProfileName()
+	featureSets, ok := configv1.AllFeatureSets()[clusterProfile]
+	if !ok {
+		return fmt.Errorf("no feature sets for cluster profile %q", clusterProfile)
+	}
+	fg := featuregates.FeatureGateFromFeatureSets(featureSets, metadata.FeatureSet, metadata.CustomFeatureSet)
 
 	provider, err := infra.ProviderForPlatform(platform, fg)
 	if err != nil {

pkg/types/installconfig.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	configv1 "github.com/openshift/api/config/v1"
@@ -547,7 +548,12 @@ func (c *InstallConfig) EnabledFeatureGates() featuregates.FeatureGate {
 		customFS = featuregates.GenerateCustomFeatures(c.FeatureGates)
 	}
 
-	fg := featuregates.FeatureGateFromFeatureSets(configv1.FeatureSets, c.FeatureSet, customFS)
+	clusterProfile := GetClusterProfileName()
+	featureSets, ok := configv1.AllFeatureSets()[clusterProfile]
+	if !ok {
+		logrus.Warnf("no feature sets for cluster profile %q", clusterProfile)
+	}
+	fg := featuregates.FeatureGateFromFeatureSets(featureSets, c.FeatureSet, customFS)
 
 	return fg
 }

pkg/types/utils.go

@@ -1,6 +1,13 @@
 package types
 
-import configv1 "github.com/openshift/api/config/v1"
+import (
+	"fmt"
+	"os"
+
+	"github.com/sirupsen/logrus"
+
+	configv1 "github.com/openshift/api/config/v1"
+)
 
 // StringsToIPs is used to convert list of strings to list of IP addresses.
 func StringsToIPs(ips []string) []configv1.IP {
@@ -32,3 +39,18 @@ func MachineNetworksToCIDRs(nets []MachineNetworkEntry) []configv1.CIDR {
 
 	return res
 }
+
+// GetClusterProfileName utility method to retrieve the cluster profile setting.  This is used
+// when dealing with openshift api to get FeatureSets.
+func GetClusterProfileName() configv1.ClusterProfileName {
+	// Get cluster profile for new FeatureGate access.  Blank is no longer an option, so default to
+	// SelfManaged.
+	clusterProfile := configv1.SelfManaged
+	if cp := os.Getenv("OPENSHIFT_INSTALL_EXPERIMENTAL_CLUSTER_PROFILE"); cp != "" {
+		logrus.Warnf("Found override for Cluster Profile: %q", cp)
+		// All profiles when getting FeatureSets need to have "include.release.openshift.io/" at the beginning.
+		// See vendor/openshift/api/config/v1/feature_gates.go for more info.
+		clusterProfile = configv1.ClusterProfileName(fmt.Sprintf("%s%s", "include.release.openshift.io/", cp))
+	}
+	return clusterProfile
+}

pkg/types/validation/installconfig.go

@@ -1212,12 +1212,19 @@ func validateAdditionalCABundlePolicy(c *types.InstallConfig) error {
 func ValidateFeatureSet(c *types.InstallConfig) field.ErrorList {
 	allErrs := field.ErrorList{}
 
-	if _, ok := configv1.FeatureSets[c.FeatureSet]; !ok {
+	clusterProfile := types.GetClusterProfileName()
+	featureSets, ok := configv1.AllFeatureSets()[clusterProfile]
+	if !ok {
+		logrus.Warnf("no feature sets for cluster profile %q", clusterProfile)
+	}
+	if _, ok := featureSets[c.FeatureSet]; c.FeatureSet != configv1.CustomNoUpgrade && !ok {
 		sortedFeatureSets := func() []string {
 			v := []string{}
-			for n := range configv1.FeatureSets {
+			for n := range configv1.AllFeatureSets()[clusterProfile] {
 				v = append(v, string(n))
 			}
+			// Add CustomNoUpgrade since it is not part of features sets for profiles
+			v = append(v, string(configv1.CustomNoUpgrade))
 			sort.Strings(v)
 			return v
 		}()