Merge pull request ceph#57 from red-hat-storage/sync_ds--main

Syncing latest changes from main for cephcsi-operator

Makefile.Downstream.mk

@@ -21,7 +21,7 @@ SKIP_RANGE ?=
 
 # The default version of the bundle (CSV) can be found in
 # config/manifests/bases/cephcsi-operator.clusterserviceversion.yaml
-BUNDLE_VERSION ?= 4.17.0
+BUNDLE_VERSION ?= 4.18.0
 
 # DEFAULT_CHANNEL defines the default channel used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g DEFAULT_CHANNEL = "stable")

bundle/manifests/cephcsi-operator.clusterserviceversion.yaml

@@ -4,12 +4,12 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Basic Install
-    createdAt: "2024-11-11T08:52:44Z"
+    createdAt: "2024-11-12T15:12:45Z"
     olm.skipRange: ""
     operators.operatorframework.io/builder: operator-sdk-v1.34.1
     operators.operatorframework.io/operator-type: non-standalone
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
-  name: cephcsi-operator.v4.17.0
+  name: cephcsi-operator.v4.18.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1004,4 +1004,4 @@ spec:
   maturity: alpha
   provider:
     name: CephCSI Community
-  version: 4.17.0
+  version: 4.18.0

docs/design/hostNetwork.md

@@ -0,0 +1,45 @@
+# Enabling host networking for controller plugin pods
+
+By default, the Ceph-CSI controller plugins operate on the pod network
+but under some circumstances, like setups with a dedicated storage network, 
+where the pod network cannot connect to the ceph cluster,
+it is necessary to run the Ceph-CSI controller plugin pods on the host network.
+
+This document describes how the ceph-csi-operator can be configured to enforce the use of host network
+in the Ceph-CSI controller plugin pods
+
+The use of host networking can be enabled for a driver's controller plugin by setting `hostNetwork` to `true`in the `ControllerPlugin` section of the corresponding Driver CR.
+
+The `hostNetwork` setting is also available in the `driverSpecDefaults.controllerPlugin` section
+of the `OperatorConfig` CR. As this is a default for all Ceph-CSI controller plugins created by the operator, the setting
+in concrete Driver CRs will take precedence.
+
+There is currently no means of enforcing the use of host networking on all controller plugins against `Driver` CR settings.
+
+Example:
+
+## OperatorConfig CR
+
+```yaml
+kind: OperatorConfig 
+apiVersion: csi.ceph.io/v1alpha1
+metadata:
+  name: ceph-csi-operator-config
+  namespace: <operator-namespace>
+spec:
+   driverSpecDefaults:
+     controllerPlugin:
+       hostNetwork: true
+```
+## Driver CR
+
+```yaml
+apiVersion: csi.ceph.io/v1alpha1
+kind: Driver
+metadata:
+  name: rbd.csi.ceph.com
+  namespace: <operator-namespace> 
+spec:
+   controllerPlugin:
+     hostNetwork: false
+```