From 1a3e57cb8b56c4b7bd9ba7dbe4e4f673efef98f3 Mon Sep 17 00:00:00 2001
From: JJGadgets <git@jjgadgets.tech>
Date: Fri, 29 Dec 2023 09:54:23 +0800
Subject: [PATCH] fix(vm-ad): back to RBD

---
 .../deploy/core/storage/volsync/template/kustomization.yaml | 2 +-
 kube/deploy/vm/ad/ks.yaml                                   | 6 ------
 kube/deploy/vm/ad/template-dc/vm.yaml                       | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/kube/deploy/core/storage/volsync/template/kustomization.yaml b/kube/deploy/core/storage/volsync/template/kustomization.yaml
index cdb18b0b..887a53d8 100644
--- a/kube/deploy/core/storage/volsync/template/kustomization.yaml
+++ b/kube/deploy/core/storage/volsync/template/kustomization.yaml
@@ -2,7 +2,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  # - pvc.yaml
+  - pvc.yaml
   - secrets-restic.yaml
   - rdst.yaml
   - rsrc.yaml
diff --git a/kube/deploy/vm/ad/ks.yaml b/kube/deploy/vm/ad/ks.yaml
index 4cc7384d..0bc779c5 100644
--- a/kube/deploy/vm/ad/ks.yaml
+++ b/kube/deploy/vm/ad/ks.yaml
@@ -24,11 +24,8 @@ spec:
   postBuild:
     substitute:
       PVC: "vm-ad-dc1-c-drive"
-      SC: "file"
-      SNAP: "file"
       SIZE: "105Gi"
       VOLUMEMODE: "Filesystem"
-      ACCESSMODE: "ReadWriteMany"
       RUID: &uid "107"
       RGID: *uid
       RFSG: *uid
@@ -66,11 +63,8 @@ spec:
   postBuild:
     substitute:
       PVC: "vm-ad-dc2-c-drive"
-      SC: "file"
-      SNAP: "file"
       SIZE: "105Gi"
       VOLUMEMODE: "Filesystem"
-      ACCESSMODE: "ReadWriteMany"
       RUID: &uid "107"
       RGID: *uid
       RFSG: *uid
diff --git a/kube/deploy/vm/ad/template-dc/vm.yaml b/kube/deploy/vm/ad/template-dc/vm.yaml
index c6a32b4a..c077e0d6 100644
--- a/kube/deploy/vm/ad/template-dc/vm.yaml
+++ b/kube/deploy/vm/ad/template-dc/vm.yaml
@@ -19,7 +19,6 @@ spec:
         vm.home.arpa/ad: "dc${NUM}"
     spec:
       hostname: "thunder-dc${NUM}"
-      evictionStrategy: "LiveMigrate" # needs RWX PVC
       networks:
         - name: "main"
           pod: