fix: Use infraClient create DataVolume for external cluster

smartxworks · Apr 19, 2023 · ef6b2d6 · ef6b2d6
1 parent 8cac0f5
commit ef6b2d6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/controllers/virtinkmachine_controller.go b/controllers/virtinkmachine_controller.go
@@ -209,7 +209,7 @@ func (r *VirtinkMachineReconciler) reconcile(ctx context.Context, machine *infra
 			}
 			dataVolumeNotFound := false
 			createdDataVolume := cdiv1beta1.DataVolume{}
-			if err := r.Get(ctx, dataVolumeKey, &createdDataVolume); err != nil {
+			if err := infraClusterClient.Get(ctx, dataVolumeKey, &createdDataVolume); err != nil {
 				if !apierrors.IsNotFound(err) {
 					return fmt.Errorf("get DataVolume: %s", err)
 				}
@@ -222,7 +222,7 @@ func (r *VirtinkMachineReconciler) reconcile(ctx context.Context, machine *infra
 					Name:      dataVolume.Name,
 				}
 				var pvc corev1.PersistentVolumeClaim
-				if err := r.Get(ctx, pvcKey, &pvc); err != nil {
+				if err := infraClusterClient.Get(ctx, pvcKey, &pvc); err != nil {
 					if !apierrors.IsNotFound(err) {
 						return fmt.Errorf("get PVC: %s", err)
 					}

diff --git a/docs/external-cluster.md b/docs/external-cluster.md
@@ -52,6 +52,24 @@ subjects:
 EOF
 ```
 
+for creating a persistent cluster, should follow [Launching a Kubernetes cluster on Virtink with persistent storage](./../README.md) to make Virtink cluster meets the conditions, and add below rule to virtink-infra-cluster ClusterRole.
+
+```yaml
+rules:
+- apiGroups:
+  - cdi.kubevirt.io
+  resources:
+  - datavolumes
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+```
+
 Create a kubeconfig with API access control of the Virtink cluster.
 
 ```shell