Skip to content

OCPBUGS-13547: remove special cases for featureset in rendering #7158

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 11, 2023
Merged

OCPBUGS-13547: remove special cases for featureset in rendering #7158

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
4 changes: 0 additions & 4 deletions data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ then
if [ -f "$PWD/manifests/cloud-provider-config.yaml" ]; then
ADDITIONAL_FLAGS+=("--cloud-provider-config-input-file=/assets/manifests/cloud-provider-config.yaml")
fi
{{- if .FeatureSet }}
ADDITIONAL_FLAGS+=("--feature-set={{.FeatureSet}}")
{{- end}}
Comment on lines -95 to -97
Copy link
Contributor

@patrickdillon patrickdillon May 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deleting these three lines is not covered by #7152

Copy link
Contributor Author

@deads2k deads2k May 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, trying to remove the --feature-set from our render commands. #7152 is more important, but this is also desired


bootkube_podman_run \
--name config-render \
Expand All @@ -106,7 +103,6 @@ then
--config-output-file=/assets/config-bootstrap/config \
--asset-input-dir=/assets/tls \
--asset-output-dir=/assets/config-bootstrap \
--featuregate-manifest=/assets/manifests/99_feature-gate.yaml \
--rendered-manifest-files=/assets/manifests \
--payload-version=$VERSION \
"${ADDITIONAL_FLAGS[@]}"
Expand Down