Merge openebs#1099

1099: chore: update chart to include nvmf env variables r=tiagolobocastro a=tiagolobocastro Co-authored-by: Tiago Castro <[email protected]>
vharsh · Feb 16, 2022 · 2d7d0c4 · 2d7d0c4
2 parents 6b4e69b + 4fabf05
commit 2d7d0c4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
@@ -13,6 +13,6 @@
 {{- if gt $i 0 }}
 {{- printf "," }}
 {{- end }}
-{{- printf "%d" $i }}
+{{- printf "%d" (add $i 1) }}
 {{- end }}
 {{- end }}
diff --git a/chart/templates/mayastor-daemonset.yaml b/chart/templates/mayastor-daemonset.yaml
@@ -36,6 +36,11 @@ spec:
         env:
         - name: RUST_LOG
           value: info,mayastor={{ .Values.mayastorLogLevel }}
+        - name: NVMF_TCP_MAX_QPAIRS_PER_CTRL
+          # Current recommendation is to set this value to be the number of cores provided to mayastor (see -l argument) plus 1.
+          value: "{{ add .Values.mayastorCpuCount 1 }}"
+        - name: NVMF_TCP_MAX_QUEUE_DEPTH
+          value: "32"
         - name: MY_NODE_NAME
           valueFrom:
             fieldRef:
@@ -74,12 +79,12 @@ spec:
           # pressure unless they exceed those limits. limits and requests must be the same.
           limits:
             cpu: "{{ .Values.mayastorCpuCount }}"
-            memory: "512Mi"
-            hugepages-2Mi: "{{ .Values.mayastorHugePagesGiB }}Gi"
+            memory: "1Gi"
+            hugepages-2Mi: "{{ add .Values.mayastorHugePagesGiB 1 }}Gi"
           requests:
             cpu: "{{ .Values.mayastorCpuCount }}"
-            memory: "512Mi"
-            hugepages-2Mi: "{{ .Values.mayastorHugePagesGiB }}Gi"
+            memory: "1Gi"
+            hugepages-2Mi: "{{ add .Values.mayastorHugePagesGiB 1 }}Gi"
         ports:
         - containerPort: 10124
           protocol: TCP

diff --git a/deploy/csi-daemonset.yaml b/deploy/csi-daemonset.yaml
@@ -30,7 +30,7 @@ spec:
       # the same.
       containers:
       - name: mayastor-csi
-        image: mayadata/mayastor:v1.0.0
+        image: mayadata/mayastor:v1.0.1
         imagePullPolicy: IfNotPresent
         # we need privileged because we mount filesystems and use mknod
         securityContext:

diff --git a/deploy/mayastor-daemonset.yaml b/deploy/mayastor-daemonset.yaml
@@ -33,11 +33,16 @@ spec:
         command: ['sh', '-c', 'until nc -vz nats 4222; do echo "Waiting for message bus..."; sleep 1; done;']
       containers:
       - name: mayastor
-        image: mayadata/mayastor:v1.0.0
+        image: mayadata/mayastor:v1.0.1
         imagePullPolicy: IfNotPresent
         env:
         - name: RUST_LOG
           value: info,mayastor=info
+        - name: NVMF_TCP_MAX_QPAIRS_PER_CTRL
+          # Current recommendation is to set this value to be the number of cores provided to mayastor (see -l argument) plus 1.
+          value: "2"
+        - name: NVMF_TCP_MAX_QUEUE_DEPTH
+          value: "32"
         - name: MY_NODE_NAME
           valueFrom:
             fieldRef:
@@ -50,10 +55,11 @@ spec:
         # The -l argument accepts cpu-list. Indexing starts at zero.
         # For example -l 1,2,10-20 means use core 1, 2, 10 to 20.
         # Note: Ensure that the CPU resources are updated accordingly.
-        # If you use 2 CPUs, the CPU: field should also read 2.
+        #       If you use 2 CPUs, the CPU: field should also read 2.
         - "-N$(MY_NODE_NAME)"
         - "-g$(MY_POD_IP)"
         - "-nnats"
+        - "-y/var/local/mayastor/config.yaml"
         - "-l1"
         - "-pmayastor-etcd"
         command:
@@ -73,7 +79,6 @@ spec:
           # NOTE: Each container must have mem/cpu limits defined in order to
           # belong to Guaranteed QoS class, hence can never get evicted in case of
           # pressure unless they exceed those limits. limits and requests must be the same.
-          #
           limits:
             cpu: "1"
             memory: "1Gi"