OCPBUGS-13547: Remove featureset flag and use only the manifest

go.mod

@@ -6,10 +6,10 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/gonum/graph v0.0.0-20170401004347-50b27dea7ebb
 	github.com/google/go-cmp v0.5.9
-	github.com/openshift/api v0.0.0-20230503133300-8bbcb7ca7183
+	github.com/openshift/api v0.0.0-20230509100629-894b49f57a15
 	github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
 	github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb
-	github.com/openshift/library-go v0.0.0-20230503173034-95ca3c14e50a
+	github.com/openshift/library-go v0.0.0-20230510144506-e749b54aff20
 	github.com/prometheus/client_golang v1.14.0
 	github.com/prometheus/common v0.37.0
 	github.com/spf13/cobra v1.6.0

go.sum

@@ -431,14 +431,14 @@ github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E=
-github.com/openshift/api v0.0.0-20230503133300-8bbcb7ca7183 h1:t/CahSnpqY46sQR01SoS+Jt0jtjgmhgE6lFmRnO4q70=
-github.com/openshift/api v0.0.0-20230503133300-8bbcb7ca7183/go.mod h1:4VWG+W22wrB4HfBL88P40DxLEpSOaiBVxUnfalfJo9k=
+github.com/openshift/api v0.0.0-20230509100629-894b49f57a15 h1:0aKQixYOtjKB3NKhNzFeQ1t0oDOkacpaAN1ztfZufB8=
+github.com/openshift/api v0.0.0-20230509100629-894b49f57a15/go.mod h1:4VWG+W22wrB4HfBL88P40DxLEpSOaiBVxUnfalfJo9k=
 github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR4ah7FfaPR1WePizm0jlrsbmPu91xQZnAsVVreQV1k=
 github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb h1:Nij5OnaECrkmcRQMAE9LMbQXPo95aqFnf+12B7SyFVI=
 github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb/go.mod h1:Rhb3moCqeiTuGHAbXBOlwPubUMlOZEkrEWTRjIF3jzs=
-github.com/openshift/library-go v0.0.0-20230503173034-95ca3c14e50a h1:GWDlGsHQUo2QaXG8r4nCAbAMAYNN85HOMt+vZSLBOdQ=
-github.com/openshift/library-go v0.0.0-20230503173034-95ca3c14e50a/go.mod h1:PJVatR/oS/EaFciwylyAr9hORSqQHrC+5bXf4L0wsBY=
+github.com/openshift/library-go v0.0.0-20230510144506-e749b54aff20 h1:BfL2/x2Z/N3Wc1AhovvZ1pWStxwTuQdo6A84NPhSTvY=
+github.com/openshift/library-go v0.0.0-20230510144506-e749b54aff20/go.mod h1:PJVatR/oS/EaFciwylyAr9hORSqQHrC+5bXf4L0wsBY=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=

pkg/cmd/render/render.go

