Bump cinder-csi version and switch container registry (#10894)

* Bump cinder-csi version and switch container registry

Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>

* Update roles/kubespray-defaults/defaults/main/download.yml

Co-authored-by: Mohamed Omar Zaian <mohamedzaian@gmail.com>

---------

Signed-off-by: Ludovic Logiou <ludovic.logiou@gmail.com>
Co-authored-by: Mohamed Omar Zaian <mohamedzaian@gmail.com>
pull/10950/head
Ludovic Logiou 2024-02-22 14:06:40 +01:00 committed by GitHub
parent e250bb65bb
commit 26034b296e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 33 additions and 18 deletions

View File

@ -189,7 +189,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [rbd-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.1-k8s1.11 - [rbd-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.1-k8s1.11
- [aws-ebs-csi-plugin](https://github.com/kubernetes-sigs/aws-ebs-csi-driver) v0.5.0 - [aws-ebs-csi-plugin](https://github.com/kubernetes-sigs/aws-ebs-csi-driver) v0.5.0
- [azure-csi-plugin](https://github.com/kubernetes-sigs/azuredisk-csi-driver) v1.10.0 - [azure-csi-plugin](https://github.com/kubernetes-sigs/azuredisk-csi-driver) v1.10.0
- [cinder-csi-plugin](https://github.com/kubernetes/cloud-provider-openstack/blob/master/docs/cinder-csi-plugin/using-cinder-csi-plugin.md) v1.22.0 - [cinder-csi-plugin](https://github.com/kubernetes/cloud-provider-openstack/blob/master/docs/cinder-csi-plugin/using-cinder-csi-plugin.md) v1.29.0
- [gcp-pd-csi-plugin](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver) v1.9.2 - [gcp-pd-csi-plugin](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver) v1.9.2
- [local-path-provisioner](https://github.com/rancher/local-path-provisioner) v0.0.24 - [local-path-provisioner](https://github.com/rancher/local-path-provisioner) v0.0.24
- [local-volume-provisioner](https://github.com/kubernetes-sigs/sig-storage-local-static-provisioner) v2.5.0 - [local-volume-provisioner](https://github.com/kubernetes-sigs/sig-storage-local-static-provisioner) v2.5.0

View File

@ -44,6 +44,18 @@
## The tag of the external OpenStack Cloud Controller image ## The tag of the external OpenStack Cloud Controller image
# external_openstack_cloud_controller_image_tag: "latest" # external_openstack_cloud_controller_image_tag: "latest"
## Tags for the Cinder CSI images
## registry.k8s.io/sig-storage/csi-attacher
# cinder_csi_attacher_image_tag: "v4.4.2"
## registry.k8s.io/sig-storage/csi-provisioner
# cinder_csi_provisioner_image_tag: "v3.6.2"
## registry.k8s.io/sig-storage/csi-snapshotter
# cinder_csi_snapshotter_image_tag: "v6.3.2"
## registry.k8s.io/sig-storage/csi-resizer
# cinder_csi_resizer_image_tag: "v1.9.2"
## registry.k8s.io/sig-storage/livenessprobe
# cinder_csi_livenessprobe_image_tag: "v2.11.0"
## To use Cinder CSI plugin to provision volumes set this value to true ## To use Cinder CSI plugin to provision volumes set this value to true
## Make sure to source in the openstack credentials ## Make sure to source in the openstack credentials
# cinder_csi_enabled: true # cinder_csi_enabled: true

View File

@ -1,4 +1,11 @@
--- ---
cinder_csi_attacher_image_tag: "v4.4.2"
cinder_csi_provisioner_image_tag: "v3.6.2"
cinder_csi_snapshotter_image_tag: "v6.3.2"
cinder_csi_resizer_image_tag: "v1.9.2"
cinder_csi_livenessprobe_image_tag: "v2.11.0"
# To access Cinder, the CSI controller will need credentials to access # To access Cinder, the CSI controller will need credentials to access
# openstack apis. Per default this values will be # openstack apis. Per default this values will be
# read from the environment. # read from the environment.

View File

@ -1,5 +1,6 @@
# This YAML file contains CSI Controller Plugin Sidecars # This YAML file contains CSI Controller Plugin Sidecars
# external-attacher, external-provisioner, external-snapshotter # external-attacher, external-provisioner, external-snapshotter
# external-resize, liveness-probe
--- ---
kind: Deployment kind: Deployment
@ -17,10 +18,10 @@ spec:
labels: labels:
app: csi-cinder-controllerplugin app: csi-cinder-controllerplugin
spec: spec:
serviceAccountName: csi-cinder-controller-sa serviceAccount: csi-cinder-controller-sa
containers: containers:
- name: csi-attacher - name: csi-attacher
image: {{ csi_attacher_image_repo }}:{{ csi_attacher_image_tag }} image: {{ csi_attacher_image_repo }}:{{ cinder_csi_attacher_image_tag }}
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
@ -28,6 +29,7 @@ spec:
{% if cinder_csi_controller_replicas is defined and cinder_csi_controller_replicas > 1 %} {% if cinder_csi_controller_replicas is defined and cinder_csi_controller_replicas > 1 %}
- --leader-election=true - --leader-election=true
{% endif %} {% endif %}
- "--default-fstype=ext4"
env: env:
- name: ADDRESS - name: ADDRESS
value: /var/lib/csi/sockets/pluginproxy/csi.sock value: /var/lib/csi/sockets/pluginproxy/csi.sock
@ -35,7 +37,7 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/ mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-provisioner - name: csi-provisioner
image: {{ csi_provisioner_image_repo }}:{{ csi_provisioner_image_tag }} image: {{ csi_provisioner_image_repo }}:{{ cinder_csi_provisioner_image_tag }}
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
@ -55,7 +57,7 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/ mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-snapshotter - name: csi-snapshotter
image: {{ csi_snapshotter_image_repo }}:{{ csi_snapshotter_image_tag }} image: {{ csi_snapshotter_image_repo }}:{{ cinder_csi_snapshotter_image_tag }}
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
@ -71,7 +73,7 @@ spec:
- mountPath: /var/lib/csi/sockets/pluginproxy/ - mountPath: /var/lib/csi/sockets/pluginproxy/
name: socket-dir name: socket-dir
- name: csi-resizer - name: csi-resizer
image: {{ csi_resizer_image_repo }}:{{ csi_resizer_image_tag }} image: {{ csi_resizer_image_repo }}:{{ cinder_csi_resizer_image_tag }}
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"
@ -87,7 +89,7 @@ spec:
- name: socket-dir - name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/ mountPath: /var/lib/csi/sockets/pluginproxy/
- name: liveness-probe - name: liveness-probe
image: {{ csi_livenessprobe_image_repo }}:{{ csi_livenessprobe_image_tag }} image: {{ csi_livenessprobe_image_repo }}:{{ cinder_csi_livenessprobe_image_tag }}
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
args: args:
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"

View File

@ -14,15 +14,7 @@ rules:
- apiGroups: [""] - apiGroups: [""]
resources: ["events"] resources: ["events"]
verbs: ["get", "list", "watch", "create", "update", "patch"] verbs: ["get", "list", "watch", "create", "update", "patch"]
- apiGroups: ["snapshot.storage.k8s.io"]
resources: ["volumesnapshotclasses"]
verbs: ["get", "list", "watch"]
- apiGroups: ["snapshot.storage.k8s.io"]
resources: ["volumesnapshotcontents"]
verbs: ["get", "list", "watch"]
- apiGroups: ["snapshot.storage.k8s.io"]
resources: ["volumesnapshotcontents/status"]
verbs: ["update"]
--- ---
kind: ClusterRoleBinding kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1

View File

@ -15,6 +15,8 @@ spec:
labels: labels:
app: csi-cinder-nodeplugin app: csi-cinder-nodeplugin
spec: spec:
tolerations:
- operator: Exists
serviceAccountName: csi-cinder-node-sa serviceAccountName: csi-cinder-node-sa
hostNetwork: true hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet

View File

@ -359,8 +359,8 @@ snapshot_controller_supported_versions:
snapshot_controller_image_repo: "{{ kube_image_repo }}/sig-storage/snapshot-controller" snapshot_controller_image_repo: "{{ kube_image_repo }}/sig-storage/snapshot-controller"
snapshot_controller_image_tag: "{{ snapshot_controller_supported_versions[kube_major_version] }}" snapshot_controller_image_tag: "{{ snapshot_controller_supported_versions[kube_major_version] }}"
cinder_csi_plugin_version: "v1.22.0" cinder_csi_plugin_version: "v1.29.0"
cinder_csi_plugin_image_repo: "{{ docker_image_repo }}/k8scloudprovider/cinder-csi-plugin" cinder_csi_plugin_image_repo: "{{ kube_image_repo }}/provider-os/cinder-csi-plugin"
cinder_csi_plugin_image_tag: "{{ cinder_csi_plugin_version }}" cinder_csi_plugin_image_tag: "{{ cinder_csi_plugin_version }}"
aws_ebs_csi_plugin_version: "v0.5.0" aws_ebs_csi_plugin_version: "v0.5.0"