From 6799d805d0c99a8350cef3af507a49ab9e3caeb2 Mon Sep 17 00:00:00 2001
From: Cooper Tseng <cooper.tseng@suse.com>
Date: Mon, 6 Jan 2025 12:50:08 +0800
Subject: [PATCH] Update testing nm charts

Signed-off-by: Cooper Tseng <cooper.tseng@suse.com>
---
 charts/harvester-node-manager/.helmignore     | 23 +++++++++++++++++++
 charts/harvester-node-manager/Chart.yaml      |  4 ++--
 .../node.harvesterhci.io_nodeconfigs.yaml     |  5 ++++
 .../templates/daemonset.yaml                  | 14 +++++++----
 charts/harvester-node-manager/values.yaml     |  6 ++---
 5 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 charts/harvester-node-manager/.helmignore

diff --git a/charts/harvester-node-manager/.helmignore b/charts/harvester-node-manager/.helmignore
new file mode 100644
index 00000000..0e8a0eb3
--- /dev/null
+++ b/charts/harvester-node-manager/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/harvester-node-manager/Chart.yaml b/charts/harvester-node-manager/Chart.yaml
index 5518233a..2ffe962e 100644
--- a/charts/harvester-node-manager/Chart.yaml
+++ b/charts/harvester-node-manager/Chart.yaml
@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.0.0-dev
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: v0.3.0
+appVersion: "v0.1.1"
 
 maintainers:
   - name: harvester
diff --git a/charts/harvester-node-manager/templates/crds/node.harvesterhci.io_nodeconfigs.yaml b/charts/harvester-node-manager/templates/crds/node.harvesterhci.io_nodeconfigs.yaml
index 57b1bfad..53517030 100644
--- a/charts/harvester-node-manager/templates/crds/node.harvesterhci.io_nodeconfigs.yaml
+++ b/charts/harvester-node-manager/templates/crds/node.harvesterhci.io_nodeconfigs.yaml
@@ -36,6 +36,11 @@ spec:
             type: object
           spec:
             properties:
+              longhornConfig:
+                properties:
+                  enableV2DataEngine:
+                    type: boolean
+                type: object
               ntpConfigs:
                 properties:
                   ntpServers:
diff --git a/charts/harvester-node-manager/templates/daemonset.yaml b/charts/harvester-node-manager/templates/daemonset.yaml
index ab4bbdc9..f6b1860c 100644
--- a/charts/harvester-node-manager/templates/daemonset.yaml
+++ b/charts/harvester-node-manager/templates/daemonset.yaml
@@ -37,9 +37,12 @@ spec:
           securityContext:
             privileged: true
           volumeMounts:
-            - mountPath: /sys/kernel/mm/ksm
-              name: ksm
+            - mountPath: /sys/kernel/mm
+              name: mm
               readOnly: false
+            - mountPath: /lib/modules
+              name: modules
+              readOnly: true
             - mountPath: /host/proc
               name: proc
               readOnly: true
@@ -57,9 +60,12 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       volumes:
-        - name: ksm
+        - name: mm
+          hostPath:
+            path: /sys/kernel/mm
+        - name: modules
           hostPath:
-            path: /sys/kernel/mm/ksm
+            path: /lib/modules
         - name: proc
           hostPath:
             path: /proc
diff --git a/charts/harvester-node-manager/values.yaml b/charts/harvester-node-manager/values.yaml
index ba9a0860..427dc6df 100644
--- a/charts/harvester-node-manager/values.yaml
+++ b/charts/harvester-node-manager/values.yaml
@@ -3,9 +3,9 @@
 # Declare variables to be passed into your templates.
 image:
   repository: rancher/harvester-node-manager
-  pullPolicy: IfNotPresent
+  pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
+  tag: "master-head"
 
 resources:
   limits:
@@ -28,4 +28,4 @@ webhook:
   image:
     repository: rancher/harvester-node-manager-webhook
     pullPolicy: Always
-    tag: "v0.3.0"
+    tag: "master-head"