Unwind feature gates from template controller

JoelSpeed · JoelSpeed · commit 4680a9c571f8 · 2024-03-11T16:59:12.000Z
diff --git a/cmd/machine-config-controller/start.go b/cmd/machine-config-controller/start.go
@@ -148,7 +148,6 @@ func createControllers(ctx *ctrlcommon.ControllerContext) []ctrlcommon.Controlle
 			ctx.OpenShiftConfigKubeNamespacedInformerFactory.Core().V1().Secrets(),
 			ctx.ClientBuilder.KubeClientOrDie("template-controller"),
 			ctx.ClientBuilder.MachineConfigClientOrDie("template-controller"),
-			ctx.FeatureGateAccess,
 		),
 		// Add all "sub-renderers here"
 		kubeletconfig.New(
diff --git a/pkg/controller/bootstrap/bootstrap.go b/pkg/controller/bootstrap/bootstrap.go
@@ -160,7 +160,7 @@ func (b *Bootstrap) Run(destDir string) error {
 		return fmt.Errorf("error creating feature gate access: %w", err)
 	}
 
-	iconfigs, err := template.RunBootstrap(b.templatesDir, cconfig, psraw, fgAccess)
+	iconfigs, err := template.RunBootstrap(b.templatesDir, cconfig, psraw)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/controller/container-runtime-config/container_runtime_config_bootstrap.go b/pkg/controller/container-runtime-config/container_runtime_config_bootstrap.go
@@ -33,7 +33,7 @@ func RunContainerRuntimeBootstrap(templateDir string, crconfigs []*mcfgv1.Contai
 			}
 			role := pool.Name
 			// Generate the original ContainerRuntimeConfig
-			originalStorageIgn, _, _, err := generateOriginalContainerRuntimeConfigs(templateDir, controllerConfig, role, featureGateAccess)
+			originalStorageIgn, _, _, err := generateOriginalContainerRuntimeConfigs(templateDir, controllerConfig, role)
 			if err != nil {
 				return nil, fmt.Errorf("could not generate origin ContainerRuntime Configs: %w", err)
 			}
diff --git a/pkg/controller/container-runtime-config/container_runtime_config_controller.go b/pkg/controller/container-runtime-config/container_runtime_config_controller.go
@@ -426,11 +426,10 @@ func (ctrl *Controller) handleImgErr(err error, key interface{}) {
 }
 
 // generateOriginalContainerRuntimeConfigs returns rendered default storage, registries and policy config files
-func generateOriginalContainerRuntimeConfigs(templateDir string, cc *mcfgv1.ControllerConfig, role string, featureGateAccess featuregates.FeatureGateAccess) (*ign3types.File, *ign3types.File, *ign3types.File, error) {
+func generateOriginalContainerRuntimeConfigs(templateDir string, cc *mcfgv1.ControllerConfig, role string) (*ign3types.File, *ign3types.File, *ign3types.File, error) {
 	// Render the default templates
 	rc := &mtmpl.RenderConfig{
 		ControllerConfigSpec: &cc.Spec,
-		FeatureGateAccess:    featureGateAccess,
 	}
 	generatedConfigs, err := mtmpl.GenerateMachineConfigsForRole(rc, role, templateDir)
 	if err != nil {
@@ -603,7 +602,7 @@ func (ctrl *Controller) syncContainerRuntimeConfig(key string) error {
 			}
 		}
 		// Generate the original ContainerRuntimeConfig
-		originalStorageIgn, _, _, err := generateOriginalContainerRuntimeConfigs(ctrl.templatesDir, controllerConfig, role, ctrl.featureGateAccess)
+		originalStorageIgn, _, _, err := generateOriginalContainerRuntimeConfigs(ctrl.templatesDir, controllerConfig, role)
 		if err != nil {
 			return ctrl.syncStatusOnly(cfg, err, "could not generate origin ContainerRuntime Configs: %v", err)
 		}
@@ -903,7 +902,7 @@ func registriesConfigIgnition(templateDir string, controllerConfig *mcfgv1.Contr
 	)
 
 	// Generate the original registries config
-	_, originalRegistriesIgn, originalPolicyIgn, err := generateOriginalContainerRuntimeConfigs(templateDir, controllerConfig, role, featureGateAccess)
+	_, originalRegistriesIgn, originalPolicyIgn, err := generateOriginalContainerRuntimeConfigs(templateDir, controllerConfig, role)
 	if err != nil {
 		return nil, fmt.Errorf("could not generate original ContainerRuntime Configs: %w", err)
 	}
diff --git a/pkg/controller/kubelet-config/kubelet_config_controller.go b/pkg/controller/kubelet-config/kubelet_config_controller.go
@@ -361,7 +361,7 @@ func (ctrl *Controller) handleFeatureErr(err error, key interface{}) {
 // generateOriginalKubeletConfigWithFeatureGates generates a KubeletConfig and ensure the correct feature gates are set
 // based on the given FeatureGate.
 func generateOriginalKubeletConfigWithFeatureGates(cc *mcfgv1.ControllerConfig, templatesDir, role string, featureGateAccess featuregates.FeatureGateAccess) (*kubeletconfigv1beta1.KubeletConfiguration, error) {
-	originalKubeletIgn, err := generateOriginalKubeletConfigIgn(cc, templatesDir, role, featureGateAccess)
+	originalKubeletIgn, err := generateOriginalKubeletConfigIgn(cc, templatesDir, role)
 	if err != nil {
 		return nil, fmt.Errorf("could not generate the original Kubelet config ignition: %w", err)
 	}
@@ -391,9 +391,9 @@ func generateOriginalKubeletConfigWithFeatureGates(cc *mcfgv1.ControllerConfig,
 	return originalKubeConfig, nil
 }
 
-func generateOriginalKubeletConfigIgn(cc *mcfgv1.ControllerConfig, templatesDir, role string, featureGateAccess featuregates.FeatureGateAccess) (*ign3types.File, error) {
+func generateOriginalKubeletConfigIgn(cc *mcfgv1.ControllerConfig, templatesDir, role string) (*ign3types.File, error) {
 	// Render the default templates
-	rc := &mtmpl.RenderConfig{ControllerConfigSpec: &cc.Spec, FeatureGateAccess: featureGateAccess}
+	rc := &mtmpl.RenderConfig{ControllerConfigSpec: &cc.Spec}
 	generatedConfigs, err := mtmpl.GenerateMachineConfigsForRole(rc, role, templatesDir)
 	if err != nil {
 		return nil, fmt.Errorf("GenerateMachineConfigsforRole failed with error: %w", err)
diff --git a/pkg/controller/kubelet-config/kubelet_config_features_test.go b/pkg/controller/kubelet-config/kubelet_config_features_test.go
@@ -28,7 +28,7 @@ func TestFeatureGateDrift(t *testing.T) {
 			fgAccess := createNewDefaultFeatureGateAccess()
 			ctrl := f.newController(fgAccess)
 
-			kubeletConfig, err := generateOriginalKubeletConfigIgn(cc, ctrl.templatesDir, "master", fgAccess)
+			kubeletConfig, err := generateOriginalKubeletConfigIgn(cc, ctrl.templatesDir, "master")
 			if err != nil {
 				t.Errorf("could not generate kubelet config from templates %v", err)
 			}
diff --git a/pkg/controller/kubelet-config/kubelet_config_nodes_test.go b/pkg/controller/kubelet-config/kubelet_config_nodes_test.go
@@ -27,7 +27,7 @@ func TestOriginalKubeletConfigDefaultNodeConfig(t *testing.T) {
 			fgAccess := createNewDefaultFeatureGateAccess()
 			ctrl := f.newController(fgAccess)
 
-			kubeletConfig, err := generateOriginalKubeletConfigIgn(cc, ctrl.templatesDir, "master", fgAccess)
+			kubeletConfig, err := generateOriginalKubeletConfigIgn(cc, ctrl.templatesDir, "master")
 			if err != nil {
 				t.Errorf("could not generate kubelet config from templates %v", err)
 			}
diff --git a/pkg/controller/template/render.go b/pkg/controller/template/render.go
@@ -15,7 +15,6 @@ import (
 
 	configv1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/library-go/pkg/cloudprovider"
-	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 
 	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	"github.com/openshift/machine-config-operator/pkg/constants"
@@ -36,7 +35,6 @@ type RenderConfig struct {
 	*mcfgv1.ControllerConfigSpec
 	PullSecret                 string
 	InternalRegistryPullSecret string
-	FeatureGateAccess          featuregates.FeatureGateAccess
 
 	// no need to set this, will be automatically configured
 	Constants map[string]string
diff --git a/pkg/controller/template/render_test.go b/pkg/controller/template/render_test.go
@@ -12,7 +12,6 @@ import (
 
 	ign3types "github.com/coreos/ignition/v2/config/v3_4/types"
 	configv1 "github.com/openshift/api/config/v1"
-	"github.com/openshift/library-go/pkg/cloudprovider"
 	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 	"k8s.io/client-go/kubernetes/scheme"
 
@@ -85,7 +84,7 @@ func TestCloudProvider(t *testing.T) {
 				},
 			}
 
-			got, err := renderTemplate(RenderConfig{&config.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil, nil}, name, dummyTemplate)
+			got, err := renderTemplate(RenderConfig{&config.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil}, name, dummyTemplate)
 			if err != nil {
 				t.Fatalf("expected nil error %v", err)
 			}
@@ -146,9 +145,7 @@ func TestCredentialProviderConfigFlag(t *testing.T) {
 				},
 			}
 
-			fgAccess := featuregates.NewHardcodedFeatureGateAccess(nil, nil)
-
-			got, err := renderTemplate(RenderConfig{&config.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, fgAccess, nil}, name, dummyTemplate)
+			got, err := renderTemplate(RenderConfig{&config.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil}, name, dummyTemplate)
 			if err != nil {
 				t.Fatalf("expected nil error %v", err)
 			}
@@ -240,18 +237,16 @@ func TestInvalidPlatform(t *testing.T) {
 		}
 	}
 
-	fgAccess := featuregates.NewHardcodedFeatureGateAccess(nil, nil)
-
 	// we must treat unrecognized constants as "none"
 	controllerConfig.Spec.Infra.Status.PlatformStatus.Type = "_bad_"
-	_, err = generateTemplateMachineConfigs(&RenderConfig{&controllerConfig.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, fgAccess, nil}, templateDir)
+	_, err = generateTemplateMachineConfigs(&RenderConfig{&controllerConfig.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil}, templateDir)
 	if err != nil {
 		t.Errorf("expect nil error, got: %v", err)
 	}
 
 	// explicitly blocked
 	controllerConfig.Spec.Infra.Status.PlatformStatus.Type = "_base"
-	_, err = generateTemplateMachineConfigs(&RenderConfig{&controllerConfig.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, fgAccess, nil}, templateDir)
+	_, err = generateTemplateMachineConfigs(&RenderConfig{&controllerConfig.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil}, templateDir)
 	expectErr(err, "failed to create MachineConfig for role master: platform _base unsupported")
 }
 
@@ -262,9 +257,7 @@ func TestGenerateMachineConfigs(t *testing.T) {
 			t.Fatalf("failed to get controllerconfig config: %v", err)
 		}
 
-		fgAccess := featuregates.NewHardcodedFeatureGateAccess(nil, []configv1.FeatureGateName{cloudprovider.ExternalCloudProviderFeature, cloudprovider.ExternalCloudProviderFeatureAzure, cloudprovider.ExternalCloudProviderFeatureGCP, cloudprovider.ExternalCloudProviderFeatureExternal})
-
-		cfgs, err := generateTemplateMachineConfigs(&RenderConfig{&controllerConfig.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, fgAccess, nil}, templateDir)
+		cfgs, err := generateTemplateMachineConfigs(&RenderConfig{&controllerConfig.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil}, templateDir)
 		if err != nil {
 			t.Fatalf("failed to generate machine configs: %v", err)
 		}
@@ -391,7 +384,7 @@ func TestGetPaths(t *testing.T) {
 			}
 			c.res = append(c.res, platformBase)
 
-			got := getPaths(&RenderConfig{&config.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil, nil}, config.Spec.Platform)
+			got := getPaths(&RenderConfig{&config.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil}, config.Spec.Platform)
 			if reflect.DeepEqual(got, c.res) {
 				t.Fatalf("mismatch got: %s want: %s", got, c.res)
 			}
diff --git a/pkg/controller/template/template_controller.go b/pkg/controller/template/template_controller.go
@@ -19,7 +19,6 @@ import (
 	"github.com/openshift/client-go/machineconfiguration/clientset/versioned/scheme"
 	mcfginformersv1 "github.com/openshift/client-go/machineconfiguration/informers/externalversions/machineconfiguration/v1"
 	mcfglistersv1 "github.com/openshift/client-go/machineconfiguration/listers/machineconfiguration/v1"
-	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 	mcoResourceApply "github.com/openshift/machine-config-operator/lib/resourceapply"
 	ctrlcommon "github.com/openshift/machine-config-operator/pkg/controller/common"
 	"k8s.io/klog/v2"
@@ -66,8 +65,6 @@ type Controller struct {
 	mcListerSynced        cache.InformerSynced
 	secretsInformerSynced cache.InformerSynced
 
-	featureGateAccess featuregates.FeatureGateAccess
-
 	queue workqueue.RateLimitingInterface
 }
 
@@ -79,7 +76,6 @@ func New(
 	secretsInformer coreinformersv1.SecretInformer,
 	kubeClient clientset.Interface,
 	mcfgClient mcfgclientset.Interface,
-	fgAccess featuregates.FeatureGateAccess,
 ) *Controller {
 	eventBroadcaster := record.NewBroadcaster()
 	eventBroadcaster.StartLogging(klog.Infof)
@@ -121,8 +117,6 @@ func New(
 	ctrl.mcListerSynced = mcInformer.Informer().HasSynced
 	ctrl.secretsInformerSynced = secretsInformer.Informer().HasSynced
 
-	ctrl.featureGateAccess = fgAccess
-
 	return ctrl
 }
 
@@ -563,7 +557,7 @@ func (ctrl *Controller) syncControllerConfig(key string) error {
 		clusterPullSecretRaw = clusterPullSecret.Data[corev1.DockerConfigJsonKey]
 	}
 
-	mcs, err := getMachineConfigsForControllerConfig(ctrl.templatesDir, cfg, clusterPullSecretRaw, cfg.Spec.InternalRegistryPullSecret, ctrl.featureGateAccess)
+	mcs, err := getMachineConfigsForControllerConfig(ctrl.templatesDir, cfg, clusterPullSecretRaw, cfg.Spec.InternalRegistryPullSecret)
 	if err != nil {
 		return ctrl.syncFailingStatus(cfg, err)
 	}
@@ -582,7 +576,7 @@ func (ctrl *Controller) syncControllerConfig(key string) error {
 	return ctrl.syncCompletedStatus(cfg)
 }
 
-func getMachineConfigsForControllerConfig(templatesDir string, config *mcfgv1.ControllerConfig, clusterPullSecretRaw, internalRegistryPullSecretRaw []byte, featureGateAccess featuregates.FeatureGateAccess) ([]*mcfgv1.MachineConfig, error) {
+func getMachineConfigsForControllerConfig(templatesDir string, config *mcfgv1.ControllerConfig, clusterPullSecretRaw, internalRegistryPullSecretRaw []byte) ([]*mcfgv1.MachineConfig, error) {
 	buf := &bytes.Buffer{}
 	if err := json.Compact(buf, clusterPullSecretRaw); err != nil {
 		return nil, fmt.Errorf("couldn't compact pullsecret %q: %w", string(clusterPullSecretRaw), err)
@@ -591,7 +585,6 @@ func getMachineConfigsForControllerConfig(templatesDir string, config *mcfgv1.Co
 		ControllerConfigSpec:       &config.Spec,
 		PullSecret:                 string(buf.Bytes()),
 		InternalRegistryPullSecret: string(internalRegistryPullSecretRaw),
-		FeatureGateAccess:          featureGateAccess,
 	}
 	mcs, err := generateTemplateMachineConfigs(rc, templatesDir)
 	if err != nil {
@@ -608,6 +601,6 @@ func getMachineConfigsForControllerConfig(templatesDir string, config *mcfgv1.Co
 }
 
 // RunBootstrap runs the tempate controller in boostrap mode.
-func RunBootstrap(templatesDir string, config *mcfgv1.ControllerConfig, pullSecretRaw []byte, featureGateAccess featuregates.FeatureGateAccess) ([]*mcfgv1.MachineConfig, error) {
-	return getMachineConfigsForControllerConfig(templatesDir, config, pullSecretRaw, nil, featureGateAccess)
+func RunBootstrap(templatesDir string, config *mcfgv1.ControllerConfig, pullSecretRaw []byte) ([]*mcfgv1.MachineConfig, error) {
+	return getMachineConfigsForControllerConfig(templatesDir, config, pullSecretRaw, nil)
 }
diff --git a/pkg/controller/template/template_controller_test.go b/pkg/controller/template/template_controller_test.go
@@ -9,8 +9,6 @@ import (
 	"github.com/clarketm/json"
 	configv1 "github.com/openshift/api/config/v1"
 	oseconfigfake "github.com/openshift/client-go/config/clientset/versioned/fake"
-	"github.com/openshift/library-go/pkg/cloudprovider"
-	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
@@ -101,13 +99,12 @@ func (f *fixture) newController() *Controller {
 
 	f.kubeclient = k8sfake.NewSimpleClientset(f.kubeobjects...)
 	f.oseclient = oseconfigfake.NewSimpleClientset(f.oseobjects...)
-	fgAccess := featuregates.NewHardcodedFeatureGateAccess(nil, nil)
 
 	cinformer := coreinformersv1.NewSharedInformerFactory(f.kubeclient, noResyncPeriodFunc())
 	i := informers.NewSharedInformerFactory(f.client, noResyncPeriodFunc())
 	c := New(templateDir,
 		i.Machineconfiguration().V1().ControllerConfigs(), i.Machineconfiguration().V1().MachineConfigs(), cinformer.Core().V1().Secrets(),
-		f.kubeclient, f.client, fgAccess)
+		f.kubeclient, f.client)
 
 	c.ccListerSynced = alwaysReady
 	c.mcListerSynced = alwaysReady
@@ -282,45 +279,7 @@ func TestCreatesMachineConfigs(t *testing.T) {
 	f.objects = append(f.objects, cc)
 	f.kubeobjects = append(f.kubeobjects, ps)
 
-	fgAccess := featuregates.NewHardcodedFeatureGateAccess(nil, nil)
-
-	expMCs, err := getMachineConfigsForControllerConfig(templateDir, cc, []byte(`{"dummy": "dummy"}`), nil, fgAccess)
-	if err != nil {
-		t.Fatal(err)
-	}
-	rcc := cc.DeepCopy()
-	rcc.Status.ObservedGeneration = 1
-	rcc.Status.Conditions = []mcfgv1.ControllerConfigStatusCondition{{Type: mcfgv1.TemplateControllerRunning, Status: corev1.ConditionTrue, Message: "syncing towards (1) generation using controller version v0.0.0-was-not-built-properly"}}
-	f.expectUpdateControllerConfigStatus(rcc)
-	f.expectGetSecretAction(ps)
-
-	for idx := range expMCs {
-		f.expectGetMachineConfigAction(expMCs[idx])
-		f.expectCreateMachineConfigAction(expMCs[idx])
-	}
-	ccc := cc.DeepCopy()
-	ccc.Status.ObservedGeneration = 1
-	ccc.Status.Conditions = []mcfgv1.ControllerConfigStatusCondition{
-		{Type: mcfgv1.TemplateControllerCompleted, Status: corev1.ConditionTrue, Message: "sync completed towards (1) generation using controller version v0.0.0-was-not-built-properly"},
-		{Type: mcfgv1.TemplateControllerRunning, Status: corev1.ConditionFalse},
-		{Type: mcfgv1.TemplateControllerFailing, Status: corev1.ConditionFalse},
-	}
-	f.expectUpdateControllerConfigStatus(ccc)
-
-	f.run(getKey(cc, t))
-}
-
-func TestCreatesMachineConfigsWithFeatureGate(t *testing.T) {
-	f := newFixture(t)
-	cc := newControllerConfig("test-cluster")
-	ps := newPullSecret("coreos-pull-secret", []byte(`{"dummy": "dummy"}`))
-	fgAccess := featuregates.NewHardcodedFeatureGateAccess([]configv1.FeatureGateName{cloudprovider.ExternalCloudProviderFeature, "SomeOther"}, nil)
-
-	f.ccLister = append(f.ccLister, cc)
-	f.objects = append(f.objects, cc)
-	f.kubeobjects = append(f.kubeobjects, ps)
-
-	expMCs, err := getMachineConfigsForControllerConfig(templateDir, cc, []byte(`{"dummy": "dummy"}`), nil, fgAccess)
+	expMCs, err := getMachineConfigsForControllerConfig(templateDir, cc, []byte(`{"dummy": "dummy"}`), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -350,9 +309,8 @@ func TestDoNothing(t *testing.T) {
 	f := newFixture(t)
 	cc := newControllerConfig("test-cluster")
 	ps := newPullSecret("coreos-pull-secret", []byte(`{"dummy": "dummy"}`))
-	fgAccess := featuregates.NewHardcodedFeatureGateAccess([]configv1.FeatureGateName{cloudprovider.ExternalCloudProviderFeature}, nil)
 
-	mcs, err := getMachineConfigsForControllerConfig(templateDir, cc, []byte(`{"dummy": "dummy"}`), nil, fgAccess)
+	mcs, err := getMachineConfigsForControllerConfig(templateDir, cc, []byte(`{"dummy": "dummy"}`), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -389,9 +347,8 @@ func TestRecreateMachineConfig(t *testing.T) {
 	f := newFixture(t)
 	cc := newControllerConfig("test-cluster")
 	ps := newPullSecret("coreos-pull-secret", []byte(`{"dummy": "dummy"}`))
-	fgAccess := featuregates.NewHardcodedFeatureGateAccess([]configv1.FeatureGateName{cloudprovider.ExternalCloudProviderFeature}, nil)
 
-	mcs, err := getMachineConfigsForControllerConfig(templateDir, cc, []byte(`{"dummy": "dummy"}`), nil, fgAccess)
+	mcs, err := getMachineConfigsForControllerConfig(templateDir, cc, []byte(`{"dummy": "dummy"}`), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -429,9 +386,8 @@ func TestUpdateMachineConfig(t *testing.T) {
 	f := newFixture(t)
 	cc := newControllerConfig("test-cluster")
 	ps := newPullSecret("coreos-pull-secret", []byte(`{"dummy": "dummy"}`))
-	fgAccess := featuregates.NewHardcodedFeatureGateAccess([]configv1.FeatureGateName{cloudprovider.ExternalCloudProviderFeature, cloudprovider.ExternalCloudProviderFeatureExternal}, nil)
 
-	mcs, err := getMachineConfigsForControllerConfig(templateDir, cc, []byte(`{"dummy": "dummy"}`), nil, fgAccess)
+	mcs, err := getMachineConfigsForControllerConfig(templateDir, cc, []byte(`{"dummy": "dummy"}`), nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -451,7 +407,7 @@ func TestUpdateMachineConfig(t *testing.T) {
 		f.objects = append(f.objects, mcs[idx])
 	}
 
-	expmcs, err := getMachineConfigsForControllerConfig(templateDir, cc, []byte(`{"dummy": "dummy"}`), []byte(`{"dummy": "dummy"}`), fgAccess)
+	expmcs, err := getMachineConfigsForControllerConfig(templateDir, cc, []byte(`{"dummy": "dummy"}`), []byte(`{"dummy": "dummy"}`))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/test/e2e-bootstrap/bootstrap_test.go b/test/e2e-bootstrap/bootstrap_test.go
@@ -462,7 +462,6 @@ func createControllers(ctx *ctrlcommon.ControllerContext) []ctrlcommon.Controlle
 			ctx.OpenShiftConfigKubeNamespacedInformerFactory.Core().V1().Secrets(),
 			ctx.ClientBuilder.KubeClientOrDie("template-controller"),
 			ctx.ClientBuilder.MachineConfigClientOrDie("template-controller"),
-			ctx.FeatureGateAccess,
 		),
 		// Add all "sub-renderers here"
 		kubeletconfig.New(

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ func (b *Bootstrap) Run(destDir string) error {`
`160`	`160`	`return fmt.Errorf("error creating feature gate access: %w", err)`
`161`	`161`	`}`
`162`	`162`
`163`		`- iconfigs, err := template.RunBootstrap(b.templatesDir, cconfig, psraw, fgAccess)`
	`163`	`+ iconfigs, err := template.RunBootstrap(b.templatesDir, cconfig, psraw)`
`164`	`164`	`if err != nil {`
`165`	`165`	`return err`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func RunContainerRuntimeBootstrap(templateDir string, crconfigs []*mcfgv1.Contai`
`33`	`33`	`}`
`34`	`34`	`role := pool.Name`
`35`	`35`	`// Generate the original ContainerRuntimeConfig`
`36`		`- originalStorageIgn, _, _, err := generateOriginalContainerRuntimeConfigs(templateDir, controllerConfig, role, featureGateAccess)`
	`36`	`+ originalStorageIgn, _, _, err := generateOriginalContainerRuntimeConfigs(templateDir, controllerConfig, role)`
`37`	`37`	`if err != nil {`
`38`	`38`	`return nil, fmt.Errorf("could not generate origin ContainerRuntime Configs: %w", err)`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -426,11 +426,10 @@ func (ctrl *Controller) handleImgErr(err error, key interface{}) {`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`// generateOriginalContainerRuntimeConfigs returns rendered default storage, registries and policy config files`
`429`		`-func generateOriginalContainerRuntimeConfigs(templateDir string, cc mcfgv1.ControllerConfig, role string, featureGateAccess featuregates.FeatureGateAccess) (ign3types.File, ign3types.File, ign3types.File, error) {`
	`429`	`+func generateOriginalContainerRuntimeConfigs(templateDir string, cc mcfgv1.ControllerConfig, role string) (ign3types.File, ign3types.File, ign3types.File, error) {`
`430`	`430`	`// Render the default templates`
`431`	`431`	`rc := &mtmpl.RenderConfig{`
`432`	`432`	`ControllerConfigSpec: &cc.Spec,`
`433`		`- FeatureGateAccess: featureGateAccess,`
`434`	`433`	`}`
`435`	`434`	`generatedConfigs, err := mtmpl.GenerateMachineConfigsForRole(rc, role, templateDir)`
`436`	`435`	`if err != nil {`
`@@ -603,7 +602,7 @@ func (ctrl *Controller) syncContainerRuntimeConfig(key string) error {`
`603`	`602`	`}`
`604`	`603`	`}`
`605`	`604`	`// Generate the original ContainerRuntimeConfig`
`606`		`- originalStorageIgn, _, _, err := generateOriginalContainerRuntimeConfigs(ctrl.templatesDir, controllerConfig, role, ctrl.featureGateAccess)`
	`605`	`+ originalStorageIgn, _, _, err := generateOriginalContainerRuntimeConfigs(ctrl.templatesDir, controllerConfig, role)`
`607`	`606`	`if err != nil {`
`608`	`607`	`return ctrl.syncStatusOnly(cfg, err, "could not generate origin ContainerRuntime Configs: %v", err)`
`609`	`608`	`}`
`@@ -903,7 +902,7 @@ func registriesConfigIgnition(templateDir string, controllerConfig *mcfgv1.Contr`
`903`	`902`	`)`
`904`	`903`
`905`	`904`	`// Generate the original registries config`
`906`		`- _, originalRegistriesIgn, originalPolicyIgn, err := generateOriginalContainerRuntimeConfigs(templateDir, controllerConfig, role, featureGateAccess)`
	`905`	`+ _, originalRegistriesIgn, originalPolicyIgn, err := generateOriginalContainerRuntimeConfigs(templateDir, controllerConfig, role)`
`907`	`906`	`if err != nil {`
`908`	`907`	`return nil, fmt.Errorf("could not generate original ContainerRuntime Configs: %w", err)`
`909`	`908`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func TestFeatureGateDrift(t *testing.T) {`
`28`	`28`	`fgAccess := createNewDefaultFeatureGateAccess()`
`29`	`29`	`ctrl := f.newController(fgAccess)`
`30`	`30`
`31`		`- kubeletConfig, err := generateOriginalKubeletConfigIgn(cc, ctrl.templatesDir, "master", fgAccess)`
	`31`	`+ kubeletConfig, err := generateOriginalKubeletConfigIgn(cc, ctrl.templatesDir, "master")`
`32`	`32`	`if err != nil {`
`33`	`33`	`t.Errorf("could not generate kubelet config from templates %v", err)`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func TestOriginalKubeletConfigDefaultNodeConfig(t *testing.T) {`
`27`	`27`	`fgAccess := createNewDefaultFeatureGateAccess()`
`28`	`28`	`ctrl := f.newController(fgAccess)`
`29`	`29`
`30`		`- kubeletConfig, err := generateOriginalKubeletConfigIgn(cc, ctrl.templatesDir, "master", fgAccess)`
	`30`	`+ kubeletConfig, err := generateOriginalKubeletConfigIgn(cc, ctrl.templatesDir, "master")`
`31`	`31`	`if err != nil {`
`32`	`32`	`t.Errorf("could not generate kubelet config from templates %v", err)`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ import (`
`12`	`12`
`13`	`13`	`ign3types "github.com/coreos/ignition/v2/config/v3_4/types"`
`14`	`14`	`configv1 "github.com/openshift/api/config/v1"`
`15`		`- "github.com/openshift/library-go/pkg/cloudprovider"`
`16`	`15`	`"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"`
`17`	`16`	`"k8s.io/client-go/kubernetes/scheme"`
`18`	`17`
`@@ -85,7 +84,7 @@ func TestCloudProvider(t *testing.T) {`
`85`	`84`	`},`
`86`	`85`	`}`
`87`	`86`
`88`		- got, err := renderTemplate(RenderConfig{&config.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil, nil}, name, dummyTemplate)
	`87`	+ got, err := renderTemplate(RenderConfig{&config.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil}, name, dummyTemplate)
`89`	`88`	`if err != nil {`
`90`	`89`	`t.Fatalf("expected nil error %v", err)`
`91`	`90`	`}`
`@@ -146,9 +145,7 @@ func TestCredentialProviderConfigFlag(t *testing.T) {`
`146`	`145`	`},`
`147`	`146`	`}`
`148`	`147`
`149`		`- fgAccess := featuregates.NewHardcodedFeatureGateAccess(nil, nil)`
`150`		`-`
`151`		- got, err := renderTemplate(RenderConfig{&config.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, fgAccess, nil}, name, dummyTemplate)
	`148`	+ got, err := renderTemplate(RenderConfig{&config.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil}, name, dummyTemplate)
`152`	`149`	`if err != nil {`
`153`	`150`	`t.Fatalf("expected nil error %v", err)`
`154`	`151`	`}`
`@@ -240,18 +237,16 @@ func TestInvalidPlatform(t *testing.T) {`
`240`	`237`	`}`
`241`	`238`	`}`
`242`	`239`
`243`		`- fgAccess := featuregates.NewHardcodedFeatureGateAccess(nil, nil)`
`244`		`-`
`245`	`240`	`// we must treat unrecognized constants as "none"`
`246`	`241`	`controllerConfig.Spec.Infra.Status.PlatformStatus.Type = "_bad_"`
`247`		- _, err = generateTemplateMachineConfigs(&RenderConfig{&controllerConfig.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, fgAccess, nil}, templateDir)
	`242`	+ _, err = generateTemplateMachineConfigs(&RenderConfig{&controllerConfig.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil}, templateDir)
`248`	`243`	`if err != nil {`
`249`	`244`	`t.Errorf("expect nil error, got: %v", err)`
`250`	`245`	`}`
`251`	`246`
`252`	`247`	`// explicitly blocked`
`253`	`248`	`controllerConfig.Spec.Infra.Status.PlatformStatus.Type = "_base"`
`254`		- _, err = generateTemplateMachineConfigs(&RenderConfig{&controllerConfig.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, fgAccess, nil}, templateDir)
	`249`	+ _, err = generateTemplateMachineConfigs(&RenderConfig{&controllerConfig.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil}, templateDir)
`255`	`250`	`expectErr(err, "failed to create MachineConfig for role master: platform _base unsupported")`
`256`	`251`	`}`
`257`	`252`
`@@ -262,9 +257,7 @@ func TestGenerateMachineConfigs(t *testing.T) {`
`262`	`257`	`t.Fatalf("failed to get controllerconfig config: %v", err)`
`263`	`258`	`}`
`264`	`259`
`265`		`- fgAccess := featuregates.NewHardcodedFeatureGateAccess(nil, []configv1.FeatureGateName{cloudprovider.ExternalCloudProviderFeature, cloudprovider.ExternalCloudProviderFeatureAzure, cloudprovider.ExternalCloudProviderFeatureGCP, cloudprovider.ExternalCloudProviderFeatureExternal})`
`266`		`-`
`267`		- cfgs, err := generateTemplateMachineConfigs(&RenderConfig{&controllerConfig.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, fgAccess, nil}, templateDir)
	`260`	+ cfgs, err := generateTemplateMachineConfigs(&RenderConfig{&controllerConfig.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil}, templateDir)
`268`	`261`	`if err != nil {`
`269`	`262`	`t.Fatalf("failed to generate machine configs: %v", err)`
`270`	`263`	`}`
`@@ -391,7 +384,7 @@ func TestGetPaths(t *testing.T) {`
`391`	`384`	`}`
`392`	`385`	`c.res = append(c.res, platformBase)`
`393`	`386`
`394`		- got := getPaths(&RenderConfig{&config.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil, nil}, config.Spec.Platform)
	`387`	+ got := getPaths(&RenderConfig{&config.Spec, `{"dummy":"dummy"}`, `{"dummy":"dummy"}`, nil}, config.Spec.Platform)
`395`	`388`	`if reflect.DeepEqual(got, c.res) {`
`396`	`389`	`t.Fatalf("mismatch got: %s want: %s", got, c.res)`
`397`	`390`	`}`