Added vsphere yaml cloud config support.

vr4manta · vr4manta · commit 1deb25dd97b6 · 2024-05-30T07:31:39.000-04:00
Updates
diff --git a/pkg/controller/vsphere/actuator_test.go b/pkg/controller/vsphere/actuator_test.go
@@ -115,9 +115,10 @@ func TestMachineEvents(t *testing.T) {
 		g.Expect(k8sClient.Delete(context.Background(), testNamespace)).To(Succeed())
 	}()
 
+	credentialsSecretName := "test"
 	credentialsSecret := corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test",
+			Name:      credentialsSecretName,
 			Namespace: testNamespaceName,
 		},
 		Data: map[string][]byte{
@@ -131,7 +132,7 @@ func TestMachineEvents(t *testing.T) {
 		g.Expect(k8sClient.Delete(context.Background(), &credentialsSecret)).To(Succeed())
 	}()
 
-	testConfig := fmt.Sprintf(testConfigFmt, port)
+	testConfig := fmt.Sprintf(testConfigFmt, port, credentialsSecretName, testNamespaceName)
 	configMap := &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "testname",
diff --git a/pkg/controller/vsphere/machine_scope.go b/pkg/controller/vsphere/machine_scope.go
@@ -11,6 +11,7 @@ import (
 	apicorev1 "k8s.io/api/core/v1"
 	apimachineryerrors "k8s.io/apimachinery/pkg/api/errors"
 	apimachineryutilerrors "k8s.io/apimachinery/pkg/util/errors"
+	vsphere "k8s.io/cloud-provider-vsphere/pkg/common/config"
 	"k8s.io/klog/v2"
 	runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
 )
@@ -39,7 +40,7 @@ type machineScope struct {
 	// client reader that bypasses the manager's cache
 	apiReader runtimeclient.Reader
 	// vSphere cloud-provider config
-	vSphereConfig *vSphereConfig
+	vSphereConfig *vsphere.Config
 	// machine resource
 	machine                    *machinev1.Machine
 	providerSpec               *machinev1.VSphereMachineProviderSpec
@@ -78,10 +79,10 @@ func newMachineScope(params machineScopeParams) (*machineScope, error) {
 		return nil, fmt.Errorf("%v: no workspace provided", params.machine.GetName())
 	}
 
-	server := fmt.Sprintf("%s:%s", providerSpec.Workspace.Server, getPortFromConfig(vSphereConfig))
+	server := fmt.Sprintf("%s:%s", providerSpec.Workspace.Server, getVCenterPortFromConfig(vSphereConfig, providerSpec.Workspace.Server))
 	authSession, err := session.GetOrCreate(params.Context,
 		server, providerSpec.Workspace.Datacenter,
-		user, password, getInsecureFlagFromConfig(vSphereConfig))
+		user, password, getVCenterInsecureFlagFromConfig(vSphereConfig, providerSpec.Workspace.Server))
 	if err != nil {
 		return nil, fmt.Errorf("failed to create vSphere session: %w", err)
 	}
diff --git a/pkg/controller/vsphere/machine_scope_test.go b/pkg/controller/vsphere/machine_scope_test.go
@@ -335,9 +335,10 @@ func TestPatchMachine(t *testing.T) {
 		g.Expect(k8sClient.Delete(ctx, testNamespace)).To(Succeed())
 	}()
 
+	credentialsSecretName := "test"
 	credentialsSecret := &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test",
+			Name:      credentialsSecretName,
 			Namespace: testNamespaceName,
 		},
 		Data: map[string][]byte{
@@ -351,7 +352,7 @@ func TestPatchMachine(t *testing.T) {
 		g.Expect(k8sClient.Delete(ctx, credentialsSecret)).To(Succeed())
 	}()
 
-	testConfig := fmt.Sprintf(testConfigFmt, port)
+	testConfig := fmt.Sprintf(testConfigFmt, port, credentialsSecretName, testNamespaceName)
 	configMap := &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "testname",
diff --git a/pkg/controller/vsphere/reconciler_test.go b/pkg/controller/vsphere/reconciler_test.go
@@ -39,6 +39,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apimachinerytypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
+	vsphere "k8s.io/cloud-provider-vsphere/pkg/common/config"
 	runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
@@ -1763,9 +1764,10 @@ func TestDelete(t *testing.T) {
 
 		password, _ := server.URL.User.Password()
 
+		credentialsSecretName := "test"
 		secret := &corev1.Secret{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "test",
+				Name:      credentialsSecretName,
 				Namespace: ns,
 			},
 			Data: map[string][]byte{
@@ -1774,7 +1776,7 @@ func TestDelete(t *testing.T) {
 			},
 		}
 
-		testConfig := fmt.Sprintf(testConfigFmt, port)
+		testConfig := fmt.Sprintf(testConfigFmt, port, credentialsSecretName, ns)
 		configMap := &corev1.ConfigMap{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      "testName",
@@ -2272,9 +2274,10 @@ func TestCreate(t *testing.T) {
 	vm.Name = vmName
 	vm.Config.Version = minimumHWVersionString
 
+	credentialsSecretName := "test"
 	credentialsSecret := &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test",
+			Name:      credentialsSecretName,
 			Namespace: namespace,
 		},
 		Data: map[string][]byte{
@@ -2283,7 +2286,7 @@ func TestCreate(t *testing.T) {
 		},
 	}
 
-	testConfig := fmt.Sprintf(testConfigFmt, port)
+	testConfig := fmt.Sprintf(testConfigFmt, port, credentialsSecretName, namespace)
 	configMap := &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "testName",
@@ -2687,9 +2690,10 @@ func TestUpdate(t *testing.T) {
 	instanceUUID := "a5764857-ae35-34dc-8f25-a9c9e73aa898"
 	vm.Config.InstanceUuid = instanceUUID
 
+	credentialsSecretName := "test"
 	credentialsSecret := &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test",
+			Name:      credentialsSecretName,
 			Namespace: namespace,
 		},
 		Data: map[string][]byte{
@@ -2698,7 +2702,7 @@ func TestUpdate(t *testing.T) {
 		},
 	}
 
-	testConfig := fmt.Sprintf(testConfigFmt, port)
+	testConfig := fmt.Sprintf(testConfigFmt, port, credentialsSecretName, namespace)
 	configMap := &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "testName",
@@ -3019,8 +3023,8 @@ func TestReconcileMachineWithCloudState(t *testing.T) {
 		providerStatus: &machinev1.VSphereMachineProviderStatus{
 			TaskRef: task.Reference().Value,
 		},
-		vSphereConfig: &vSphereConfig{
-			Labels: Labels{
+		vSphereConfig: &vsphere.Config{
+			Labels: vsphere.Labels{
 				Zone:   zoneKey,
 				Region: regionKey,
 			},
diff --git a/pkg/controller/vsphere/util.go b/pkg/controller/vsphere/util.go
@@ -8,14 +8,13 @@ import (
 	"net/http"
 	"strings"
 
-	"gopkg.in/gcfg.v1"
-
 	configv1 "github.com/openshift/api/config/v1"
 	machinev1 "github.com/openshift/api/machine/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/runtime"
+	vsphere "k8s.io/cloud-provider-vsphere/pkg/common/config"
 	"k8s.io/klog/v2"
 	runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
 )
@@ -25,35 +24,6 @@ const (
 	OpenshiftConfigNamespace = "openshift-config"
 )
 
-// vSphereConfig is a copy of the Kubernetes vSphere cloud provider config type
-// that contains the fields we need.  Unfortunately, we can't easily import
-// either the legacy or newer cloud provider code here, so we're just
-// duplicating part of the type and parsing it ourselves using the same gcfg
-// library for now.
-type vSphereConfig struct {
-	// Global is the vSphere cloud provider's global configuration.
-	Labels Labels `gcfg:"Labels"`
-	// Global is the vSphere cloud provider's global configuration.
-	Global Global `gcfg:"Global"`
-}
-
-// Labels is the vSphere cloud provider's zone and region configuration.
-type Labels struct {
-	// Zone is the zone in which VMs are created/located.
-	Zone string `gcfg:"zone"`
-	// Region is the region in which VMs are created/located.
-	Region string `gcfg:"region"`
-}
-
-// Global is the vSphere cloud provider's global configuration.
-type Global struct {
-	// Port is the port on which the vSphere endpoint is listening.
-	// Defaults to 443.
-	// Has string type because we need empty string value for formatting
-	Port         string `gcfg:"port"`
-	InsecureFlag string `gcfg:"insecure-flag"`
-}
-
 func getInfrastructure(c runtimeclient.Reader) (*configv1.Infrastructure, error) {
 	if c == nil {
 		return nil, errors.New("no API reader -- will not fetch infrastructure config")
@@ -69,7 +39,7 @@ func getInfrastructure(c runtimeclient.Reader) (*configv1.Infrastructure, error)
 	return infra, nil
 }
 
-func getVSphereConfig(c runtimeclient.Reader, configNamespace string) (*vSphereConfig, error) {
+func getVSphereConfig(c runtimeclient.Reader, configNamespace string) (*vsphere.Config, error) {
 	if c == nil {
 		return nil, errors.New("no API reader -- will not fetch vSphere config")
 	}
@@ -104,13 +74,7 @@ func getVSphereConfig(c runtimeclient.Reader, configNamespace string) (*vSphereC
 		)
 	}
 
-	var vcfg vSphereConfig
-
-	if err := gcfg.FatalOnly(gcfg.ReadStringInto(&vcfg, cloudConfig)); err != nil {
-		return nil, err
-	}
-
-	return &vcfg, nil
+	return vsphere.ReadConfig([]byte(cloudConfig))
 }
 
 func setConditions(condition metav1.Condition, conditions []metav1.Condition) []metav1.Condition {
@@ -169,18 +133,33 @@ func conditionFailed() metav1.Condition {
 	}
 }
 
-func getPortFromConfig(config *vSphereConfig) string {
+func getVCenterPortFromConfig(config *vsphere.Config, vcenter string) string {
 	if config != nil {
-		return config.Global.Port
+		for _, vc := range config.VirtualCenter {
+			if vc.VCenterIP == vcenter {
+				if len(vc.VCenterPort) > 0 {
+					return vc.VCenterPort
+				} else {
+					return config.Global.VCenterPort
+				}
+			}
+		}
 	}
 	return ""
 }
 
-// getInsecureFlagFromConfig get insecure flag from config and default to false
-func getInsecureFlagFromConfig(config *vSphereConfig) bool {
-	if config != nil && config.Global.InsecureFlag == "1" {
-		return true
+func getVCenterInsecureFlagFromConfig(config *vsphere.Config, vcenter string) bool {
+	if config != nil {
+		for _, vc := range config.VirtualCenter {
+			if vc.VCenterIP == vcenter {
+				return vc.InsecureFlag
+			}
+		}
+
+		// Either vCenter is not found or config is missing.
+		return config.Global.InsecureFlag
 	}
+
 	return false
 }
 
diff --git a/pkg/controller/vsphere/util_test.go b/pkg/controller/vsphere/util_test.go
@@ -15,20 +15,23 @@ const (
 	testRegion                      = "testRegion"
 	testZone                        = "testZone"
 	testPort                        = "443"
-	testInsecureFlag                = "1"
+	testInsecureFlag                = true
 	openshiftConfigNamespaceForTest = "openshift-config-test"
 	testConfigFmt                   = `
-    [Labels]
-		zone = "testZone"
-		region = "testRegion"
-		[Global]
-		port = %s
-		insecure-flag="1"
+[Labels]
+zone = "testZone"
+region = "testRegion"
+[VirtualCenter "127.0.0.1"]
+port = %s
+[Global]
+insecure-flag="1"
+secret-name = "%s"
+secret-namespace = "%s"
 `
 )
 
 func TestGetVSphereConfig(t *testing.T) {
-	testConfig := fmt.Sprintf(testConfigFmt, "443")
+	testConfig := fmt.Sprintf(testConfigFmt, "443", "test", "test-namespace")
 	configMap := &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "testName",
@@ -66,11 +69,11 @@ func TestGetVSphereConfig(t *testing.T) {
 		t.Errorf("Expected zone %s, got %s", testZone, vSphereConfig.Labels.Zone)
 	}
 
-	if vSphereConfig.Global.Port != testPort {
-		t.Errorf("Expected zone %s, got %s", testZone, vSphereConfig.Global.Port)
+	if vSphereConfig.Global.VCenterPort != testPort {
+		t.Errorf("Expected zone %s, got %s", testZone, vSphereConfig.Global.VCenterPort)
 	}
 
 	if vSphereConfig.Global.InsecureFlag != testInsecureFlag {
-		t.Errorf("Expected insecure flag %s, got %s", testInsecureFlag, vSphereConfig.Global.InsecureFlag)
+		t.Errorf("Expected insecure flag %t, got %t", testInsecureFlag, vSphereConfig.Global.InsecureFlag)
 	}
 }
