Merge pull request #134 from juicedata/release-operator-driver

release operator with dashboard & add metricsPort in CSI driver
juicedata · Jan 16, 2025 · 82e34b9 · 82e34b9
2 parents 80b9875 + 3ef0e0f
commit 82e34b9
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 6 deletions.
diff --git a/charts/juicefs-cache-group-operator/Chart.yaml b/charts/juicefs-cache-group-operator/Chart.yaml
@@ -15,7 +15,7 @@ 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.2.0
+version: 0.2.1
 
 # 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

diff --git a/charts/juicefs-cache-group-operator/README.md b/charts/juicefs-cache-group-operator/README.md
@@ -1,7 +1,7 @@
 # JuiceFS Cache Group Operator Helm Chart
 
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.0](https://img.shields.io/badge/AppVersion-0.2.0-informational?style=flat-square)
+![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.0](https://img.shields.io/badge/AppVersion-0.2.0-informational?style=flat-square)
 
 This Helm chart installs the JuiceFS Cache Group Operator.
 

diff --git a/charts/juicefs-csi-driver/Chart.yaml b/charts/juicefs-csi-driver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: juicefs-csi-driver
 description: A Helm chart for JuiceFS CSI Driver
 type: application
-version: 0.22.0
+version: 0.22.1
 appVersion: 0.26.0
 kubeVersion: ">=1.14.0-0"
 home: https://github.com/juicedata/juicefs-csi-driver

diff --git a/charts/juicefs-csi-driver/README.md b/charts/juicefs-csi-driver/README.md
@@ -1,6 +1,6 @@
 # juicefs-csi-driver
 
-![Version: 0.22.0](https://img.shields.io/badge/Version-0.22.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.26.0](https://img.shields.io/badge/AppVersion-0.26.0-informational?style=flat-square)
+![Version: 0.22.1](https://img.shields.io/badge/Version-0.22.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.26.0](https://img.shields.io/badge/AppVersion-0.26.0-informational?style=flat-square)
 
 A Helm chart for JuiceFS CSI Driver
 

diff --git a/charts/juicefs-csi-driver/templates/controller.yaml b/charts/juicefs-csi-driver/templates/controller.yaml
@@ -121,6 +121,10 @@ spec:
         - name: JUICEFS_IMMUTABLE
           value: "true"
         {{- end }}
+        {{- if .Values.controller.metricsPort }}
+        - name: JUICEFS_CSI_WEB_PORT
+          value: "{{ .Values.controller.metricsPort }}"
+        {{- end }}
         {{- if .Values.controller.envs }}
 {{ toYaml .Values.controller.envs | trim | indent 8 }}
         {{- end }}
@@ -138,6 +142,9 @@ spec:
         - containerPort: 9909
           name: healthz
           protocol: TCP
+        - containerPort: {{ .Values.controller.metricsPort }}
+          name: metrics
+          protocol: TCP
         securityContext:
           capabilities:
             add:

diff --git a/charts/juicefs-csi-driver/templates/daemonset.yaml b/charts/juicefs-csi-driver/templates/daemonset.yaml
@@ -117,6 +117,10 @@ spec:
         - name: JUICEFS_IMMUTABLE
           value: "true"
         {{- end }}
+        {{- if .Values.node.metricsPort }}
+        - name: JUICEFS_CSI_WEB_PORT
+          value: "{{ .Values.node.metricsPort }}"
+        {{- end }}
         {{- if .Values.node.envs }}
 {{ toYaml .Values.node.envs | trim | indent 8 }}
         {{- end }}
@@ -129,7 +133,7 @@ spec:
         ports:
         - containerPort: {{ .Values.node.livenessProbe.httpGet.port }}
           protocol: TCP
-        - containerPort: 6060
+        - containerPort: {{ .Values.node.metricsPort }}
           name: metrics
           protocol: TCP
         securityContext:

diff --git a/charts/juicefs-csi-driver/values.yaml b/charts/juicefs-csi-driver/values.yaml
@@ -181,6 +181,7 @@ controller:
   terminationGracePeriodSeconds: 30
   labels: {}
   annotations: {}
+  metricsPort: "9567"
   # Affinity for CSI Controller pod
   affinity: {}
   # Node selector for CSI Controller pod
@@ -222,6 +223,7 @@ node:
   terminationGracePeriodSeconds: 30
   labels: {}
   annotations: {}
+  metricsPort: "9567"
   # Affinity for CSI Node Service pods
   affinity: {}
   # Node selector for CSI Node Service pods, ref: https://juicefs.com/docs/csi/guide/resource-optimization#csi-node-node-selector
@@ -261,7 +263,7 @@ metrics:
     servicePort: 8080
 
 dashboard:
-  # CSI Dashboard helps with CSI Driver observation, disabled by default
+  # CSI Dashboard helps with CSI Driver observation, enabled by default
   enabled: true
   # Basic auth for dashboard
   auth: