Merge pull request #399 from bluezd/iomesh-1.1

Update IOMesh Charts to v1.1.

src/stable/iomesh/Chart.yaml

@@ -1,27 +1,41 @@
 apiVersion: v2
-appVersion: v5.3.0-rc13
+appVersion: v5.5.0-rc27
 dependencies:
 - name: zookeeper-operator
-  repository: http://iomesh.com/charts
-  version: 0.2.15
+  repository: file://charts/zookeeper-operator
+  version: 0.2.15-1
 - name: hostpath-provisioner
-  repository: http://iomesh.com/charts
-  version: 0.5.3
+  repository: file://charts/hostpath-provisioner
+  version: 0.5.3-1
 - condition: openebs-ndm.enabled
   name: openebs-ndm
-  repository: http://iomesh.com/charts
-  version: 1.8.0
+  repository: file://charts/openebs-ndm
+  version: 1.8.0-1
 - name: csi-driver
-  repository: http://iomesh.com/charts
-  version: 2.6.0
+  repository: file://charts/csi-driver
+  version: 2.7.2
 - name: blockdevice-monitor
-  repository: http://iomesh.com/charts
+  repository: file://charts/blockdevice-monitor
   version: 0.1.0
 - condition: iomesh-localpv-manager.enabled
   name: iomesh-localpv-manager
-  repository: http://iomesh.com/charts
+  repository: file://charts/iomesh-localpv-manager
+  version: 0.2.0
+- name: deck
+  repository: file://charts/deck
+  version: 0.1.0
+- name: deck-plugin-iomesh
+  repository: file://charts/deck-plugin-iomesh
   version: 0.1.0
 description: Install all IOMesh components
 name: iomesh
 type: application
-version: v1.0.1
+version: v1.1.0
+home: https://www.iomesh.com
+icon: https://www.iomesh.com/IOMesh_logo_on_white.svg
+maintainers:
+- name: SmartX
+  email: info@smartx.com
+  url: https://www.iomesh.com
+annotations:
+  "app.kubesphere.io/category": "Storage"

src/stable/iomesh/charts/csi-driver/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: v2.6.0
+appVersion: v2.7.2
 description: 'The IOMesh Container Storage Interface CSI Driver provides a CSI interface
   used by Container Orchestrators to manage the lifecycle of IOMesh volumes. '
 home: http://iomesh.com
 kubeVersion: ^1.13.0-0
 name: csi-driver
 type: application
-version: 2.6.0
+version: 2.7.2

src/stable/iomesh/charts/csi-driver/templates/_helpers.tpl

@@ -111,6 +111,12 @@ volumes:
   hostPath:
     path: /sbin/iscsiadm
     type: File
+{{- if .Values.driver.nvmf.enable }}
+- name: nvme
+  hostPath:
+    path: /usr/sbin/nvme
+    type: File
+{{- end }}
 - name: lib
   hostPath:
     path: /lib
@@ -154,6 +160,12 @@ volumeMounts:
   mountPath: /host/etc/iscsi
 - name: iscsiadm
   mountPath: /host/sbin/iscsiadm
+{{- if .Values.driver.nvmf.enable }}
+- name: nvme
+  mountPath: /host/usr/sbin/nvme
+- name: device-dir
+  mountPath: /host/dev
+{{- end }}
 - name: iscsi-lib
   mountPath: /host/var/lib/iscsi
 - name: lib
@@ -195,3 +207,10 @@ smtx-{{include "csi-driver.name" .}}
 com.smartx.{{ include "csi-driver.name" . }}
 {{- end }}
 {{- end }}
+
+{{/*
+Prepare-csi image
+*/}}
+{{- define "prepareCSI.image" -}}
+{{ .Values.global.registry }}{{ .Values.prepareCSI.image.repository | default "iomesh/prepare-csi"}}:{{ .Values.prepareCSI.image.tag | default "v1.0.2" }}
+{{- end }}

src/stable/iomesh/charts/csi-driver/templates/_sidecar.tpl

@@ -35,16 +35,21 @@ csi-driver controller sidecar
 {{- $snapshotterVersion := "" }}
 {{- $attacherVersion := "" }}
 {{- $resizerVersion := "" }}
-{{- $livenessProbeVersion := "v2.8.0" -}}
+{{- $livenessProbeVersion := "v2.10.0" -}}
 
 {{- /*
 k8s 1.22+
 */}}
 {{- if and (eq $kubeMajorVersion 1) (ge $kubeMinorVersion 22) }}
