Skip to content

OCPBUGS-13547: remove the old featuresets flag that can conflict with manifests #1521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
May 10, 2023
Merged

OCPBUGS-13547: remove the old featuresets flag that can conflict with manifests #1521

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions pkg/operator/render/options/generic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ type GenericOptions struct {
AssetInputDir string
AssetOutputDir string

FeatureSet string
PayloadVersion string
}

Expand All @@ -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.")
Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -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()
Expand Down