Implement cloud config parser and writer methods

Author: Danil-Grigorev

pkg/render/render.go

@@ -13,26 +13,21 @@ import (
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/substitution"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/klog"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 )
 
 const (
+	configDataKey      = "cloud.conf"
 	bootstrapNamespace = "kube-system"
 	bootstrapPrefix    = "bootstrap"
+	secretPrefix       = "secrets"
 	// bootstrapFileName is built from bootstrapPrefix, resource name and kind
 	bootstrapFileName = "%s/%s-%s.yaml"
 )
 
-var scheme *runtime.Scheme
-
-func init() {
-	scheme = runtime.NewScheme()
-}
-
 // Render defines render config for use in bootstrap mode
 type Render struct {
 	// path to rendered configv1.Infrastructure manifest
@@ -56,7 +51,7 @@ func New(infrastructureFile, imagesFile, cloudConfigFile string) *Render {
 // Run runs boostrap for Machine Config Controller
 // It writes all the assets to destDir
 func (r *Render) Run(destinationDir string) error {
-	infra, imagesMap, err := r.readAssets()
+	infra, imagesMap, cloudConfig, err := r.readAssets()
 	if err != nil {
 		klog.Errorf("Cannot read assets from provided paths: %v", err)
 		return err
@@ -74,36 +69,51 @@ func (r *Render) Run(destinationDir string) error {
 		klog.Infof("Collected resource %s %q successfully", resource.GetObjectKind().GroupVersionKind(), client.ObjectKeyFromObject(resource))
 	}
 
-	return writeAssets(destinationDir, resources)
+	if err := writeAssets(destinationDir, resources); err != nil {
+		klog.Errorf("Could not write assets to bootstrap dir: %v", err)
+		return err
+	}
+
+	return writeCloudConfig(destinationDir, cloudConfig)
 }
 
 // readAssets collects infrastructure resource and images config map from provided paths
-func (r *Render) readAssets() (*configv1.Infrastructure, *corev1.ConfigMap, error) {
+func (r *Render) readAssets() (*configv1.Infrastructure, *corev1.ConfigMap, string, error) {
 	infraData, err := ioutil.ReadFile(r.infrastructureFile)
 	if err != nil {
 		klog.Errorf("Unable to read data from %q: %v", r.infrastructureFile, err)
-		return nil, nil, err
+		return nil, nil, "", err
 	}
 
 	infra := &configv1.Infrastructure{}
 	if err := yaml.UnmarshalStrict(infraData, infra); err != nil {
 		klog.Errorf("Cannot decode data into configv1.Infrastructure from %q: %v", r.infrastructureFile, err)
-		return nil, nil, err
+		return nil, nil, "", err
 	}
 
 	imagesData, err := ioutil.ReadFile(r.imagesFile)
 	if err != nil {
 		klog.Errorf("Unable to read data from %q: %v", r.imagesFile, err)
-		return nil, nil, err
+		return nil, nil, "", err
 	}
 
 	imagesConfigMap := &corev1.ConfigMap{}
 	if err := yaml.UnmarshalStrict(imagesData, imagesConfigMap); err != nil {
 		klog.Errorf("Cannot decode data into v1.ConfigMap from %q: %v", r.imagesFile, err)
-		return nil, nil, err
+		return nil, nil, "", err
+	}
+
+	cloudConfig := ""
+	// if the cloudConfig is set in infra read the cloudConfigFile
+	if infra.Spec.CloudConfig.Name != "" {
+		cloudConfig, err = loadBootstrapCloudProviderConfig(infra, r.cloudConfigFile)
+		if err != nil {
+			klog.Errorf("failed to load the cloud provider config: %v", err)
+			return nil, nil, "", err
+		}
 	}
 
-	return infra, imagesConfigMap, nil
+	return infra, imagesConfigMap, cloudConfig, nil
 }
 
 // writeAssets writes static pods to disk into <destinationDir>/<bootstrapPrefix>/<resourceName>-<resourceKind>.yaml
@@ -129,5 +139,48 @@ func writeAssets(destinationDir string, resources []client.Object) error {
 			return err
 		}
 	}
+
 	return nil
 }
+
+// writeCloudConfig creates secrets folder and writes resources such as cloud-config file
+// for use in bootstrap
+func writeCloudConfig(destinationDir string, cloudConfig string) error {
+	// Create secrets directory in advance to ensure it is present for any provider
+	secretsDir := filepath.Join(destinationDir, secretPrefix)
+	if err := os.MkdirAll(secretsDir, fs.ModePerm); err != nil {
+		klog.Errorf("Unable to create destination dir %q: %v", secretsDir, err)
+		return err
+	}
+
+	if cloudConfig != "" {
+		cloudConfigFile := filepath.Join(secretsDir, configDataKey)
+
+		klog.Infof("Writing cloud config on disk in %q", cloudConfigFile)
+		err := os.WriteFile(cloudConfigFile, []byte(cloudConfig), 0666)
+		if err != nil {
+			klog.Errorf("Failed to write cloud config to disk in %q: %v", cloudConfigFile, err)
+			return err
+		}
+	}
+
+	return nil
+}
+
+// loadBootstrapCloudProviderConfig reads the cloud provider config from cloudConfigFile based on infra object.
+func loadBootstrapCloudProviderConfig(infra *configv1.Infrastructure, cloudConfigFile string) (string, error) {
+	data, err := os.ReadFile(cloudConfigFile)
+	if err != nil {
+		return "", err
+	}
+	cloudConfigMap := &corev1.ConfigMap{}
+	if err := yaml.UnmarshalStrict(data, cloudConfigMap); err != nil {
+		return "", err
+	}
+	cloudConf, ok := cloudConfigMap.Data[configDataKey]
+	if !ok {
+		klog.Infof("falling back to reading cloud provider config from user specified key %s", infra.Spec.CloudConfig.Key)
+		cloudConf = cloudConfigMap.Data[infra.Spec.CloudConfig.Key]
+	}
+	return cloudConf, nil
+}