feat/config-sync: allowing FG to transformer on providers

mtulio · mtulio · commit 73b368b029e4 · 2025-08-28T18:07:39.000-03:00
Injecting features to allow transformers for each cloud provider
implementation so enabled feature gates can be eavaluated.
diff --git a/pkg/cloud/aws/aws_config_transformer.go b/pkg/cloud/aws/aws_config_transformer.go
@@ -11,6 +11,8 @@ import (
 	"gopkg.in/ini.v1"
 
 	awsconfig "k8s.io/cloud-provider-aws/pkg/providers/v1/config"
+
+	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 )
 
 // defaultConfig is a string holding the absolute bare minimum INI string that the AWS CCM needs to start.
@@ -20,7 +22,7 @@ const defaultConfig = `[Global]
 
 // CloudConfigTransformer is used to inject OpenShift configuration defaults into the Cloud Provider config
 // for the AWS Cloud Provider. If an empty source string is provided, a minimal default configuration will be created.
-func CloudConfigTransformer(source string, infra *configv1.Infrastructure, network *configv1.Network) (string, error) {
+func CloudConfigTransformer(source string, infra *configv1.Infrastructure, network *configv1.Network, features featuregates.FeatureGate) (string, error) {
 	cfg, err := readAWSConfig(source)
 	if err != nil {
 		return "", fmt.Errorf("failed to read the cloud.conf: %w", err)
diff --git a/pkg/cloud/aws/aws_config_transformer_test.go b/pkg/cloud/aws/aws_config_transformer_test.go
@@ -4,6 +4,8 @@ import (
 	"testing"
 
 	. "github.com/onsi/gomega"
+
+	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 )
 
 func TestCloudConfigTransformer(t *testing.T) {
@@ -87,7 +89,7 @@ SigningRegion = signing_region
 		t.Run(tc.name, func(t *testing.T) {
 			g := NewWithT(t)
 
-			gotConfig, err := CloudConfigTransformer(tc.source, nil, nil) // No Infra or Network are required for the current functionality.
+			gotConfig, err := CloudConfigTransformer(tc.source, nil, nil, featuregates.NewFeatureGate(nil, nil)) // No Infra or Network are required for the current functionality.
 			g.Expect(err).ToNot(HaveOccurred())
 
 			g.Expect(gotConfig).To(Equal(tc.expected))
diff --git a/pkg/cloud/azure/azure.go b/pkg/cloud/azure/azure.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/cloud/common"
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"
+	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 )
 
 const providerName = "azure"
@@ -136,7 +137,7 @@ func IsAzure(infra *configv1.Infrastructure) bool {
 	return false
 }
 
-func CloudConfigTransformer(source string, infra *configv1.Infrastructure, network *configv1.Network) (string, error) {
+func CloudConfigTransformer(source string, infra *configv1.Infrastructure, network *configv1.Network, features featuregates.FeatureGate) (string, error) {
 	if !IsAzure(infra) {
 		return "", fmt.Errorf("invalid platform, expected CloudName to be %s", configv1.AzurePublicCloud)
 	}
diff --git a/pkg/cloud/azure/azure_test.go b/pkg/cloud/azure/azure_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/onsi/gomega/format"
 	configv1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"
+	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 	"github.com/stretchr/testify/assert"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -259,7 +260,7 @@ func TestCloudConfigTransformer(t *testing.T) {
 			src, err := json.Marshal(tc.source)
 			g.Expect(err).NotTo(HaveOccurred(), "Marshal of source data should succeed")
 
-			actual, err := CloudConfigTransformer(string(src), tc.infra, nil)
+			actual, err := CloudConfigTransformer(string(src), tc.infra, nil, featuregates.NewFeatureGate(nil, nil))
 			if tc.errMsg != "" {
 				g.Expect(err).Should(MatchError(tc.errMsg))
 				g.Expect(actual).Should(Equal(""))
diff --git a/pkg/cloud/azurestack/azurestack.go b/pkg/cloud/azurestack/azurestack.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/cloud/common"
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"
+	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 )
 
 const providerName = "azurestack"
@@ -104,7 +105,7 @@ func IsAzureStackHub(platformStatus *configv1.PlatformStatus) bool {
 // modifies it to be compatible with the external cloud provider. It returns
 // an error if the platform is not OpenStackPlatformType or if any errors are
 // encountered while attempting to rework the configuration.
-func CloudConfigTransformer(source string, infra *configv1.Infrastructure, network *configv1.Network) (string, error) {
+func CloudConfigTransformer(source string, infra *configv1.Infrastructure, network *configv1.Network, features featuregates.FeatureGate) (string, error) {
 	if !IsAzureStackHub(infra.Status.PlatformStatus) {
 		return "", fmt.Errorf("invalid platform, expected CloudName to be %s", configv1.AzureStackCloud)
 	}
diff --git a/pkg/cloud/azurestack/azurestack_test.go b/pkg/cloud/azurestack/azurestack_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"
+	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 )
 
 const (
@@ -144,7 +145,7 @@ func TestCloudConfigTransformer(t *testing.T) {
 			src, err := json.Marshal(tc.source)
 			g.Expect(err).NotTo(HaveOccurred(), "Marshal of source data should succeed")
 
-			actual, err := CloudConfigTransformer(string(src), tc.infra, nil)
+			actual, err := CloudConfigTransformer(string(src), tc.infra, nil, featuregates.NewFeatureGate(nil, nil))
 			if tc.errMsg != "" {
 				g.Expect(err).Should(MatchError(tc.errMsg))
 				g.Expect(actual).Should(Equal(""))
diff --git a/pkg/cloud/cloud.go b/pkg/cloud/cloud.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/cloud/common"
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"
+	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/cloud/aws"
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/cloud/azure"
@@ -23,7 +24,7 @@ import (
 // cloudConfigTransformer function transforms the source config map using the input infrastructure.config.openshift.io
 // and network.config.openshift.io objects. Only the data and binaryData field of the output ConfigMap will be respected by
 // consumer of the transformer.
-type cloudConfigTransformer func(source string, infra *configv1.Infrastructure, network *configv1.Network) (string, error)
+type cloudConfigTransformer func(source string, infra *configv1.Infrastructure, network *configv1.Network, features featuregates.FeatureGate) (string, error)
 
 // GetCloudConfigTransformer returns the function that should be used to transform
 // the cloud configuration config map, and a boolean to indicate if the config should
diff --git a/pkg/cloud/common/config.go b/pkg/cloud/common/config.go
@@ -2,10 +2,12 @@ package common
 
 import (
 	configv1 "github.com/openshift/api/config/v1"
+
+	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 )
 
 // NoOpTransformer implements the cloudConfigTransformer. It makes no changes
 // to the source configuration and simply returns it as-is.
-func NoOpTransformer(source string, infra *configv1.Infrastructure, network *configv1.Network) (string, error) {
+func NoOpTransformer(source string, infra *configv1.Infrastructure, network *configv1.Network, features featuregates.FeatureGate) (string, error) {
 	return source, nil
 }
diff --git a/pkg/cloud/openstack/openstack.go b/pkg/cloud/openstack/openstack.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/cloud/common"
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"
+	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 )
 
 const providerName = "openstack"
@@ -142,7 +143,7 @@ func NewProviderAssets(config config.OperatorConfig) (common.CloudProviderAssets
 // modifies it to be compatible with the external cloud provider. It returns
 // an error if the platform is not OpenStackPlatformType or if any errors are
 // encountered while attempting to rework the configuration.
-func CloudConfigTransformer(source string, infra *configv1.Infrastructure, network *configv1.Network) (string, error) {
+func CloudConfigTransformer(source string, infra *configv1.Infrastructure, network *configv1.Network, features featuregates.FeatureGate) (string, error) {
 	if infra.Status.PlatformStatus == nil ||
 		infra.Status.PlatformStatus.Type != configv1.OpenStackPlatformType {
 		return "", fmt.Errorf("invalid platform, expected to be %s", configv1.OpenStackPlatformType)
diff --git a/pkg/cloud/openstack/openstack_test.go b/pkg/cloud/openstack/openstack_test.go
@@ -10,6 +10,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"
+	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 )
 
 const (
@@ -172,7 +173,7 @@ use-octavia            = false
 	for _, tc := range tc {
 		t.Run(tc.name, func(t *testing.T) {
 			g := NewWithT(t)
-			actual, err := CloudConfigTransformer(tc.source, tc.infra, tc.network)
+			actual, err := CloudConfigTransformer(tc.source, tc.infra, tc.network, featuregates.NewFeatureGate(nil, nil))
 			if tc.errMsg != "" {
 				g.Expect(err).Should(MatchError(tc.errMsg))
 				return
diff --git a/pkg/cloud/vsphere/vsphere_config_transformer.go b/pkg/cloud/vsphere/vsphere_config_transformer.go
@@ -8,6 +8,7 @@ import (
 	"k8s.io/utils/net"
 
 	ccmConfig "github.com/openshift/cluster-cloud-controller-manager-operator/pkg/cloud/vsphere/vsphere_cloud_config"
+	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 )
 
 // Well-known OCP-specific vSphere tags. These values are going to the "labels" sections in CCM cloud-config.
@@ -27,7 +28,7 @@ const (
 // Currently, CloudConfigTransformer is responsible to populate vcenters, labels, and node networking parameters from
 // the Infrastructure resource.
 // Also, this function converts legacy deprecated INI configuration format to a YAML-based one.
-func CloudConfigTransformer(source string, infra *configv1.Infrastructure, network *configv1.Network) (string, error) {
+func CloudConfigTransformer(source string, infra *configv1.Infrastructure, network *configv1.Network, features featuregates.FeatureGate) (string, error) {
 	if infra.Status.PlatformStatus == nil ||
 		infra.Status.PlatformStatus.Type != configv1.VSpherePlatformType {
 		return "", fmt.Errorf("invalid platform, expected to be %s", configv1.VSpherePlatformType)
diff --git a/pkg/cloud/vsphere/vsphere_config_transformer_test.go b/pkg/cloud/vsphere/vsphere_config_transformer_test.go
@@ -8,6 +8,8 @@ import (
 	configv1 "github.com/openshift/api/config/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
+
 	ccm "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphere/config"
 )
 
@@ -393,117 +395,133 @@ func TestCloudConfigTransformer(t *testing.T) {
 		inputConfig      string
 		equivalentConfig string
 		errMsg           string
+		features         featuregates.FeatureGate
 	}{
 		{
 			name:             "in-tree to external with empty infra",
 			infraBuilder:     newVsphereInfraBuilder(),
 			networkBuilder:   makeDummyNetworkConfig(),
 			inputConfig:      iniConfigWithWorkspace,
 			equivalentConfig: iniConfigWithoutWorkspace,
+			features:         featuregates.NewFeatureGate(nil, nil),
 		},
 		{
 			name:             "in-tree to external with node networking",
 			infraBuilder:     newVsphereInfraBuilder().withVSphereDefaultNodeNetworking(),
 			networkBuilder:   makeDummyNetworkConfig(),
 			inputConfig:      iniConfigWithWorkspace,
 			equivalentConfig: iniConfigNodeNetworking,
+			features:         featuregates.NewFeatureGate(nil, nil),
 		},
 		{
 			name:             "populating labels datacenters from zones config",
 			infraBuilder:     newVsphereInfraBuilder().withVSphereZones(),
 			networkBuilder:   makeDummyNetworkConfig(),
 			inputConfig:      iniConfigWithWorkspace,
 			equivalentConfig: iniConfigZonal,
+			features:         featuregates.NewFeatureGate(nil, nil),
 		},
 		{
 			name:             "replacing existing labels with openshift specific",
 			infraBuilder:     newVsphereInfraBuilder().withVSphereZones(),
 			networkBuilder:   makeDummyNetworkConfig(),
 			inputConfig:      iniConfigWithExistingLabels,
 			equivalentConfig: iniConfigZonal,
+			features:         featuregates.NewFeatureGate(nil, nil),
 		},
 		{
 			name:             "yaml and ini config parsing results should be the same",
 			infraBuilder:     newVsphereInfraBuilder(),
 			networkBuilder:   makeDummyNetworkConfig(),
 			inputConfig:      yamlConfig,
 			equivalentConfig: iniConfigWithoutWorkspace,
+			features:         featuregates.NewFeatureGate(nil, nil),
 		},
 		{
 			name:             "yaml and ini config parsing results should be the same, with zones",
 			infraBuilder:     newVsphereInfraBuilder().withVSphereZones(),
 			networkBuilder:   makeDummyNetworkConfig(),
 			inputConfig:      yamlConfigZonal,
 			equivalentConfig: iniConfigZonal,
+			features:         featuregates.NewFeatureGate(nil, nil),
 		},
 		{
 			name:             "yaml and ini config parsing results should be the same, node networking",
 			infraBuilder:     newVsphereInfraBuilder().withVSphereDefaultNodeNetworking(),
 			networkBuilder:   makeDummyNetworkConfig(),
 			inputConfig:      yamlConfigNodeNetworking,
 			equivalentConfig: iniConfigNodeNetworking,
+			features:         featuregates.NewFeatureGate(nil, nil),
 		},
 		{
 			name:             "yaml config should contain node networking if it's specified in infra",
 			infraBuilder:     newVsphereInfraBuilder().withVSphereDefaultNodeNetworking(),
 			networkBuilder:   makeDummyNetworkConfig(),
 			inputConfig:      yamlConfig,
 			equivalentConfig: yamlConfigNodeNetworking,
+			features:         featuregates.NewFeatureGate(nil, nil),
 		},
 		{
 			name:             "yaml config should be populated with datacenters and labels if failure domains specified",
 			infraBuilder:     newVsphereInfraBuilder().withVSphereZones(),
 			networkBuilder:   makeDummyNetworkConfig(),
 			inputConfig:      yamlConfig,
 			equivalentConfig: yamlConfigZonal,
+			features:         featuregates.NewFeatureGate(nil, nil),
 		},
 		{
 			name:             "yaml config should contain ipv4-primary dual-stack config and correct excluded subnets",
 			infraBuilder:     newVsphereInfraBuilder().withVSphereDefaultNodeNetworking().withPrimaryIPv4VIP(),
 			networkBuilder:   withDualStackPrimaryIPv4NetworkConfig(),
 			inputConfig:      yamlConfig,
 			equivalentConfig: yamlConfigNodeNetworkingDualStackPrimaryIPv4,
+			features:         featuregates.NewFeatureGate(nil, nil),
 		},
 		{
 			name:             "yaml config should contain ipv6-primary dual-stack config and correct excluded subnets",
 			infraBuilder:     newVsphereInfraBuilder().withVSphereDefaultNodeNetworking().withPrimaryIPv6VIP(),
 			networkBuilder:   withDualStackPrimaryIPv6NetworkConfig(),
 			inputConfig:      yamlConfig,
 			equivalentConfig: yamlConfigNodeNetworkingDualStackPrimaryIPv6,
+			features:         featuregates.NewFeatureGate(nil, nil),
 		},
 		{
 			name:             "yaml config should contain ipv6-only config and correct excluded subnets",
 			infraBuilder:     newVsphereInfraBuilder().withVSphereIPv6onlyNodeNetworking().withIPv6onlyVIP(),
 			networkBuilder:   withIPv6onlyNetworkConfig(),
 			inputConfig:      yamlConfig,
 			equivalentConfig: yamlConfigNodeNetworkingIPv6only,
+			features:         featuregates.NewFeatureGate(nil, nil),
 		},
 		{
 			name:           "empty input",
 			infraBuilder:   newVsphereInfraBuilder(),
 			networkBuilder: makeDummyNetworkConfig(),
 			errMsg:         "failed to read the cloud.conf: vSphere config is empty",
+			features:       featuregates.NewFeatureGate(nil, nil),
 		},
 		{
 			name:           "incorrect platform",
 			infraBuilder:   newVsphereInfraBuilder().withPlatform(configv1.NonePlatformType),
 			networkBuilder: makeDummyNetworkConfig(),
 			errMsg:         "invalid platform, expected to be VSphere",
+			features:       featuregates.NewFeatureGate(nil, nil),
 		},
 		{
 			name:           "invalid ini input",
 			infraBuilder:   newVsphereInfraBuilder(),
 			networkBuilder: makeDummyNetworkConfig(),
 			inputConfig:    ":",
 			errMsg:         "failed to read the cloud.conf",
+			features:       featuregates.NewFeatureGate(nil, nil),
 		},
 	}
 
 	for _, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
 			g := gmg.NewWithT(t)
 			infraResouce := tc.infraBuilder.Build()
-			transformedConfig, err := CloudConfigTransformer(tc.inputConfig, infraResouce, tc.networkBuilder)
+			transformedConfig, err := CloudConfigTransformer(tc.inputConfig, infraResouce, tc.networkBuilder, tc.features)
 			if tc.errMsg != "" {
 				g.Expect(err).To(gmg.MatchError(gmg.ContainSubstring(tc.errMsg)))
 				return

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import (`
`20`	`20`
`21`	`21`	`"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/cloud/common"`
`22`	`22`	`"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"`
	`23`	`+ "github.com/openshift/library-go/pkg/operator/configobserver/featuregates"`
