Merge pull request #804 from openshift-cherrypick-robot/cherry-pick-8…

…03-to-release-4.18 DFBUGS-1439: [release-4.18] csv: use ROOK_CSI_ENABLE_CEPHFS in rook operator env
red-hat-storage · Jan 24, 2025 · 76a7937 · 76a7937
2 parents 9ba1bf9 + 997b996
commit 76a7937
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml b/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml
@@ -3053,6 +3053,11 @@ spec:
                           configMapKeyRef:
                             key: ROOK_CURRENT_NAMESPACE_ONLY
                             name: ocs-operator-config
+                      - name: ROOK_CSI_ENABLE_CEPHFS
+                        valueFrom:
+                          configMapKeyRef:
+                            key: ROOK_CSI_ENABLE_CEPHFS
+                            name: ocs-operator-config
                       - name: ROOK_ALLOW_MULTIPLE_FILESYSTEMS
                         value: "false"
                       - name: ROOK_LOG_LEVEL

diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml
@@ -688,6 +688,11 @@ spec:
                 configMapKeyRef:
                   key: ROOK_CURRENT_NAMESPACE_ONLY
                   name: ocs-operator-config
+            - name: ROOK_CSI_ENABLE_CEPHFS
+              valueFrom:
+                configMapKeyRef:
+                  key: ROOK_CSI_ENABLE_CEPHFS
+                  name: ocs-operator-config
             - name: ROOK_ALLOW_MULTIPLE_FILESYSTEMS
               value: "false"
             - name: ROOK_LOG_LEVEL