From 2e0cf33af3ea1f36838935166baa1f590540a6be Mon Sep 17 00:00:00 2001 From: David Eads Date: Mon, 8 May 2023 13:52:16 -0400 Subject: [PATCH] remove the old featuresets flag that can conflict with manifests --- pkg/operator/render/options/generic.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkg/operator/render/options/generic.go b/pkg/operator/render/options/generic.go index d9ae99fe85..80124be21e 100644 --- a/pkg/operator/render/options/generic.go +++ b/pkg/operator/render/options/generic.go @@ -30,7 +30,6 @@ type GenericOptions struct { AssetInputDir string AssetOutputDir string - FeatureSet string PayloadVersion string } @@ -54,7 +53,6 @@ func (o *GenericOptions) AddFlags(fs *pflag.FlagSet, configGVK schema.GroupVersi fs.StringSliceVar(&o.AdditionalConfigOverrideFiles, "config-override-files", o.AdditionalConfigOverrideFiles, fmt.Sprintf("Additional sparse %s files for customiziation through the installer, merged into the default config in the given order.", gvkOutput{configGVK})) fs.StringVar(&o.ConfigOutputFile, "config-output-file", o.ConfigOutputFile, fmt.Sprintf("Output path for the %s yaml file.", gvkOutput{configGVK})) - fs.StringVar(&o.FeatureSet, "feature-set", o.FeatureSet, "Enables features that are not part of the default feature set.") fs.StringSliceVar(&o.RenderedManifestInputFilenames, "rendered-manifest-files", o.RenderedManifestInputFilenames, "files or directories containing yaml or json manifests that will be created via cluster-bootstrapping.") fs.StringVar(&o.PayloadVersion, "payload-version", o.PayloadVersion, "Version that will eventually be placed into ClusterOperator.status. This normally comes from the CVO set via env var: OPERATOR_IMAGE_VERSION.") @@ -97,12 +95,6 @@ func (o *GenericOptions) Validate() error { } } - switch configv1.FeatureSet(o.FeatureSet) { - case configv1.Default, configv1.TechPreviewNoUpgrade, configv1.CustomNoUpgrade, configv1.LatencySensitive: - default: - return fmt.Errorf("invalid feature-set specified: %q", o.FeatureSet) - } - return nil } @@ -197,7 +189,7 @@ func (o *GenericOptions) FeatureGateManifests() (RenderedManifests, error) { func (o *GenericOptions) FeatureSetName() (configv1.FeatureSet, error) { if len(o.RenderedManifestInputFilenames) == 0 { - return configv1.FeatureSet(o.FeatureSet), nil + return configv1.Default, nil } manifests, err := o.FeatureGateManifests()