`23`	`24`	`)`
`24`	`25`
`25`	`26`	`const providerName = "azure"`
`@@ -136,7 +137,7 @@ func IsAzure(infra *configv1.Infrastructure) bool {`
`136`	`137`	`return false`
`137`	`138`	`}`
`138`	`139`
`139`		`-func CloudConfigTransformer(source string, infra configv1.Infrastructure, network configv1.Network) (string, error) {`
	`140`	`+func CloudConfigTransformer(source string, infra configv1.Infrastructure, network configv1.Network, features featuregates.FeatureGate) (string, error) {`
`140`	`141`	`if !IsAzure(infra) {`
`141`	`142`	`return "", fmt.Errorf("invalid platform, expected CloudName to be %s", configv1.AzurePublicCloud)`
`142`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import (`
`15`	`15`
`16`	`16`	`"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/cloud/common"`
`17`	`17`	`"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"`
	`18`	`+ "github.com/openshift/library-go/pkg/operator/configobserver/featuregates"`
`18`	`19`	`)`
`19`	`20`
`20`	`21`	`const providerName = "azurestack"`
`@@ -104,7 +105,7 @@ func IsAzureStackHub(platformStatus *configv1.PlatformStatus) bool {`
`104`	`105`	`// modifies it to be compatible with the external cloud provider. It returns`
`105`	`106`	`// an error if the platform is not OpenStackPlatformType or if any errors are`
`106`	`107`	`// encountered while attempting to rework the configuration.`
`107`		`-func CloudConfigTransformer(source string, infra configv1.Infrastructure, network configv1.Network) (string, error) {`
	`108`	`+func CloudConfigTransformer(source string, infra configv1.Infrastructure, network configv1.Network, features featuregates.FeatureGate) (string, error) {`
`108`	`109`	`if !IsAzureStackHub(infra.Status.PlatformStatus) {`
`109`	`110`	`return "", fmt.Errorf("invalid platform, expected CloudName to be %s", configv1.AzureStackCloud)`
`110`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,12 @@ package common`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`configv1 "github.com/openshift/api/config/v1"`
	`5`	`+`
	`6`	`+ "github.com/openshift/library-go/pkg/operator/configobserver/featuregates"`
`5`	`7`	`)`
`6`	`8`
`7`	`9`	`// NoOpTransformer implements the cloudConfigTransformer. It makes no changes`
`8`	`10`	`// to the source configuration and simply returns it as-is.`
`9`		`-func NoOpTransformer(source string, infra configv1.Infrastructure, network configv1.Network) (string, error) {`
	`11`	`+func NoOpTransformer(source string, infra configv1.Infrastructure, network configv1.Network, features featuregates.FeatureGate) (string, error) {`
`10`	`12`	`return source, nil`
`11`	`13`	`}`