Adds CloudConfigTransformer for Azure

This adds a CloudConfigTransformer for Azure that will set the VMType to
'standard' if unset.

See #291, OCPBUGS-25483 and OCPBUGS-20213 for more information.

Author: theobarberbany

pkg/cloud/azure/azure.go

@@ -2,12 +2,17 @@ package azure
 
 import (
 	"embed"
+	"encoding/json"
 	"fmt"
 
 	"github.com/asaskevich/govalidator"
+	configv1 "github.com/openshift/api/config/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	azureconsts "sigs.k8s.io/cloud-provider-azure/pkg/consts"
+	azure "sigs.k8s.io/cloud-provider-azure/pkg/provider"
+
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/cloud/common"
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"
 )
@@ -85,3 +90,23 @@ func NewProviderAssets(config config.OperatorConfig) (common.CloudProviderAssets
 	}
 	return assets, nil
 }
+
+func CloudConfigTransformer(source string, infra *configv1.Infrastructure, network *configv1.Network) (string, error) {
+	var cfg azure.Config
+	if err := json.Unmarshal([]byte(source), &cfg); err != nil {
+		return "", fmt.Errorf("failed to unmarshal the cloud.conf: %w", err)
+	}
+
+	// If the virtual machine type is not set we need to make sure it uses the
+	// "standard" instance type. See OCPBUGS-25483 and OCPBUGS-20213 for more
+	// information
+	if cfg.VMType == "" {
+		cfg.VMType = azureconsts.VMTypeStandard
+	}
+
+	cfgbytes, err := json.Marshal(cfg)
+	if err != nil {
+		return "", fmt.Errorf("failed to marshal the cloud.conf: %w", err)
+	}
+	return string(cfgbytes), nil
+}

pkg/cloud/cloud.go

@@ -53,7 +53,8 @@ func GetCloudConfigTransformer(platformStatus *configv1.PlatformStatus) (cloudCo
 		if azurestack.IsAzureStackHub(platformStatus) {
 			return azurestack.CloudConfigTransformer, true, nil
 		}
-		return nil, true, nil
+		// We need to use the azure CloudConfigTransformer to fix OCPBUGS-25483
+		return azure.CloudConfigTransformer, true, nil
 	case configv1.GCPPlatformType:
 		return common.NoOpTransformer, false, nil
 	case configv1.IBMCloudPlatformType:

pkg/controllers/cloud_config_sync_controller_test.go

@@ -68,14 +68,22 @@ func makeInfraCloudConfig() *corev1.ConfigMap {
 	return &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{
 		Name:      infraCloudConfName,
 		Namespace: OpenshiftConfigNamespace,
-	}, Data: map[string]string{infraCloudConfKey: "bar"}}
+	}, Data: map[string]string{infraCloudConfKey: `{
+    "cloud":"AzurePublicCloud",
+    "tenantId": "0000000-0000-0000-0000-000000000000",
+    "subscriptionId": "0000000-0000-0000-0000-000000000000"
+}`}}
 }
 
 func makeManagedCloudConfig() *corev1.ConfigMap {
 	return &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{
 		Name:      managedCloudConfigMapName,
 		Namespace: OpenshiftManagedConfigNamespace,
-	}, Data: map[string]string{"cloud.conf": "bar"}}
+	}, Data: map[string]string{"cloud.conf": `{
+    "cloud":"AzurePublicCloud",
+    "tenantId": "0000000-0000-0000-0000-000000000000",
+    "subscriptionId": "0000000-0000-0000-0000-000000000000"
+}`}}
 }
 
 var _ = Describe("isCloudConfigEqual reconciler method", func() {