Merge "[ceph-provisioner] Add ceph mon v2 port for ceph csi provisioner"

ceph-provisioners/Chart.yaml

@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Provisioner
 name: ceph-provisioners
-version: 0.1.11
+version: 0.1.12
 home: https://github.com/ceph/ceph
 ...

ceph-provisioners/templates/configmap-etc-csi.yaml

@@ -20,7 +20,7 @@ limitations under the License.
 {{- if and (.Values.deployment.ceph) (.Values.deployment.csi_rbd_provisioner) }}
 
 {{- if empty .Values.conf.ceph.global.mon_host -}}
-{{- $monHost := tuple "ceph_mon" "internal" "mon" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
+{{- $monHost := tuple "ceph_mon" "internal" "mon_msgr2" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
 {{- $_ := $monHost | set .Values.conf.ceph.global "mon_host" -}}
 {{- end -}}
 

ceph-provisioners/values.yaml

@@ -39,7 +39,7 @@ images:
     csi_attacher: 'quay.io/k8scsi/csi-attacher:v2.1.1'
     csi_resizer: 'quay.io/k8scsi/csi-resizer:v0.4.0'
     csi_registrar: 'quay.io/k8scsi/csi-node-driver-registrar:v1.2.0'
-    cephcsi: 'quay.io/cephcsi/cephcsi:v3.1.0'
+    cephcsi: 'quay.io/cephcsi/cephcsi:v3.4.0'
     dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0'
     image_repo_sync: 'docker.io/library/docker:17.07.0'
   local_registry:

releasenotes/notes/ceph-provisioners.yaml

@@ -11,4 +11,5 @@ ceph-provisioners:
   - 0.1.8 Enable Ceph CSI Provisioner to Stand Alone
   - 0.1.10 Add check for empty ceph endpoint
   - 0.1.11 Limit Ceph Provisioner Container Security Contexts
+  - 0.1.12 Add ceph mon v2 port for ceph csi provisioner
 ...