@@ -7,7 +7,6 @@ import (
 	"path/filepath"
 
 	"github.com/ghodss/yaml"
-	configv1 "github.com/openshift/api/config/v1"
 	kubecontrolplanev1 "github.com/openshift/api/kubecontrolplane/v1"
 	"github.com/openshift/cluster-kube-controller-manager-operator/bindata"
 	"github.com/openshift/cluster-kube-controller-manager-operator/pkg/operator/targetconfigcontroller"
@@ -130,22 +129,6 @@ type TemplateData struct {
 	ServiceClusterIPRange                 []string
 }
 
-func setFeatureGates(renderConfig *TemplateData, opts *renderOpts) error {
-	featureSet, ok := configv1.FeatureSets[configv1.FeatureSet(opts.generic.FeatureSet)]
-	if !ok {
-		return fmt.Errorf("featureSet %q not found", featureSet)
-	}
-	allGates := []string{}
-	for _, enabled := range featureSet.Enabled {
-		allGates = append(allGates, fmt.Sprintf("%v=true", enabled.FeatureGateAttributes.Name))
-	}
-	for _, disabled := range featureSet.Disabled {
-		allGates = append(allGates, fmt.Sprintf("%v=false", disabled.FeatureGateAttributes.Name))
-	}
-	renderConfig.FeatureGates = allGates
-	return nil
-}
-
 func setFeatureGatesFromAccessor(renderConfig *TemplateData, featureGates featuregates.FeatureGateAccess) error {
 	currFeatureGates, err := featureGates.CurrentFeatureGates()
 	if err != nil {
@@ -260,15 +243,10 @@ func (r *renderOpts) Run() error {
 
 	featureGates, err := r.generic.FeatureGates()
 	if err != nil {
-		klog.Warningf(fmt.Sprintf("error getting FeatureGates: %v", err))
-		if err := setFeatureGates(&renderConfig, r); err != nil {
-			return err
-		}
-
-	} else {
-		if err := setFeatureGatesFromAccessor(&renderConfig, featureGates); err != nil {
-			return err
-		}
+		return fmt.Errorf("error getting FeatureGates: %v", err)
+	}
+	if err := setFeatureGatesFromAccessor(&renderConfig, featureGates); err != nil {
+		return err
 	}
 
 	if err := r.manifest.ApplyTo(&renderConfig.ManifestConfig); err != nil {

pkg/cmd/render/render_test.go

@@ -219,58 +219,9 @@ func TestRenderCommand(t *testing.T) {
 				"--config-output-file=",
 				"--cpc-config-output-file=",
 			},
-			expectedErr: nil,
-			expectedFiles: []string{
-				"configs/config.yaml",
-				"configs/cpc-config.yaml",
-				"manifests/bootstrap-manifests/kube-controller-manager-pod.yaml",
-				"manifests/manifests/0000_00_namespace-openshift-infra.yaml",
-				"manifests/manifests/00_namespace-security-allocation-controller-clusterrole.yaml",
-				"manifests/manifests/00_namespace-security-allocation-controller-clusterrolebinding.yaml",
-				"manifests/manifests/00_openshift-kube-controller-manager-ns.yaml",
-				"manifests/manifests/00_openshift-kube-controller-manager-operator-ns.yaml",
-				"manifests/manifests/00_podsecurity-admission-label-syncer-controller-clusterrole.yaml",
-				"manifests/manifests/00_podsecurity-admission-label-syncer-controller-clusterrolebinding.yaml",
-				"manifests/manifests/secret-csr-signer-signer.yaml",
-				"manifests/manifests/secret-initial-kube-controller-manager-service-account-private-key.yaml",
-			},
-			expectedContents: map[string]map[string]interface{}{
-				"manifests/bootstrap-manifests/kube-controller-manager-pod.yaml": {
-					"spec.containers[0].args": []interface{}{
-						"--openshift-config=/etc/kubernetes/config/kube-controller-manager-config.yaml",
-						"--kubeconfig=/etc/kubernetes/secrets/kubeconfig",
-						"--v=2",
-						"--allocate-node-cidrs=false",
-						"--authentication-kubeconfig=/etc/kubernetes/secrets/kubeconfig",
-						"--authorization-kubeconfig=/etc/kubernetes/secrets/kubeconfig",
-						"--cert-dir=/var/run/kubernetes",
-						"--cluster-signing-cert-file=/etc/kubernetes/secrets/kubelet-signer.crt",
-						"--cluster-signing-duration=720h",
-						"--cluster-signing-key-file=/etc/kubernetes/secrets/kubelet-signer.key",
-						"--configure-cloud-routes=false",
-						"--controllers=*",
-						"--controllers=-bootstrapsigner",
-						"--controllers=-tokencleaner",
-						"--controllers=-ttl",
-						"--enable-dynamic-provisioning=true",
-						"--feature-gates=OpenShiftPodSecurityAdmission=true",
-						"--feature-gates=RetroactiveDefaultStorageClass=false",
-						"--flex-volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec",
-						"--kube-api-burst=300",
-						"--kube-api-qps=150",
-						"--leader-elect-renew-deadline=12s",
-						"--leader-elect-resource-lock=leases",
-						"--leader-elect-retry-period=3s",
-						"--leader-elect=true",
-						"--pv-recycler-pod-template-filepath-hostpath=",
-						"--pv-recycler-pod-template-filepath-nfs=",
-						"--root-ca-file=/etc/kubernetes/secrets/kube-apiserver-complete-server-ca-bundle.crt",
-						"--secure-port=10257",
-						"--service-account-private-key-file=/etc/kubernetes/secrets/service-account.key",
-						"--use-service-account-credentials=true",
-					},
-				},
-			},
+			expectedErr:      fmt.Errorf("error getting FeatureGates: cannot return FeatureGate without payload version"),
+			expectedFiles:    nil,
+			expectedContents: map[string]map[string]interface{}{},
 		},
 		{
 			name: "duplicate-rendered-fg",