VCDA-3502: Add parentUid and useAsManagementCluster support for v1bet…

…a1 VCDCluster (vmware#98) * Add 2 new fields to vcdcluster, renamed duplicate field in types Signed-off-by: lzichong <[email protected]> * Read new specs into RDE.Capvcd.Status, update new fields RDE reconcilation Signed-off-by: lzichong <[email protected]> * add default values from v1alpha1 to v1beta1, regenerated conversion gen Signed-off-by: lzichong <[email protected]> * Revert back to IsManagementCluster in types.go to match RDE schema Signed-off-by: lzichong <[email protected]> * Merged recent changes from main to resolve merge conflicts Signed-off-by: lzichong <[email protected]> * Addressed comments and added TODO to conversion Signed-off-by: lzichong <[email protected]> * Updated Status params with Spec, update RDE to match Status instead of Spec Signed-off-by: lzichong <[email protected]>
jjaferson · Apr 21, 2022 · 5e333c5 · 5e333c5
1 parent 6f041a9
commit 5e333c5
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 9 deletions.
diff --git a/api/v1alpha4/vcdcluster_conversion.go b/api/v1alpha4/vcdcluster_conversion.go
@@ -12,7 +12,10 @@ func (src *VCDCluster) ConvertTo(dstRaw conversion.Hub) error {
 		return err
 	}
 	dst.Spec.DefaultStorageClassOptions = &v1beta1.DefaultStorageClassOptions{}
-	dst.Spec.RDEId = ""
+	// TODO: Update the new params to match previous release's Status; ex) dst.Spec.* = src.Status.*, maybe RDE.Status
+	dst.Spec.RDEId = src.Status.InfraId
+	dst.Spec.ParentUID = ""
+	dst.Spec.UseAsManagementCluster = false // defaults to false
 	return nil
 }
 

diff --git a/api/v1alpha4/zz_generated.conversion.go b/api/v1alpha4/zz_generated.conversion.go
diff --git a/api/v1beta1/vcdcluster_types.go b/api/v1beta1/vcdcluster_types.go
@@ -74,6 +74,10 @@ type VCDClusterSpec struct {
 	DefaultComputePolicy string `json:"defaultComputePolicy,omitempty"`
 	// + optional
 	RDEId string `json:"rdeId,omitempty"`
+	// +optional
+	ParentUID string `json:"parentUid,omitempty"`
+	// +optional
+	UseAsManagementCluster bool `json:"useAsManagementCluster,omitempty"`
 }
 
 // VCDClusterStatus defines the observed state of VCDCluster
@@ -93,6 +97,10 @@ type VCDClusterStatus struct {
 	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
 	// +optional
 	InfraId string `json:"infraId,omitempty"`
+	// +optional
+	ParentUID string `json:"parentUid,omitempty"`
+	// +optional
+	UseAsManagementCluster bool `json:"useAsManagementCluster,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_vcdclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_vcdclusters.yaml
@@ -195,10 +195,14 @@ spec:
                 type: string
               ovdcNetwork:
                 type: string
+              parentUid:
+                type: string
               rdeId:
                 type: string
               site:
                 type: string
+              useAsManagementCluster:
+                type: boolean
               userContext:
                 properties:
                   password:
@@ -264,14 +268,18 @@ spec:
                 type: array
               infraId:
                 type: string
-              VAppMetadataUpdated:
-                description: MetadataUpdated denotes that the metadata of Vapp is
-                  updated.
-                type: boolean
+              parentUid:
+                type: string
               ready:
                 description: Ready denotes that the vcd cluster (infrastructure) is
                   ready.
                 type: boolean
+              useAsManagementCluster:
+                type: boolean
+              vappmetadataUpdated:
+                description: MetadataUpdated denotes that the metadata of Vapp is
+                  updated.
+                type: boolean
             required:
             - ready
             type: object

diff --git a/controllers/vcdcluster_controller.go b/controllers/vcdcluster_controller.go
@@ -239,9 +239,9 @@ func (r *VCDClusterReconciler) constructCapvcdRDE(ctx context.Context, cluster *
 				ApiEndpoints: []vcdtypes.ApiEndpoints{},
 			},
 			NodeStatus:          make(map[string]string),
-			IsManagementCluster: false,
+			IsManagementCluster: vcdCluster.Spec.UseAsManagementCluster,
 			CapvcdVersion:       r.Config.ClusterResources.CapvcdVersion,
-			ParentUID:           r.Config.ManagementClusterRDEId,
+			ParentUID:           vcdCluster.Spec.ParentUID,
 			Csi: vcdtypes.VersionedAddon{
 				Name:    VcdCsiName,
 				Version: r.Config.ClusterResources.CsiVersion, // TODO: get CPI, CNI, CSI versions from the CLusterResourceSet objects
@@ -394,6 +394,15 @@ func (r *VCDClusterReconciler) reconcileRDE(ctx context.Context, cluster *cluste
 	if capvcdEntity.Status.Phase != cluster.Status.Phase {
 		updatePatch["Status.Phase"] = cluster.Status.Phase
 	}
+
+	if capvcdEntity.Status.ParentUID != vcdCluster.Status.ParentUID {
+		updatePatch["Status.ParentUID"] = vcdCluster.Status.ParentUID
+	}
+
+	if capvcdEntity.Status.IsManagementCluster != vcdCluster.Status.UseAsManagementCluster {
+		updatePatch["Status.IsManagementCluster"] = vcdCluster.Status.UseAsManagementCluster
+	}
+
 	clusterApiStatusPhase := ClusterApiStatusPhaseNotReady
 	if cluster.Status.ControlPlaneReady {
 		clusterApiStatusPhase = ClusterApiStatusPhaseReady
@@ -551,6 +560,10 @@ func (r *VCDClusterReconciler) reconcileNormal(ctx context.Context, cluster *clu
 		workloadVCDClient.ClusterID = infraID
 	}
 
+	// After InfraId has been set, we can update parentUid, useAsMgmtCluster status
+	vcdCluster.Status.UseAsManagementCluster = vcdCluster.Spec.UseAsManagementCluster
+	vcdCluster.Status.ParentUID = vcdCluster.Spec.ParentUID
+
 	// create load balancer for the cluster. Only one-arm load balancer is fully tested.
 	virtualServiceNamePrefix := vcdCluster.Name + "-" + vcdCluster.Status.InfraId
 	lbPoolNamePrefix := vcdCluster.Name + "-" + vcdCluster.Status.InfraId