From a2c0b6a06efcee5259999a69ad6c449710a72377 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Wed, 31 Aug 2022 02:27:45 +0200
Subject: kubernetes/emc: cosmetic change

---
 inventory/group_vars/k8s-emc/vars.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'inventory/group_vars')

diff --git a/inventory/group_vars/k8s-emc/vars.yml b/inventory/group_vars/k8s-emc/vars.yml
index 650092e6..49225f74 100644
--- a/inventory/group_vars/k8s-emc/vars.yml
+++ b/inventory/group_vars/k8s-emc/vars.yml
@@ -53,12 +53,8 @@ kubernetes_overlay_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.po
 kubernetes_metrics_server_version: 0.6.1
 
 kubernetes_openebs_zfs_version: 2.1.0
-kubernetes_openebs_zfs_node_affinity:
-  requiredDuringSchedulingIgnoredDuringExecution:
-    nodeSelectorTerms:
-    - matchExpressions:
-      - key: streaming.spreadspace.org/recorder
-        operator: Exists
+kubernetes_openebs_zfs_node_selector:
+  "feature.node.kubernetes.io/storage-zfs": "true"
 kubernetes_openebs_zfs_storage_classes:
   zfs-storage:
     allowVolumeExpansion: yes
@@ -80,6 +76,13 @@ kubernetes_node_feature_discovery_worker_config: |
     pci:
       deviceClassWhitelist: ["03", "0b40", "12", "0400"]
     custom:
+    - name: "storage.zfs"
+      labels:
+        "feature.node.kubernetes.io/storage-zfs": "true"
+      matchFeatures:
+      - feature: kernel.loadedmodule
+        matchExpressions:
+          zfs: {op: Exists}
     - name: "intel.gpu"
       labels:
         "intel.feature.node.kubernetes.io/gpu": "true"
-- 
cgit v1.2.3