Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

csv: use ROOK_CSI_ENABLE_CEPHFS in rook operator env #803

Merged
merged 1 commit into from
Jan 24, 2025
Merged

csv: use ROOK_CSI_ENABLE_CEPHFS in rook operator env #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3052,6 +3052,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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems odd to mount the ocs operator config to the rook operator. Instead of mounting that configmap, what if we just set the env value directly to enabled it by default? Then the user can override it with the configmap that rook already checks.

                    - name: ROOK_CSI_ENABLE_CEPHFS
                      value: "true"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So in the case of ocs-operator deploying rook, how user automation can set the value in the rook cm?
We thought of adding it in the ocs operator configmap and then to the rook operator deployment env varibles

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same pattern we follow for ROOK_CURRENT_NAMESPACE_ONLY

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, thanks for the discussion, I see now that this is needed to pick up the downstream settings from ocs operator, and follows the same pattern of some other settings.

- name: ROOK_ALLOW_MULTIPLE_FILESYSTEMS
value: "false"
- name: ROOK_LOG_LEVEL
Expand Down
5 changes: 5 additions & 0 deletions deploy/examples/operator-openshift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading