Update rook-ceph kubernetes deployment for k8s 1.15

[infra/stack/kubernetes.git] / apps / ceph / kubespray / playbooks / roles / install / templates / storageclass.yaml.j2

diff --git a/apps/ceph/kubespray/playbooks/roles/install/templates/storageclass.yaml.j2 b/apps/ceph/kubespray/playbooks/roles/install/templates/storageclass.yaml.j2
index 21ada264d7f8ea3f8d6366cd35593df5ebc20293..41e94345c362d139f67ccf9b36df03f324c023fb 100644 (file)
--- a/apps/ceph/kubespray/playbooks/roles/install/templates/storageclass.yaml.j2
+++ b/apps/ceph/kubespray/playbooks/roles/install/templates/storageclass.yaml.j2
@@ -22,19 +22,17 @@ metadata:
   name: "{{ rook_block_storage_name }}"
   annotations:
     storageclass.kubernetes.io/is-default-class: "true"
-provisioner: ceph.rook.io/block
+provisioner: "{{ rook_namespace }}.rbd.csi.ceph.com"
 # Works for Kubernetes 1.14+
 allowVolumeExpansion: true
 parameters:
-  blockPool: "{{ rook_block_pool_name }}"
-  # Specify the namespace of the rook cluster from which to create volumes.
-  # If not specified, it will use `rook` as the default namespace of the cluster.
-  # This is also the namespace where the cluster will be
-  clusterNamespace: "{{ rook_namespace }}"
+  pool: "{{ rook_block_pool_name }}"
+  clusterID: "{{ rook_namespace }}"
   # Specify the filesystem type of the volume. If not specified, it will use `ext4`.
-  fstype: "{{ rook_block_storage_fs }}"
-  # (Optional) Specify an existing Ceph user that will be used for mounting storage with this StorageClass.
-  #mountUser: user1
-  # (Optional) Specify an existing Kubernetes secret name containing just one key holding the Ceph user secret.
-  # The secret must exist in each namespace(s) where the storage will be consumed.
-  #mountSecret: ceph-user1-secret
+  csi.storage.k8s.io/fstype: "{{ rook_block_storage_fs }}"
+  csi.storage.k8s.io/provisioner-secret-name: "rook-csi-rbd-provisioner"
+  csi.storage.k8s.io/provisioner-secret-namespace: "{{ rook_namespace }}"
+  csi.storage.k8s.io/controller-expand-secret-name: "rook-csi-rbd-provisioner"
+  csi.storage.k8s.io/controller-expand-secret-namespace: "{{ rook_namespace }}"
+  csi.storage.k8s.io/node-stage-secret-name: "rook-csi-rbd-node"
+  csi.storage.k8s.io/node-stage-secret-namespace: "{{ rook_namespace }}"