mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 02:50:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

deploy: update csi sidecar images

Browse Source 
This PR makes the changes in csi templates and
upgrade documentation required for updating
csi sidecar images.

Signed-off-by: Mudit Agarwal <muagarwa@redhat.com>
This commit is contained in:
Mudit Agarwal 2020-09-30 10:28:08 +05:30 committed by mergify[bot]
parent ba8ead6e04
commit a92d8d7f2e
13 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml
View File

@ -41,6 +41,9 @@ rules:
- apiGroups: ["storage.k8s.io"] - apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments"] resources: ["volumeattachments"]
verbs: ["get", "list", "watch", "update", "patch"] verbs: ["get", "list", "watch", "update", "patch"]
- apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments/status"]
verbs: ["patch"]
{{- end -}} {{- end -}}
{{- if semverCompare ">=1.15" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.15" .Capabilities.KubeVersion.GitVersion -}}
{{- if .Values.provisioner.resizer.enabled }} {{- if .Values.provisioner.resizer.enabled }}

6
charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml
View File

@ -50,8 +50,7 @@ spec:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--v={{ .Values.logLevel }}" - "--v={{ .Values.logLevel }}"
- "--timeout={{ .Values.provisioner.timeout }}" - "--timeout={{ .Values.provisioner.timeout }}"
- "--enable-leader-election=true" - "--leader-election=true"
- "--leader-election-type=leases"
- "--retry-interval-start=500ms" - "--retry-interval-start=500ms"
{{- if .Values.topology.enabled }} {{- if .Values.topology.enabled }}
- "--feature-gates=Topology=true" - "--feature-gates=Topology=true"
@ -108,9 +107,10 @@ spec:
args: args:
- "--v={{ .Values.logLevel }}" - "--v={{ .Values.logLevel }}"
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--csiTimeout={{ .Values.provisioner.timeout }}" - "--timeout={{ .Values.provisioner.timeout }}"
- "--leader-election" - "--leader-election"
- "--retry-interval-start=500ms" - "--retry-interval-start=500ms"
- "--handle-volume-inuse-error=false"
env: env:
- name: ADDRESS - name: ADDRESS
value: "unix:///csi/{{ .Values.provisionerSocketFile }}" value: "unix:///csi/{{ .Values.provisionerSocketFile }}"

10
charts/ceph-csi-cephfs/values.yaml
View File

@ -73,7 +73,7 @@ nodeplugin:
registrar: registrar:
image: image:
repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
tag: v1.3.0 tag: v2.0.1
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}
@ -139,7 +139,7 @@ provisioner:
provisioner: provisioner:
image: image:
repository: k8s.gcr.io/sig-storage/csi-provisioner repository: k8s.gcr.io/sig-storage/csi-provisioner
tag: v1.6.0 tag: v2.0.4
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}
@ -148,7 +148,7 @@ provisioner:
enabled: true enabled: true
image: image:
repository: k8s.gcr.io/sig-storage/csi-attacher repository: k8s.gcr.io/sig-storage/csi-attacher
tag: v2.2.0 tag: v3.0.2
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}
@ -157,14 +157,14 @@ provisioner:
enabled: true enabled: true
image: image:
repository: k8s.gcr.io/sig-storage/csi-resizer repository: k8s.gcr.io/sig-storage/csi-resizer
tag: v0.5.0 tag: v1.0.1
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}
snapshotter: snapshotter:
image: image:
repository: k8s.gcr.io/sig-storage/csi-snapshotter repository: k8s.gcr.io/sig-storage/csi-snapshotter
tag: v2.1.1 tag: v3.0.2
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}

3
charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml
View File

@ -32,6 +32,9 @@ rules:
- apiGroups: ["storage.k8s.io"] - apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments"] resources: ["volumeattachments"]
verbs: ["get", "list", "watch", "update", "patch"] verbs: ["get", "list", "watch", "update", "patch"]
- apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments/status"]
verbs: ["patch"]
{{- end }} {{- end }}
- apiGroups: ["snapshot.storage.k8s.io"] - apiGroups: ["snapshot.storage.k8s.io"]
resources: ["volumesnapshots"] resources: ["volumesnapshots"]

6
charts/ceph-csi-rbd/templates/provisioner-deployment.yaml
View File