-{{- $provisionerVersion = "v3.0.0" }}
-{{- $snapshotterVersion = "v4.2.1" }}
-{{- $attacherVersion = "v3.3.0" }}
-{{- $resizerVersion = "v1.3.0" }}
+{{- if and (not (.Capabilities.APIVersions.Has "snapshot.storage.k8s.io/v1alpha1")) (.Capabilities.APIVersions.Has "snapshot.storage.k8s.io/v1beta1") (not (.Capabilities.APIVersions.Has "snapshot.storage.k8s.io/v1")) }}
+{{- $provisionerVersion = "v2.1.2" }}
+{{- $snapshotterVersion = "v2.1.1" }}
+{{- else }}
+{{- $provisionerVersion = "v3.5.0" }}
+{{- $snapshotterVersion = "v6.2.2" }}
+{{- end }}
+{{- $attacherVersion = "v4.3.0" }}
+{{- $resizerVersion = "v1.8.0" }}
 {{- /*
 k8s 1.17~1.21
 */}}
@@ -58,15 +63,13 @@ k8s 1.15~1.16
 */}}
 {{- else if and (eq $kubeMajorVersion 1) (ge $kubeMinorVersion 15) (le $kubeMinorVersion 16) }}
 {{- $provisionerVersion = "v1.6.0" }}
-{{- $snapshotterVersion = "v1.2.2" }}
 {{- $attacherVersion = "v2.2.0" }}
 {{- $resizerVersion = "v0.5.0" }}
 {{- /*
 k8s 1.13~1.14
 */}}
 {{- else if and (eq $kubeMajorVersion 1) (ge $kubeMinorVersion 13) (le $kubeMinorVersion 14) }}
 {{- $provisionerVersion = "v1.6.0" }}
-{{- $snapshotterVersion = "v1.2.2" }}
 {{- $attacherVersion = "v1.1.1" }}
 {{- $resizerVersion = "v0.5.0" }}
 {{- end }}
@@ -95,20 +98,21 @@ let the sidecar use the default election method (configmap or endpoint)
     {{- if eq .Values.driver.deploymentMode "HCI" }}
     - "--feature-gates=Topology=true"
     {{- end }}
-    - "--v=5"
+    - "--v=3"
 {{ include "csi-driver.sidecar.container-common" . | indent 2 }}
 {{- /*
 csi-snapshotter sidecar
+k8s support csi-snapshotter sidecar in k8s 1.17+
 */}}
+{{- if and (eq $kubeMajorVersion 1) (ge $kubeMinorVersion 17) }}
 - name: csi-snapshotter
   image: {{ include "csi-driver.sidecar.registry" . }}/csi-snapshotter:{{ $snapshotterVersion }}
   args:
   - "--csi-address=$(ADDRESS)"
-  {{- if and (eq $kubeMajorVersion 1) (ge $kubeMinorVersion 17) }}
   - "--leader-election"
-  {{- end }}
-  - "--v=5"
+  - "--v=3"
 {{ include "csi-driver.sidecar.container-common" . | indent 2 }}
+{{- end }}
 {{- /*
 csi-attacher sidecar.
 */}}
@@ -117,7 +121,7 @@ csi-attacher sidecar.
   args:
     - "--csi-address=$(ADDRESS)"
     - "--leader-election"
-    - "--v=5"
+    - "--v=3"
 {{ include "csi-driver.sidecar.container-common" . | indent 2 }}
 {{- /*
 csi-resizer sidecar.
@@ -129,7 +133,7 @@ k8s support csi-resizer sidecar in k8s 1.14+
   args:
     - "--csi-address=$(ADDRESS)"
     - "--leader-election"
-    - "--v=5"
+    - "--v=3"
 {{ include "csi-driver.sidecar.container-common" . | indent 2 }}
 {{- end }}
 {{- /*
@@ -152,7 +156,7 @@ driver-registrar sidecar
 - name: driver-registrar
   securityContext:
     privileged: true
-  image: {{ include "csi-driver.sidecar.registry" . }}/csi-node-driver-registrar:v2.5.0
+  image: {{ include "csi-driver.sidecar.registry" . }}/csi-node-driver-registrar:v2.8.0
   args:
     - --v=5
     - --csi-address=/csi/csi.sock
@@ -175,7 +179,7 @@ driver-registrar sidecar
 liveness-probe sidecar
 */}}
 - name: liveness-probe
-  image: {{ include "csi-driver.sidecar.registry" . }}/livenessprobe:v2.8.0
+  image: {{ include "csi-driver.sidecar.registry" . }}/livenessprobe:v2.10.0
   args:
     - --csi-address=/csi/csi.sock
     - --health-port={{ $.Values.driver.node.driver.ports.health }}

