Merge pull request #7379 from Madhu-1/disable-metrics

ceph: disable CSI GRPC metrics by default

Documentation/helm-operator.md

@@ -109,7 +109,7 @@ The following tables lists the configurable parameters of the rook-operator char
 | `csi.rbdFSGroupPolicy`             | Policy for modifying a volume's ownership or permissions when the RBD PVC is being mounted                                      | ReadWriteOnceWithFSType                                  |
 | `csi.cephFSFSGroupPolicy`          | Policy for modifying a volume's ownership or permissions when the CephFS PVC is being mounted                                   | ReadWriteOnceWithFSType                                  |
 | `csi.logLevel`                     | Set logging level for csi containers. Supported values from 0 to 5. 0 for general useful logs, 5 for trace level verbosity.    | `0`                                                       |
-| `csi.enableGrpcMetrics`            | Enable Ceph CSI GRPC Metrics.                                                                                                  | `true`                                                    |
+| `csi.enableGrpcMetrics`            | Enable Ceph CSI GRPC Metrics.                                                                                                  | `false`                                                   |
 | `csi.provisionerTolerations`       | Array of tolerations in YAML format which will be added to CSI provisioner deployment.                                         | <none>                                                    |
 | `csi.provisionerNodeAffinity`      | The node labels for affinity of the CSI provisioner deployment (***)                                                           | <none>                                                    |
 | `csi.pluginTolerations`            | Array of tolerations in YAML format which will be added to Ceph CSI plugin DaemonSet                                           | <none>                                                    |

PendingReleaseNotes.md

@@ -27,3 +27,4 @@ v1.6...
 * Enable disruption budgets (PDBs) by default for Mon, RGW, MDS, and OSD daemons
 * Add CephFilesystemMirror CRD to deploy cephfs-mirror daemon
 * Ceph OSD: as of Nautilus 14.2.14 and Octopus 15.2.9 if the OSD scenario is simple (one OSD per disk) we won't use LVM to prepare the disk anymore
+* Disable CSI GRPC metrics by default

cluster/charts/rook-ceph/values.yaml

@@ -55,7 +55,7 @@ pspEnable: true
 csi:
   enableRbdDriver: true
   enableCephfsDriver: true
-  enableGrpcMetrics: true
+  enableGrpcMetrics: false
   # set to false to disable deployment of snapshotter container in CephFS provisioner pod.
   enableCephfsSnapshotter: true
   # set to false to disable deployment of snapshotter container in RBD provisioner pod.

cluster/examples/kubernetes/ceph/operator-openshift.yaml

@@ -103,7 +103,7 @@ data:
   ROOK_CSI_ENABLE_CEPHFS: "true"
   # Enable the default version of the CSI RBD driver. To start another version of the CSI driver, see image properties below.
   ROOK_CSI_ENABLE_RBD: "true"
-  ROOK_CSI_ENABLE_GRPC_METRICS: "true"
+  ROOK_CSI_ENABLE_GRPC_METRICS: "false"
 
   # Set logging level for csi containers.
   # Supported values from 0 to 5. 0 for general useful logs, 5 for trace level verbosity.

cluster/examples/kubernetes/ceph/operator.yaml

@@ -27,7 +27,7 @@ data:
   ROOK_CSI_ENABLE_CEPHFS: "true"
   # Enable the default version of the CSI RBD driver. To start another version of the CSI driver, see image properties below.
   ROOK_CSI_ENABLE_RBD: "true"
-  ROOK_CSI_ENABLE_GRPC_METRICS: "true"
+  ROOK_CSI_ENABLE_GRPC_METRICS: "false"
 
   # Set logging level for csi containers.
   # Supported values from 0 to 5. 0 for general useful logs, 5 for trace level verbosity.

pkg/operator/ceph/csi/csi.go

@@ -77,7 +77,7 @@ func SetParams(clientset kubernetes.Interface) error {
 		return errors.Wrap(err, "unable to parse value for 'ROOK_CSI_ALLOW_UNSUPPORTED_VERSION'")
 	}
 
-	csiEnableCSIGRPCMetrics, err := k8sutil.GetOperatorSetting(clientset, controllerutil.OperatorSettingConfigMapName, "ROOK_CSI_ENABLE_GRPC_METRICS", "true")
+	csiEnableCSIGRPCMetrics, err := k8sutil.GetOperatorSetting(clientset, controllerutil.OperatorSettingConfigMapName, "ROOK_CSI_ENABLE_GRPC_METRICS", "false")
 	if err != nil {
 		return errors.Wrap(err, "unable to determine if CSI GRPC metrics is enabled")
 	}

tests/framework/installer/ceph_manifests.go

@@ -1004,7 +1004,7 @@ metadata:
 data:
   ROOK_CSI_ENABLE_CEPHFS: "true"
   ROOK_CSI_ENABLE_RBD: "true"
-  ROOK_CSI_ENABLE_GRPC_METRICS: "true"
+  ROOK_CSI_ENABLE_GRPC_METRICS: "false"
   ROOK_OBC_WATCH_OPERATOR_NAMESPACE: "true"
   CSI_LOG_LEVEL: "5"
 `