From c70b3fce5ad94bc9551c17c02aff5c1bff26766c Mon Sep 17 00:00:00 2001
From: Chinasubbareddy Mallavarapu <cr3938@att.com>
Date: Tue, 27 Jul 2021 18:22:10 +0000
Subject: [PATCH] [ceph-provisioner] Add ceph mon v2 port for ceph csi
 provisioner

This is to update ceph mon port from v1 to v2 for csi based rbd plugin.
also update cephcsi image to 3.4.0.

Change-Id: Ib6153730216dbd5a8d2f3f7b7dd0e88c7fd4389d
---
 ceph-provisioners/Chart.yaml                       | 2 +-
 ceph-provisioners/templates/configmap-etc-csi.yaml | 2 +-
 ceph-provisioners/values.yaml                      | 2 +-
 releasenotes/notes/ceph-provisioners.yaml          | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ceph-provisioners/Chart.yaml b/ceph-provisioners/Chart.yaml
index c80d16e9e0..777a19c73e 100644
--- a/ceph-provisioners/Chart.yaml
+++ b/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
 ...
diff --git a/ceph-provisioners/templates/configmap-etc-csi.yaml b/ceph-provisioners/templates/configmap-etc-csi.yaml
index 8ecc362c4e..fa778d60ec 100644
--- a/ceph-provisioners/templates/configmap-etc-csi.yaml
+++ b/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 -}}
 
diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml
index b4ab0a9d28..3defaed4f9 100644
--- a/ceph-provisioners/values.yaml
+++ b/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:
diff --git a/releasenotes/notes/ceph-provisioners.yaml b/releasenotes/notes/ceph-provisioners.yaml
index 0051958762..1fed15e089 100644
--- a/releasenotes/notes/ceph-provisioners.yaml
+++ b/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
 ...