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.

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

use ROOK_CSI_DISABLE_DRIVER for disabling CSI in provider mode #2530

Merged

Conversation

leelavg
Copy link
Contributor

@leelavg leelavg commented Mar 26, 2024

when ocs is running in provider mode ocs-client-operator manages CSI and this commit adds a key/value for rook to make sure that rook doesn't reconcile CSI at all.

Depends on red-hat-storage/rook#600, red-hat-storage/rook#601

fixes: #2526

@leelavg
Copy link
Contributor Author

leelavg commented Mar 26, 2024

/hold

dependents should be merged first.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 26, 2024
Copy link
Member

@jarrpa jarrpa left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 26, 2024
@leelavg
Copy link
Contributor Author

leelavg commented Mar 26, 2024

Just to clarify, I did a hold as we need to first push d/s rook bundle and then reference the bundle tag in here before unholding.

@leelavg leelavg force-pushed the disable-csi-driver branch from bf998ad to 694bf3d Compare March 26, 2024 13:16
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 26, 2024
@leelavg
Copy link
Contributor Author

leelavg commented Mar 26, 2024

Referred bundle should have the changes done in this PR reflected as below (absence of old keys and presence of new key):

# p image mount quay.io/ocs-dev/rook-ceph-operator-bundle:master-50334e894
/var/lib/containers/storage/overlay/51504be6b6487ec0b5a8e9e2a87a89c2e18560a64285053179b63667eb69167c/merged

# rg 'ROOK_CSI_(ENABLE|DISABLE)' -C4 /var/lib/containers/storage/overlay/51504be6b6487ec0b5a8e9e2a87a89c2e18560a64285053179b63667eb69167c/merged
/var/lib/containers/storage/overlay/51504be6b6487ec0b5a8e9e2a87a89c2e18560a64285053179b63667eb69167c/merged/manifests/rook-ceph-operator.clusterserviceversion.yaml
2999-                        valueFrom:
3000-                          configMapKeyRef:
3001-                            key: CSI_TOPOLOGY_DOMAIN_LABELS
3002-                            name: ocs-operator-config
3003:                      - name: ROOK_CSI_ENABLE_NFS
3004-                        valueFrom:
3005-                          configMapKeyRef:
3006:                            key: ROOK_CSI_ENABLE_NFS
3007-                            name: ocs-operator-config
3008:                      - name: ROOK_CSI_DISABLE_DRIVER
3009-                        valueFrom:
3010-                          configMapKeyRef:
3011:                            key: ROOK_CSI_DISABLE_DRIVER
3012-                            name: ocs-operator-config
3013-                      - name: CSI_PROVISIONER_TOLERATIONS
3014-                        value: |2-
3015-

@nb-ohad
Copy link
Contributor

nb-ohad commented Mar 26, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 26, 2024
Copy link
Contributor

openshift-ci bot commented Mar 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jarrpa, leelavg, nb-ohad

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@leelavg
Copy link
Contributor Author

leelavg commented Mar 26, 2024

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 26, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 493179c into red-hat-storage:main Mar 26, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

set this new key ROOK_CSI_DISABLE_DRIVER to disable csi reconcile by rook/rook#13966
5 participants