From 2c124e618711bc7a393f2bbb5eaa015d5d6d5cdf Mon Sep 17 00:00:00 2001
From: JJGadgets <git@jjgadgets.tech>
Date: Sat, 12 Aug 2023 05:14:05 +0800
Subject: [PATCH] fix(democratic-csi): ZFS parent dataset overlap

---
 .../storage/democratic-csi/nas-zfs-local/app/dataset.yaml     | 2 +-
 .../core/storage/democratic-csi/nas-zfs-local/app/zvol.yaml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kube/deploy/core/storage/democratic-csi/nas-zfs-local/app/dataset.yaml b/kube/deploy/core/storage/democratic-csi/nas-zfs-local/app/dataset.yaml
index 57739ff9..129b88ef 100644
--- a/kube/deploy/core/storage/democratic-csi/nas-zfs-local/app/dataset.yaml
+++ b/kube/deploy/core/storage/democratic-csi/nas-zfs-local/app/dataset.yaml
@@ -68,7 +68,7 @@ spec:
         driver: zfs-local-dataset
         zfs:
           datasetParentName: bigsmoke/data
-          detachedSnapshotsDatasetParentName: bigsmoke/data/s
+          detachedSnapshotsDatasetParentName: bigsmoke/data-snap
           datasetProperties:
             recordsize: "1M"
             compression: "zstd-9"
diff --git a/kube/deploy/core/storage/democratic-csi/nas-zfs-local/app/zvol.yaml b/kube/deploy/core/storage/democratic-csi/nas-zfs-local/app/zvol.yaml
index f2a74bde..71691bae 100644
--- a/kube/deploy/core/storage/democratic-csi/nas-zfs-local/app/zvol.yaml
+++ b/kube/deploy/core/storage/democratic-csi/nas-zfs-local/app/zvol.yaml
@@ -67,8 +67,8 @@ spec:
       config:
         driver: zfs-local-zvol
         zfs:
-          datasetParentName: bigsmoke/vol
-          detachedSnapshotsDatasetParentName: bigsmoke/vol/s
+          datasetParentName: bigsmoke/zvol
+          detachedSnapshotsDatasetParentName: bigsmoke/zvol-snap
           datasetProperties:
             atime: "off"
           zvolCompression: "zstd-9"