refactor KubeVirt options parsing and add KubeVirt cloud config (kubermatic#1045)

Signed-off-by: Marcin Franczyk <[email protected]>

Author: mfranczy

pkg/cloudprovider/provider/kubevirt/provider.go

@@ -71,7 +71,8 @@ func New(configVarResolver *providerconfig.ConfigVarResolver) cloudprovidertypes
 }
 
 type Config struct {
-	Kubeconfig       rest.Config
+	Kubeconfig       string
+	RestConfig       *rest.Config
 	DNSConfig        *corev1.PodDNSConfig
 	DNSPolicy        corev1.DNSPolicy
 	CPUs             string
@@ -132,9 +133,9 @@ func (p *provider) getConfig(s v1alpha1.ProviderSpec) (*Config, *providerconfigt
 		return nil, nil, err
 	}
 	config := Config{}
-	configString, err := p.configVarResolver.GetConfigVarStringValueOrEnv(rawConfig.Kubeconfig, "KUBEVIRT_KUBECONFIG")
+	config.Kubeconfig, err = p.configVarResolver.GetConfigVarStringValueOrEnv(rawConfig.Kubeconfig, "KUBEVIRT_KUBECONFIG")
 	if err != nil {
-		return nil, nil, fmt.Errorf(`failed to get value of "config" field: %v`, err)
+		return nil, nil, fmt.Errorf(`failed to get value of "kubeconfig" field: %v`, err)
 	}
 	config.CPUs, err = p.configVarResolver.GetConfigVarStringValue(rawConfig.CPUs)
 	if err != nil {
@@ -163,11 +164,10 @@ func (p *provider) getConfig(s v1alpha1.ProviderSpec) (*Config, *providerconfigt
 	if err != nil {
 		return nil, nil, fmt.Errorf(`failed to get value of "storageClassName" field: %v`, err)
 	}
-	restConfig, err := clientcmd.RESTConfigFromKubeConfig([]byte(configString))
+	config.RestConfig, err = clientcmd.RESTConfigFromKubeConfig([]byte(config.Kubeconfig))
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to decode kubeconfig: %v", err)
 	}
-	config.Kubeconfig = *restConfig
 
 	dnsPolicyString, err := p.configVarResolver.GetConfigVarStringValue(rawConfig.DNSPolicy)
 	if err != nil {
@@ -194,7 +194,7 @@ func (p *provider) Get(machine *v1alpha1.Machine, _ *cloudprovidertypes.Provider
 			Message: fmt.Sprintf("Failed to parse MachineSpec, due to %v", err),
 		}
 	}
-	sigClient, err := client.New(&c.Kubeconfig, client.Options{})
+	sigClient, err := client.New(c.RestConfig, client.Options{})
 	if err != nil {
 		return nil, fmt.Errorf("failed to get kubevirt client: %v", err)
 	}
@@ -255,7 +255,7 @@ func (p *provider) Validate(spec v1alpha1.MachineSpec) error {
 	if _, err := parseResources(c.CPUs, c.Memory); err != nil {
 		return err
 	}
-	sigClient, err := client.New(&c.Kubeconfig, client.Options{})
+	sigClient, err := client.New(c.RestConfig, client.Options{})
 	if err != nil {
 		return fmt.Errorf("failed to get kubevirt client: %v", err)
 	}
@@ -281,7 +281,16 @@ func (p *provider) AddDefaults(spec v1alpha1.MachineSpec) (v1alpha1.MachineSpec,
 }
 
 func (p *provider) GetCloudConfig(spec v1alpha1.MachineSpec) (config string, name string, err error) {
-	return "", "", nil
+	c, _, err := p.getConfig(spec.ProviderSpec)
+	if err != nil {
+		return "", "", fmt.Errorf("failed to parse config: %v", err)
+	}
+	cc := kubevirttypes.CloudConfig{
+		Kubeconfig: c.Kubeconfig,
+	}
+	ccs, err := cc.String()
+
+	return ccs, string(providerconfigtypes.CloudProviderExternal), err
 }
 
 func (p *provider) MachineMetricsLabels(machine *v1alpha1.Machine) (map[string]string, error) {
@@ -425,7 +434,7 @@ func (p *provider) Create(machine *v1alpha1.Machine, _ *cloudprovidertypes.Provi
 		},
 	}
 
-	sigClient, err := client.New(&c.Kubeconfig, client.Options{})
+	sigClient, err := client.New(c.RestConfig, client.Options{})
 	if err != nil {
 		return nil, fmt.Errorf("failed to get kubevirt client: %v", err)
 	}
@@ -458,7 +467,7 @@ func (p *provider) Cleanup(machine *v1alpha1.Machine, _ *cloudprovidertypes.Prov
 			Message: fmt.Sprintf("Failed to parse MachineSpec, due to %v", err),
 		}
 	}
-	sigClient, err := client.New(&c.Kubeconfig, client.Options{})
+	sigClient, err := client.New(c.RestConfig, client.Options{})
 	if err != nil {
 		return false, fmt.Errorf("failed to get kubevirt client: %v", err)
 	}

pkg/cloudprovider/provider/kubevirt/types/cloudconfig.go

@@ -0,0 +1,34 @@
+/*
+Copyright 2021 The Machine Controller Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package types
+
+import (
+	"gopkg.in/yaml.v3"
+)
+
+type CloudConfig struct {
+	// Kubeconfig used to connect to the cluster that runs KubeVirt
+	Kubeconfig string `yaml:"kubeconfig"`
+}
+
+func (c *CloudConfig) String() (string, error) {
+	out, err := yaml.Marshal(c)
+	if err != nil {
+		return "", err
+	}
+	return string(out), nil
+}

pkg/providerconfig/types/types.go

@@ -59,6 +59,7 @@ const (
 	CloudProviderAnexia       CloudProvider = "anexia"
 	CloudProviderScaleway     CloudProvider = "scaleway"
 	CloudProviderBaremetal    CloudProvider = "baremetal"
+	CloudProviderExternal     CloudProvider = "external"
 )
 
 var (