From 9bba98bf37743ae851b5d531104fe63d53539c3b Mon Sep 17 00:00:00 2001
From: marsal wang <707783088@qq.com>
Date: Thu, 13 Jan 2022 20:21:47 +0800
Subject: [PATCH] xrbd-

---
 .../templates/{ceph-conf.yaml-cancel => ceph-conf.yaml}         | 2 +-
 ceph/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml           | 2 +-
 ceph/ceph-csi-rbd/templates/provisioner-deployment.yaml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename ceph/ceph-csi-rbd/templates/{ceph-conf.yaml-cancel => ceph-conf.yaml} (93%)

diff --git a/ceph/ceph-csi-rbd/templates/ceph-conf.yaml-cancel b/ceph/ceph-csi-rbd/templates/ceph-conf.yaml
similarity index 93%
rename from ceph/ceph-csi-rbd/templates/ceph-conf.yaml-cancel
rename to ceph/ceph-csi-rbd/templates/ceph-conf.yaml
index a9a6f00..5a0d2e4 100644
--- a/ceph/ceph-csi-rbd/templates/ceph-conf.yaml-cancel
+++ b/ceph/ceph-csi-rbd/templates/ceph-conf.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ceph-config
+  name: ceph-rbd-config
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ include "ceph-csi-rbd.name" . }}
diff --git a/ceph/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml b/ceph/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml
index 422ad08..252f6d5 100644
--- a/ceph/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml
+++ b/ceph/ceph-csi-rbd/templates/nodeplugin-daemonset.yaml
@@ -197,7 +197,7 @@ spec:
             path: /lib/modules
         - name: ceph-config
           configMap:
-            name: ceph-config
+            name: ceph-rbd-config
         - name: ceph-csi-config
           configMap:
             name: {{ .Values.configMapName | quote }}
diff --git a/ceph/ceph-csi-rbd/templates/provisioner-deployment.yaml b/ceph/ceph-csi-rbd/templates/provisioner-deployment.yaml
index 86a04db..d4068ff 100644
--- a/ceph/ceph-csi-rbd/templates/provisioner-deployment.yaml
+++ b/ceph/ceph-csi-rbd/templates/provisioner-deployment.yaml
@@ -251,7 +251,7 @@ spec:
             path: /lib/modules
         - name: ceph-config
           configMap:
-            name: ceph-config
+            name: ceph-rbd-config
         - name: ceph-csi-config
           configMap:
             name: {{ .Values.configMapName | quote }}