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

enhancement: support that csi image path can be configured
cubefs · Jun 15, 2020 · d3fd663 · d3fd663
2 parents 4cdeb15 + a523879
commit d3fd663
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/chubaofs/templates/csi-controller-deployment.yaml b/chubaofs/templates/csi-controller-deployment.yaml
@@ -3,7 +3,7 @@
 {{- $namespace := .Values.namespace }}
 ---
 kind: Deployment
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 metadata:
   name: cfs-csi-controller
   namespace: {{ $namespace }}
@@ -22,8 +22,8 @@ spec:
       #   chubaofs-csi-controller: enabled
       containers:
         - name: external-provisioner
-          image: quay.io/k8scsi/csi-provisioner:v0.4.2
-          imagePullPolicy: IfNotPresent
+          image: {{ $.Values.image.csi_provisioner }}
+          imagePullPolicy: {{ $.Values.image.pull_policy }}
           securityContext:
             privileged: true
           args:
@@ -48,8 +48,8 @@ spec:
             - name: kube-config
               mountPath: /etc/kubernetes
         - name: external-attacher
-          image: quay.io/k8scsi/csi-attacher:v0.4.2
-          imagePullPolicy: IfNotPresent
+          image: {{ $.Values.image.csi_attacher }}
+          imagePullPolicy: {{ $.Values.image.pull_policy }}
           securityContext:
             privileged: true
           args:
@@ -125,4 +125,4 @@ spec:
             name: csi-kube-config
           name: kube-config
 ---
-{{ end }}
+{{ end }}
diff --git a/chubaofs/templates/csi-node-daemonset.yaml b/chubaofs/templates/csi-node-daemonset.yaml
@@ -3,7 +3,7 @@
 {{- $namespace := .Values.namespace }}
 ---
 kind: DaemonSet
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 metadata:
   name: cfs-csi-node
   namespace: {{ $namespace }}
@@ -23,8 +23,8 @@ spec:
         chubaofs-csi-node: enabled
       containers:
         - name: driver-registrar
-          image: quay.io/k8scsi/driver-registrar:v0.4.2
-          imagePullPolicy: IfNotPresent
+          image: {{ $.Values.image.driver_registrar }}
+          imagePullPolicy: {{ $.Values.image.pull_policy }}
           securityContext:
             privileged: true
           args:

diff --git a/chubaofs/values.yaml b/chubaofs/values.yaml
@@ -15,6 +15,9 @@ image:
   server: chubaofs/cfs-server:2.0.5
   client: chubaofs/cfs-client:2.0.5
   csi_driver: chubaofs/cfs-csi-driver:2.1.2
+  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
   grafana: grafana/grafana:6.4.4
   prometheus: prom/prometheus:v2.13.1
   consul: consul:1.6.1