Add Version field to ETCDSnapshotRestoreSpec

Signed-off-by: Vatsal Parekh <[email protected]>
rancher · Dec 4, 2024 · d57df2a · d57df2a
1 parent 5662135
commit d57df2a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/charts/rancher-turtles/templates/rancher-turtles-exp-etcdrestore-components.yaml b/charts/rancher-turtles/templates/rancher-turtles-exp-etcdrestore-components.yaml
@@ -49,6 +49,8 @@ spec:
                 type: string
               machineName:
                 type: string
+              version:
+                type: string
             required:
             - clusterName
             type: object

diff --git a/exp/etcdrestore/api/v1alpha1/etcdmachinesnapshot_types.go b/exp/etcdrestore/api/v1alpha1/etcdmachinesnapshot_types.go
@@ -46,6 +46,7 @@ type ETCDMachineSnapshotSpec struct {
 	ClusterName string `json:"clusterName"`
 	MachineName string `json:"machineName,omitempty"`
 	Location    string `json:"location,omitempty"`
+	Version     string `json:"version,omitempty"`
 }
 
 // EtcdSnapshotRestoreStatus defines observed state of EtcdSnapshotRestore

diff --git a/exp/etcdrestore/config/crd/bases/turtles-capi.cattle.io_etcdmachinesnapshots.yaml b/exp/etcdrestore/config/crd/bases/turtles-capi.cattle.io_etcdmachinesnapshots.yaml
@@ -46,6 +46,8 @@ spec:
                 type: string
               machineName:
                 type: string
+              version:
+                type: string
             required:
             - clusterName
             type: object

diff --git a/exp/etcdrestore/controllers/etcdmachinesnapshot_controller.go b/exp/etcdrestore/controllers/etcdmachinesnapshot_controller.go
@@ -190,6 +190,10 @@ func (r *ETCDMachineSnapshotReconciler) reconcileNormal(
 		// Initial phase, set to Pending
 		etcdMachineSnapshot.Status.Phase = snapshotrestorev1.ETCDSnapshotPhasePending
 
+		log.Info("\n\n\nCluster version is: %v\n\n\n", scope.cluster.Spec.Topology.Version)
+		// Set the Version field as k8s version of the cluster
+		//etcdMachineSnapshot.Spec.Version = scope.cluster.Spec.Topology.Version
+
 		return ctrl.Result{}, nil
 	case snapshotrestorev1.ETCDSnapshotPhasePending, snapshotrestorev1.ETCDSnapshotPhasePlanning:
 		// Transition to Running