Merge pull request #31 from chengyu-l/k8s_v1.12.0

Refactor: simplify code
cubefs · Jul 22, 2020 · a062f7a · a062f7a
2 parents 43503a4 + c831468
commit a062f7a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/chubaofs/templates/_helpers.tpl b/chubaofs/templates/_helpers.tpl
@@ -32,7 +32,7 @@ master-service.{{- $.Values.namespace -}}.svc.cluster.local
 
 {{- define "chubaofs.monitor.consul.address" -}}
 {{- $envAll := index . 0 -}}
-consul-service.{{- $envAll.Values.namespace -}}.svc.cluster.local:{{- $envAll.Values.consul.port }}
+http://consul-service.{{- $envAll.Values.namespace -}}.svc.cluster.local:{{- $envAll.Values.consul.port }}
 {{- end -}}
 
 {{- define "chubaofs.monitor.consul.url" -}}

diff --git a/chubaofs/templates/csi-controller-deployment.yaml b/chubaofs/templates/csi-controller-deployment.yaml
@@ -75,9 +75,7 @@ spec:
           imagePullPolicy: IfNotPresent
           securityContext:
             privileged: true
-          command:
-            - /bin/tini
-            - "--"
+          args:
             - bash
             - "-c"
             - |-

diff --git a/chubaofs/templates/csi-node-daemonset.yaml b/chubaofs/templates/csi-node-daemonset.yaml
@@ -58,9 +58,7 @@ spec:
           imagePullPolicy: {{ $.Values.image.pull_policy }}
           securityContext:
             privileged: true
-          command:
-            - /bin/tini
-            - "--"
+          args:
             - bash
             - "-c"
             - |-

diff --git a/chubaofs/values.yaml b/chubaofs/values.yaml
@@ -15,7 +15,7 @@ component:
 image:
   server: chubaofs/cfs-server:2.0.6
   client: chubaofs/cfs-client:2.0.6
-  csi_driver: chubaofs/cfs-csi-driver:2.1.3
+  csi_driver: chubaofs/cfs-csi-driver:2.1.4
   csi_provisioner: quay.io/k8scsi/csi-provisioner:v0.4.2 
   driver_registrar: quay.io/k8scsi/driver-registrar:v0.4.2
   csi_attacher: quay.io/k8scsi/csi-attacher:v0.4.2