Support for attaching multiple networks to a vApp

cmd/conformance-tester/pkg/scenarios/vmware_cloud_director.go

@@ -71,6 +71,7 @@ func (s *vmwareCloudDirectorScenario) Cluster(secrets types.Secrets) *kubermatic
 				Organization: secrets.VMwareCloudDirector.Organization,
 				VDC:          secrets.VMwareCloudDirector.VDC,
 				OVDCNetwork:  secrets.VMwareCloudDirector.OVDCNetwork,
+				OVDCNetworks: secrets.VMwareCloudDirector.OVDCNetworks,
 				CSI: &kubermaticv1.VMwareCloudDirectorCSIConfig{
 					StorageProfile: vmwareCloudDirectorStorageProfile,
 				},

cmd/conformance-tester/pkg/types/secrets.go

@@ -106,6 +106,7 @@ type Secrets struct {
 		Organization  string
 		VDC           string
 		OVDCNetwork   string
+		OVDCNetworks  []string
 	}
 	RHEL struct {
 		SubscriptionUser     string

pkg/apis/kubermatic/v1/cluster.go

@@ -1190,7 +1190,11 @@ type VMwareCloudDirectorCloudSpec struct {
 	VDC string `json:"vdc,omitempty"`
 
 	// The name of organizational virtual data center network that will be associated with the VMs and vApp.
-	OVDCNetwork string `json:"ovdcNetwork"`
+	// Deprecated: OVDCNetwork has been deprecated starting with KKP 2.25 and will be removed in KKP 2.27+. It is recommended to use OVDCNetworks instead.
+	OVDCNetwork string `json:"ovdcNetwork,omitempty"`
+
+	// OVDCNetworks is the list of organizational virtual data center networks that will be attached to the vApp and can be consumed the VMs.
+	OVDCNetworks []string `json:"ovdcNetworks,omitempty"`
 
 	// VApp used for isolation of VMs and their associated network
 	// +optional

pkg/apis/kubermatic/v1/preset.go

@@ -242,7 +242,10 @@ type VMwareCloudDirector struct {
 	// The name of organization to use.
 	Organization string `json:"organization"`
 	// The name of organizational virtual data center network that will be associated with the VMs and vApp.
-	OVDCNetwork string `json:"ovdcNetwork"`
+	// Deprecated: OVDCNetwork has been deprecated starting with KKP 2.25 and will be removed in KKP 2.27+. It is recommended to use OVDCNetworks instead.
+	OVDCNetwork string `json:"ovdcNetwork,omitempty"`
+	// OVDCNetworks is the list of organizational virtual data center networks that will be attached to the vApp and can be consumed the VMs.
+	OVDCNetworks []string `json:"ovdcNetworks,omitempty"`
 }
 
 func (s VMwareCloudDirector) IsValid() bool {

pkg/crd/k8c.io/kubermatic.k8c.io_clusters.yaml

@@ -912,8 +912,13 @@ spec:
                           description: The name of organization to use.
                           type: string
                         ovdcNetwork:
-                          description: The name of organizational virtual data center network that will be associated with the VMs and vApp.
+                          description: 'The name of organizational virtual data center network that will be associated with the VMs and vApp. Deprecated: OVDCNetwork has been deprecated starting with KKP 2.25 and will be removed in KKP 2.27+. It is recommended to use OVDCNetworks instead.'
                           type: string
+                        ovdcNetworks:
+                          description: OVDCNetworks is the list of organizational virtual data center networks that will be attached to the vApp and can be consumed the VMs.
+                          items:
+                            type: string
+                          type: array
                         password:
                           description: The VMware Cloud Director user password.
                           type: string
@@ -928,7 +933,6 @@ spec:
                           type: string
                       required:
                         - csi
-                        - ovdcNetwork
                       type: object
                     vsphere:
                       description: VSphere defines the configuration data of the vSphere.

pkg/crd/k8c.io/kubermatic.k8c.io_clustertemplates.yaml

@@ -907,8 +907,13 @@ spec:
                           description: The name of organization to use.
                           type: string
                         ovdcNetwork:
-                          description: The name of organizational virtual data center network that will be associated with the VMs and vApp.
+                          description: 'The name of organizational virtual data center network that will be associated with the VMs and vApp. Deprecated: OVDCNetwork has been deprecated starting with KKP 2.25 and will be removed in KKP 2.27+. It is recommended to use OVDCNetworks instead.'
                           type: string
+                        ovdcNetworks:
+                          description: OVDCNetworks is the list of organizational virtual data center networks that will be attached to the vApp and can be consumed the VMs.
+                          items:
+                            type: string
+                          type: array
                         password:
                           description: The VMware Cloud Director user password.
                           type: string
@@ -923,7 +928,6 @@ spec:
                           type: string
                       required:
                         - csi
-                        - ovdcNetwork
                       type: object
                     vsphere:
                       description: VSphere defines the configuration data of the vSphere.

pkg/crd/k8c.io/kubermatic.k8c.io_presets.yaml

@@ -435,8 +435,13 @@ spec:
                       description: The name of organization to use.
                       type: string
                     ovdcNetwork:
-                      description: The name of organizational virtual data center network that will be associated with the VMs and vApp.
+                      description: 'The name of organizational virtual data center network that will be associated with the VMs and vApp. Deprecated: OVDCNetwork has been deprecated starting with KKP 2.25 and will be removed in KKP 2.27+. It is recommended to use OVDCNetworks instead.'
                       type: string
+                    ovdcNetworks:
+                      description: OVDCNetworks is the list of organizational virtual data center networks that will be attached to the vApp and can be consumed the VMs.
+                      items:
+                        type: string
+                      type: array
                     password:
                       description: The VMware Cloud Director user password.
                       type: string
@@ -448,7 +453,6 @@ spec:
                       type: string
                   required:
                     - organization
-                    - ovdcNetwork
                     - vdc
                   type: object
                 vsphere:

pkg/machine/provider/vmware_cloud_director.go

@@ -116,7 +116,12 @@ func CompleteVMwareCloudDirectorProviderSpec(config *vmwareclouddirector.RawConf
 		}
 
 		if config.Network.Value == "" {
-			config.Network.Value = cluster.Spec.Cloud.VMwareCloudDirector.OVDCNetwork
+			if len(cluster.Spec.Cloud.VMwareCloudDirector.OVDCNetworks) > 0 {
+				// As a default, we attach the first network to the VMs.
+				config.Network.Value = cluster.Spec.Cloud.VMwareCloudDirector.OVDCNetworks[0]
+			} else if cluster.Spec.Cloud.VMwareCloudDirector.OVDCNetwork != "" {
+				config.Network.Value = cluster.Spec.Cloud.VMwareCloudDirector.OVDCNetwork
+			}
 		}
 	}
 

pkg/provider/cloud/vmwareclouddirector/helper.go

@@ -20,6 +20,8 @@ import (
 	"fmt"
 
 	"github.com/vmware/go-vcloud-director/v2/govcd"
+
+	kubermaticv1 "k8c.io/kubermatic/v2/pkg/apis/kubermatic/v1"
 )
 
 func deleteVApp(vdc *govcd.Vdc, vapp *govcd.VApp) error {
@@ -42,3 +44,23 @@ func deleteVApp(vdc *govcd.Vdc, vapp *govcd.VApp) error {
 	}
 	return nil
 }
+
+func getOrgVDCNetworks(vdc *govcd.Vdc, spec kubermaticv1.VMwareCloudDirectorCloudSpec) ([]*govcd.OrgVDCNetwork, error) {
+	var networks []string
+
+	if spec.OVDCNetworks != nil && len(spec.OVDCNetworks) > 0 {
+		networks = spec.OVDCNetworks
+	} else {
+		networks = []string{spec.OVDCNetwork}
+	}
+
+	orgVDCNetworks := make([]*govcd.OrgVDCNetwork, 0, len(networks))
+	for _, network := range networks {
+		orgVDCNetwork, err := vdc.GetOrgVdcNetworkByNameOrId(network, true)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get OrgVDCNetwork '%s': %w", network, err)
+		}
+		orgVDCNetworks = append(orgVDCNetworks, orgVDCNetwork)
+	}
+	return orgVDCNetworks, nil
+}

pkg/provider/cloud/vmwareclouddirector/provider.go

@@ -87,10 +87,10 @@ func (p *Provider) ValidateCloudSpec(_ context.Context, spec kubermaticv1.CloudS
 	}
 
 	// Ensure that the network exists
-	if spec.VMwareCloudDirector.OVDCNetwork != "" {
-		_, err := vdc.GetOrgVdcNetworkByNameOrId(spec.VMwareCloudDirector.OVDCNetwork, true)
+	if spec.VMwareCloudDirector.OVDCNetwork != "" || spec.VMwareCloudDirector.OVDCNetworks != nil {
+		_, err := getOrgVDCNetworks(vdc, *spec.VMwareCloudDirector)
 		if err != nil {
-			return fmt.Errorf("failed to get organization VDC network '%s': %w", client.Auth.VDC, err)
+			return fmt.Errorf("failed to get organization VDC networks '%s': %w", client.Auth.VDC, err)
 		}
 	}
 
@@ -160,6 +160,13 @@ func (p *Provider) ValidateCloudSpecUpdate(_ context.Context, oldSpec kubermatic
 	if oldSpec.VMwareCloudDirector.OVDCNetwork != newSpec.VMwareCloudDirector.OVDCNetwork {
 		return fmt.Errorf("updating VMware Cloud Director OVDCNetwork is not supported (was %s, updated to %s)", oldSpec.VMwareCloudDirector.OVDCNetwork, newSpec.VMwareCloudDirector.OVDCNetwork)
 	}
+
+	if oldSpec.VMwareCloudDirector.OVDCNetworks != nil && newSpec.VMwareCloudDirector.OVDCNetworks != nil {
+		if len(oldSpec.VMwareCloudDirector.OVDCNetworks) != len(newSpec.VMwareCloudDirector.OVDCNetworks) {
+			return fmt.Errorf("updating VMware Cloud Director OVDCNetworks is not supported (was %v, updated to %v)", oldSpec.VMwareCloudDirector.OVDCNetworks, newSpec.VMwareCloudDirector.OVDCNetworks)
+		}
+	}
+
 	return nil
 }
 

pkg/provider/cloud/vmwareclouddirector/reconcile.go

@@ -72,32 +72,43 @@ func reconcileVApp(ctx context.Context, cluster *kubermaticv1.Cluster, update pr
 func reconcileNetwork(ctx context.Context, cluster *kubermaticv1.Cluster, update provider.ClusterUpdater, vdc *govcd.Vdc) (*kubermaticv1.Cluster, error) {
 	var err error
 
-	// Ensure that ovdc network is attached to the vApp
-	ovdcNetwork, err := vdc.GetOrgVdcNetworkByNameOrId(cluster.Spec.Cloud.VMwareCloudDirector.OVDCNetwork, true)
+	// Ensure that all the ovdc networks are attached to the vApp
+	ovdcNetworks, err := getOrgVDCNetworks(vdc, *cluster.Spec.Cloud.VMwareCloudDirector)
 	if err != nil {
-		return nil, fmt.Errorf("failed to get organization VDC network '%s': %w", cluster.Spec.Cloud.VMwareCloudDirector.OVDCNetwork, err)
+		return nil, fmt.Errorf("failed to get organization VDC networks: %w", err)
 	}
 
-	// Check if the network is already present in vApp
+	for _, ovdcNetwork := range ovdcNetworks {
+		if err := reconcileNetworkForVApp(ctx, cluster, update, vdc, ovdcNetwork); err != nil {
+			return nil, fmt.Errorf("failed to reconcile network for vApp: %w", err)
+		}
+	}
+
+	return cluster, nil
+}
+
+func reconcileNetworkForVApp(ctx context.Context, cluster *kubermaticv1.Cluster, update provider.ClusterUpdater, vdc *govcd.Vdc, network *govcd.OrgVDCNetwork) error {
+	// Check if the network is already present in vApp.
 	vApp, err := vdc.GetVAppByNameOrId(cluster.Spec.Cloud.VMwareCloudDirector.VApp, true)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	exists := false
 	if vApp.VApp.NetworkConfigSection != nil && vApp.VApp.NetworkConfigSection.NetworkConfig != nil {
 		for _, net := range vApp.VApp.NetworkConfigSection.NetworkNames() {
-			if net == ovdcNetwork.OrgVDCNetwork.Name {
+			if net == network.OrgVDCNetwork.Name {
 				exists = true
 			}
 		}
 	}
 
 	// We need to attach the network to vApp
 	if !exists {
-		if _, err := vApp.AddOrgNetwork(&govcd.VappNetworkSettings{}, ovdcNetwork.OrgVDCNetwork, false); err != nil {
-			return nil, fmt.Errorf("failed to attach organization VDC network '%s' to vApp '%s': %w", ovdcNetwork.OrgVDCNetwork.Name, cluster.Spec.Cloud.VMwareCloudDirector.VApp, err)
+		if _, err := vApp.AddOrgNetwork(&govcd.VappNetworkSettings{}, network.OrgVDCNetwork, false); err != nil {
+			return fmt.Errorf("failed to attach organization VDC network '%s' to vApp '%s': %w", network.OrgVDCNetwork.Name, cluster.Spec.Cloud.VMwareCloudDirector.VApp, err)
 		}
 	}
-	return cluster, nil
+
+	return nil
 }

pkg/resources/test/load_files_test.go

@@ -160,6 +160,7 @@ var (
 				Organization: "vcd-organization",
 				VDC:          "vcd-vdc",
 				OVDCNetwork:  "vcd-ovdc-network",
+				OVDCNetworks: []string{"vcd-ovdc-network1", "vcd-ovdc-network2"},
 				VApp:         "vcd-vapp",
 			},
 		},

pkg/validation/cluster.go

@@ -951,6 +951,12 @@ func validateVMwareCloudDirectorCloudSpec(spec *kubermaticv1.VMwareCloudDirector
 		}
 	}
 
+	if spec.OVDCNetwork == "" && len(spec.OVDCNetworks) == 0 {
+		return errors.New("one of ovdcNetwork or ovdcNetworks needs to be specified")
+	} else if spec.OVDCNetwork != "" && len(spec.OVDCNetworks) > 0 {
+		return errors.New("ovdcNetwork and ovdcNetworks cannot be set at the same time")
+	}
+
 	return nil
 }