From 65f1ffe33d75163230060dcf20929c47c56332ab Mon Sep 17 00:00:00 2001 From: Stephen Benjamin Date: Mon, 15 May 2023 07:46:39 -0400 Subject: [PATCH] Revert "remove special cases for featureset in rendering" --- data/data/bootstrap/files/usr/local/bin/bootkube.sh.template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template index 47bfa68566a..e8307d1af0b 100755 --- a/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template +++ b/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template @@ -92,6 +92,9 @@ 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}} bootkube_podman_run \ --name config-render \ @@ -103,6 +106,7 @@ 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[@]}"