src/stable/iomesh/charts/csi-driver/templates/clusterrole.yaml

@@ -81,16 +81,16 @@ rules:
     verbs: ["get", "list", "watch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents"]
-    verbs: ["create", "get", "list", "watch", "update", "delete"]
+    verbs: ["create", "get", "list", "watch", "update", "delete", "patch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents/status"]
-    verbs: ["update"]
+    verbs: ["update", "patch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshots"]
-    verbs: ["create", "get", "list", "watch", "update", "delete"]
+    verbs: ["create", "get", "list", "watch", "update", "delete", "patch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshots/status"]
-    verbs: ["update"]
+    verbs: ["update", "patch"]
   - apiGroups: ["coordination.k8s.io"]
     resources: ["leases"]
     verbs: ["get", "watch", "list", "delete", "update", "create"]
@@ -149,4 +149,13 @@ rules:
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents/status"]
     verbs: ["get"]
+  {{- if eq .Values.co "openshift" }}
+  {{- $majorVersion := index .Values.coVersion 0 }}
+  {{- if eq $majorVersion '4' }}
+  - apiGroups: ["security.openshift.io"]
+    resourceNames: ["privileged"]
+    resources: ["securitycontextconstraints"]
+    verbs: ["use"]
+  {{- end }}
+  {{- end }}
 {{- end }}

src/stable/iomesh/charts/csi-driver/templates/controller.yaml

@@ -54,6 +54,7 @@ spec:
             - --deployment_mode={{ .Values.driver.deploymentMode }}
             - --namespace=$(NAMESPACE)
             - --node_map={{ include "csi-driver.fullname" . }}-node-map
+            - --enable_nvmf={{ .Values.driver.nvmf.enable }}
             - --pod_delete_policy={{ .Values.driver.controller.driver.podDeletePolicy | default "no-delete-pod" }}
             - --pod_delete_latency={{ .Values.driver.controller.driver.podDeleteLatency | default "90s" }}
             - --v=1
@@ -73,6 +74,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: CHART_RELEASE_INFO
+              value: {{ .Release.Namespace }}/{{ .Release.Name }}
       {{- with .Values.driver.controller.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

src/stable/iomesh/charts/csi-driver/templates/node.yaml

@@ -59,6 +59,11 @@ spec:
             - --node_map={{ include "csi-driver.fullname" . }}-node-map
             - --iscsi_config_path=/etc/iomesh/iscsi.yaml
             - --liveness_port={{ .Values.driver.node.driver.ports.liveness }}
+            - --max_volumes_per_node={{ .Values.driver.maxVolumesPerNode | default 128 }}
+            - --enable_nvmf={{ .Values.driver.nvmf.enable }}
+            - --nvmf_agent_interval_second={{ .Values.driver.nvmf.nvmfAgentIntervalSecond }}
+            - --nvmf_agent_connect_timeout_second={{ .Values.driver.nvmf.nvmfAgentConnectTimeoutSecond }}
+            - --nvmf_agent_disconnect_timeout_second={{ .Values.driver.nvmf.nvmfAgentDisconnectTimeoutSecond }}
             - --v=1
           env:
             - name: NODE_NAME
@@ -73,6 +78,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: CHART_RELEASE_INFO
+              value: {{ .Release.Namespace }}/{{ .Release.Name }}
       {{- include "csi-driver.node.volumeMounts" . | nindent 10 -}}
       {{- with .Values.driver.node.nodeSelector }}
       nodeSelector:

src/stable/iomesh/charts/csi-driver/templates/openshiftscc.yaml

@@ -1,11 +1,8 @@
 {{- if eq .Values.co "openshift" }}
-kind: SecurityContextConstraints
 {{- $majorVersion := index .Values.coVersion 0 }}
-{{- if eq $majorVersion '4' }}
-apiVersion: security.openshift.io/v1
-{{- else if eq $majorVersion '3' }}
+{{- if eq $majorVersion '3' }}
+kind: SecurityContextConstraints
 apiVersion: v1
-{{- end }}
 metadata:
   name: scc-csi-driver
 allowPrivilegedContainer: true
@@ -27,3 +24,4 @@ users:
 - system:serviceaccount:{{ .Release.Namespace }}:{{ include "csi-driver.fullname" . }}-controller-account
 - system:serviceaccount:{{ .Release.Namespace }}:{{ include "csi-driver.fullname" . }}-node-account
 {{- end }}
+{{- end }}