@ -50,8 +50,7 @@ spec:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--v={{ .Values.logLevel }}" - "--v={{ .Values.logLevel }}"
- "--timeout={{ .Values.provisioner.timeout }}" - "--timeout={{ .Values.provisioner.timeout }}"
- "--enable-leader-election=true" - "--leader-election=true"
- "--leader-election-type=leases"
- "--retry-interval-start=500ms" - "--retry-interval-start=500ms"
{{- if .Values.topology.enabled }} {{- if .Values.topology.enabled }}
- "--feature-gates=Topology=true" - "--feature-gates=Topology=true"
@ -71,9 +70,10 @@ spec:
args: args:
- "--v={{ .Values.logLevel }}" - "--v={{ .Values.logLevel }}"
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--csiTimeout={{ .Values.provisioner.timeout }}" - "--timeout={{ .Values.provisioner.timeout }}"
- "--leader-election" - "--leader-election"
- "--retry-interval-start=500ms" - "--retry-interval-start=500ms"
- "--handle-volume-inuse-error=false"
env: env:
- name: ADDRESS - name: ADDRESS
value: "unix:///csi/{{ .Values.provisionerSocketFile }}" value: "unix:///csi/{{ .Values.provisionerSocketFile }}"

10
charts/ceph-csi-rbd/values.yaml
View File

@ -85,7 +85,7 @@ nodeplugin:
registrar: registrar:
image: image:
repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
tag: v1.3.0 tag: v2.0.1
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}
@ -163,7 +163,7 @@ provisioner:
provisioner: provisioner:
image: image:
repository: k8s.gcr.io/sig-storage/csi-provisioner repository: k8s.gcr.io/sig-storage/csi-provisioner
tag: v1.6.0 tag: v2.0.4
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}
@ -172,7 +172,7 @@ provisioner:
enabled: true enabled: true
image: image:
repository: k8s.gcr.io/sig-storage/csi-attacher repository: k8s.gcr.io/sig-storage/csi-attacher
tag: v2.2.0 tag: v3.0.2
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}
@ -181,14 +181,14 @@ provisioner:
enabled: true enabled: true
image: image:
repository: k8s.gcr.io/sig-storage/csi-resizer repository: k8s.gcr.io/sig-storage/csi-resizer
tag: v0.5.0 tag: v1.0.1
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}
snapshotter: snapshotter:
image: image:
repository: k8s.gcr.io/sig-storage/csi-snapshotter repository: k8s.gcr.io/sig-storage/csi-snapshotter
tag: v2.1.0 tag: v3.0.2
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
resources: {} resources: {}

16
deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml
View File

@ -42,15 +42,14 @@ spec:
serviceAccount: cephfs-csi-provisioner serviceAccount: cephfs-csi-provisioner
containers: containers:
- name: csi-provisioner - name: csi-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v1.6.0 image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--v=5" - "--v=5"
- "--timeout=150s" - "--timeout=150s"
- "--enable-leader-election=true" - "--leader-election=true"
- "--leader-election-type=leases"
- "--retry-interval-start=500ms" - "--retry-interval-start=500ms"
- "--feature-gates=Topology=true" - "--feature-gates=Topology=false"
env: env:
- name: ADDRESS - name: ADDRESS
value: unix:///csi/csi-provisioner.sock value: unix:///csi/csi-provisioner.sock
@ -59,13 +58,14 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /csi mountPath: /csi
- name: csi-resizer - name: csi-resizer
image: k8s.gcr.io/sig-storage/csi-resizer:v0.5.0 image: k8s.gcr.io/sig-storage/csi-resizer:v1.0.1
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--v=5" - "--v=5"
- "--csiTimeout=150s" - "--timeout=150s"
- "--leader-election" - "--leader-election"
- "--retry-interval-start=500ms" - "--retry-interval-start=500ms"
- "--handle-volume-inuse-error=false"
env: env:
- name: ADDRESS - name: ADDRESS
value: unix:///csi/csi-provisioner.sock value: unix:///csi/csi-provisioner.sock
@ -74,7 +74,7 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /csi mountPath: /csi
- name: csi-snapshotter - name: csi-snapshotter
image: k8s.gcr.io/sig-storage/csi-snapshotter:v2.1.1 image: k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.2
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--v=5" - "--v=5"
@ -90,7 +90,7 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /csi mountPath: /csi
- name: csi-cephfsplugin-attacher - name: csi-cephfsplugin-attacher
image: k8s.gcr.io/sig-storage/csi-attacher:v2.2.0 image: k8s.gcr.io/sig-storage/csi-attacher:v3.0.2
args: args:
- "--v=5" - "--v=5"
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"

2
deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
View File

@ -24,7 +24,7 @@ spec:
# created by privileged CSI driver container. # created by privileged CSI driver container.
securityContext: securityContext:
privileged: true privileged: true
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v1.3.0 image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1
args: args:
- "--v=5" - "--v=5"
- "--csi-address=/csi/csi.sock" - "--csi-address=/csi/csi.sock"

3
deploy/cephfs/kubernetes/csi-provisioner-rbac.yaml
View File

@ -40,6 +40,9 @@ rules:
- apiGroups: ["storage.k8s.io"] - apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments"] resources: ["volumeattachments"]
verbs: ["get", "list", "watch", "update", "patch"] verbs: ["get", "list", "watch", "update", "patch"]
- apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments/status"]
verbs: ["patch"]
- apiGroups: [""] - apiGroups: [""]
resources: ["persistentvolumeclaims/status"] resources: ["persistentvolumeclaims/status"]
verbs: ["update", "patch"] verbs: ["update", "patch"]

