Allow DevPreviewNoUpgrade

openshift · May 7, 2024 · 86ff5da · 86ff5da
1 parent d29e3b9
commit 86ff5da
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/data/data/install.openshift.io_installconfigs.yaml b/data/data/install.openshift.io_installconfigs.yaml
@@ -1964,8 +1964,8 @@ spec:
             type: array
           featureSet:
             description: FeatureSet enables features that are not part of the default
-              feature set. Valid values are "Default", "TechPreviewNoUpgrade" and
-              "CustomNoUpgrade". When omitted, the "Default" feature set is used.
+              feature set. Valid values are "Default", "TechPreviewNoUpgrade", "DevPreviewNoUpgrade",
+              and "CustomNoUpgrade". When omitted, the "Default" feature set is used.
             type: string
           fips:
             default: false

diff --git a/pkg/explain/printer_test.go b/pkg/explain/printer_test.go
@@ -61,7 +61,7 @@ func Test_PrintFields(t *testing.T) {
       FeatureGates enables a set of custom feature gates. May only be used in conjunction with FeatureSet "CustomNoUpgrade". Features may be enabled or disabled by providing a true or false value for the feature gate. E.g. "featureGates": ["FeatureGate1=true", "FeatureGate2=false"].
 
     featureSet <string>
-      FeatureSet enables features that are not part of the default feature set. Valid values are "Default", "TechPreviewNoUpgrade" and "CustomNoUpgrade". When omitted, the "Default" feature set is used.
+      FeatureSet enables features that are not part of the default feature set. Valid values are "Default", "TechPreviewNoUpgrade", "DevPreviewNoUpgrade",  and "CustomNoUpgrade". When omitted, the "Default" feature set is used.
 
     fips <boolean>
       Default: false

diff --git a/pkg/types/azure/validation/platform.go b/pkg/types/azure/validation/platform.go
@@ -99,7 +99,7 @@ func ValidatePlatform(p *azure.Platform, publish types.PublishingStrategy, fldPa
 		allErrs = append(allErrs, field.Invalid(fldPath.Child("outboundType"), p.OutboundType, fmt.Sprintf("%s is only allowed when installing to pre-existing network", azure.UserDefinedRoutingOutboundType)))
 	}
 	if p.OutboundType == azure.NatGatewayOutboundType {
-		if ic.FeatureSet != configv1.TechPreviewNoUpgrade {
+		if ic.FeatureSet != configv1.TechPreviewNoUpgrade && ic.FeatureSet != configv1.DevPreviewNoUpgrade {
 			allErrs = append(allErrs, field.Invalid(fldPath.Child("outboundType"), p.OutboundType, "not supported in this feature set"))
 		}
 		if p.VirtualNetwork != "" {

diff --git a/pkg/types/baremetal/validation/platform_test.go b/pkg/types/baremetal/validation/platform_test.go
@@ -189,6 +189,13 @@ func TestValidatePlatform(t *testing.T) {
 					platform().LoadBalancerType("OpenShiftManagedDefault")).
 				FeatureSet(configv1.TechPreviewNoUpgrade).build(),
 		},
+		{
+			name: "allowed_feature_loadbalancer_openshift_managed_default_DevPreview",
+			config: installConfig().
+				BareMetalPlatform(
+					platform().LoadBalancerType("OpenShiftManagedDefault")).
+				FeatureSet(configv1.DevPreviewNoUpgrade).build(),
+		},
 		{
 			name: "allowed_feature_loadbalancer_user_managed",
 			config: installConfig().

diff --git a/pkg/types/installconfig.go b/pkg/types/installconfig.go
@@ -8,7 +8,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	configv1 "github.com/openshift/api/config/v1"
-	features "github.com/openshift/api/features"
+	"github.com/openshift/api/features"
 	"github.com/openshift/installer/pkg/ipnet"
 	"github.com/openshift/installer/pkg/types/aws"
 	"github.com/openshift/installer/pkg/types/azure"
@@ -208,7 +208,7 @@ type InstallConfig struct {
 	Capabilities *Capabilities `json:"capabilities,omitempty"`
 
 	// FeatureSet enables features that are not part of the default feature set.
-	// Valid values are "Default", "TechPreviewNoUpgrade" and "CustomNoUpgrade".
+	// Valid values are "Default", "TechPreviewNoUpgrade", "DevPreviewNoUpgrade", and "CustomNoUpgrade".
 	// When omitted, the "Default" feature set is used.
 	// +optional
 	FeatureSet configv1.FeatureSet `json:"featureSet,omitempty"`

diff --git a/pkg/types/validation/installconfig_test.go b/pkg/types/validation/installconfig_test.go
@@ -29,8 +29,6 @@ import (
 	"github.com/openshift/installer/pkg/types/vsphere"
 )
 
-const TechPreviewNoUpgrade = "TechPreviewNoUpgrade"
-
 func validInstallConfig() *types.InstallConfig {
 	return &types.InstallConfig{
 		TypeMeta: metav1.TypeMeta{