3
deploy/rbd/kubernetes/csi-provisioner-rbac.yaml
View File

@ -43,6 +43,9 @@ rules:
- apiGroups: ["storage.k8s.io"] - apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments"] resources: ["volumeattachments"]
verbs: ["get", "list", "watch", "update", "patch"] verbs: ["get", "list", "watch", "update", "patch"]
- apiGroups: ["storage.k8s.io"]
resources: ["volumeattachments/status"]
verbs: ["patch"]
- apiGroups: ["storage.k8s.io"] - apiGroups: ["storage.k8s.io"]
resources: ["csinodes"] resources: ["csinodes"]
verbs: ["get", "list", "watch"] verbs: ["get", "list", "watch"]

14
deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml
View File

@ -42,14 +42,13 @@ spec:
serviceAccount: rbd-csi-provisioner serviceAccount: rbd-csi-provisioner
containers: containers:
- name: csi-provisioner - name: csi-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v1.6.0 image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--v=5" - "--v=5"
- "--timeout=150s" - "--timeout=150s"
- "--retry-interval-start=500ms" - "--retry-interval-start=500ms"
- "--enable-leader-election=true" - "--leader-election=true"
- "--leader-election-type=leases"
- "--feature-gates=Topology=true" - "--feature-gates=Topology=true"
env: env:
- name: ADDRESS - name: ADDRESS
@ -59,7 +58,7 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /csi mountPath: /csi
- name: csi-snapshotter - name: csi-snapshotter
image: k8s.gcr.io/sig-storage/csi-snapshotter:v2.1.0 image: k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.2
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--v=5" - "--v=5"
@ -75,7 +74,7 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /csi mountPath: /csi
- name: csi-attacher - name: csi-attacher
image: k8s.gcr.io/sig-storage/csi-attacher:v2.2.0 image: k8s.gcr.io/sig-storage/csi-attacher:v3.0.2
args: args:
- "--v=5" - "--v=5"
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
@ -89,13 +88,14 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /csi mountPath: /csi
- name: csi-resizer - name: csi-resizer
image: k8s.gcr.io/sig-storage/csi-resizer:v0.5.0 image: k8s.gcr.io/sig-storage/csi-resizer:v1.0.1
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
- "--v=5" - "--v=5"
- "--csiTimeout=150s" - "--timeout=150s"
- "--leader-election" - "--leader-election"
- "--retry-interval-start=500ms" - "--retry-interval-start=500ms"
- "--handle-volume-inuse-error=false"
env: env:
- name: ADDRESS - name: ADDRESS
value: unix:///csi/csi-provisioner.sock value: unix:///csi/csi-provisioner.sock

2
deploy/rbd/kubernetes/csi-rbdplugin.yaml
View File

@ -25,7 +25,7 @@ spec:
# created by privileged CSI driver container. # created by privileged CSI driver container.
securityContext: securityContext:
privileged: true privileged: true
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v1.3.0 image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1
args: args:
- "--v=5" - "--v=5"
- "--csi-address=/csi/csi.sock" - "--csi-address=/csi/csi.sock"

10
scripts/minikube.sh
View File

@ -284,11 +284,11 @@ cephcsi)
;; ;;
k8s-sidecar) k8s-sidecar)
echo "copying the kubernetes sidecar images" echo "copying the kubernetes sidecar images"
copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-attacher:v2.2.0 "${K8S_IMAGE_REPO}"/csi-attacher:v2.2.0 copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-attacher:v3.0.2 "${K8S_IMAGE_REPO}"/csi-attacher:v3.0.2
copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-snapshotter:v2.1.1 $"${K8S_IMAGE_REPO}"/csi-snapshotter:v2.1.1 copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-snapshotter:v3.0.2 $"${K8S_IMAGE_REPO}"/csi-snapshotter:v3.0.2
copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-provisioner:v1.4.0 "${K8S_IMAGE_REPO}"/csi-provisioner:v1.4.0 copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-provisioner:v2.0.4 "${K8S_IMAGE_REPO}"/csi-provisioner:v2.0.4
copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-node-driver-registrar:v1.3.0 "${K8S_IMAGE_REPO}"/csi-node-driver-registrar:v1.3.0 copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-node-driver-registrar:v2.0.1 "${K8S_IMAGE_REPO}"/csi-node-driver-registrar:v2.0.1
copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-resizer:v0.5.0 "${K8S_IMAGE_REPO}"/csi-resizer:v0.5.0 copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-resizer:v1.0.1 "${K8S_IMAGE_REPO}"/csi-resizer:v1.0.1
;; ;;
clean) clean)
${minikube} delete ${minikube} delete