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

rbd: update rbd sc for topology provisioning #2531

Merged
merged 1 commit into from
Mar 27, 2024

Conversation

parth-gr
Copy link
Member

with new fix at csi ceph/ceph-csi#4459 we dont need the pool parameter dependency from the storageclass So removing it

@parth-gr
Copy link
Member Author

/cc @malayparida2000 @Madhu-1

Copy link
Member

@Madhu-1 Madhu-1 left a comment

Choose a reason for hiding this comment

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

LGTM, please test the changes to ensure it works as expected

@parth-gr
Copy link
Member Author

Rook Pr should get merged first rook/rook#13977, as it has the json changes

Copy link
Contributor

@malayparida2000 malayparida2000 left a comment

Choose a reason for hiding this comment

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

/lgtm
Please ensure testing this before merge.

cc @iamniting

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

@iamniting iamniting left a comment

Choose a reason for hiding this comment

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

/hold

@parth-gr adding a hold for testing pls remove it once you are done with the testing.

Also pls look at the external cluster case as well.

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 26, 2024
@parth-gr
Copy link
Member Author

There is a bug for internal mode, adding a fix in second commit
Tested:

parameters:
  clusterID: openshift-storage
  csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner
  csi.storage.k8s.io/controller-expand-secret-namespace: openshift-storage
  csi.storage.k8s.io/fstype: ext4
  csi.storage.k8s.io/node-stage-secret-name: rook-csi-rbd-node
  csi.storage.k8s.io/node-stage-secret-namespace: openshift-storage
  csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
  csi.storage.k8s.io/provisioner-secret-namespace: openshift-storage
  imageFeatures: layering,deep-flatten,exclusive-lock,object-map,fast-diff
  imageFormat: "2"
  topologyConstrainedPools: |-
    [
      {
        "poolName": "ocs-storagecluster-cephblockpool-rack0",
        "domainSegments": [
          {
            "domainLabel": "rack",
            "value": "rack0"
          }
        ]
      },
      {
        "poolName": "ocs-storagecluster-cephblockpool-rack1",
        "domainSegments": [
          {
            "domainLabel": "rack",
            "value": "rack1"
          }
        ]
      },
      {
        "poolName": "ocs-storagecluster-cephblockpool-rack2",
        "domainSegments": [
          {
            "domainLabel": "rack",
            "value": "rack2"
          }
        ]
      }
    ]

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 27, 2024
@parth-gr
Copy link
Member Author

/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 27, 2024
with new fix at csi ceph/ceph-csi#4459 we dont need
the pool parameter dependency from the storageclass
So removing it

and currently the topology storageclass also checks for
the replicated cephblockpool which is not needed
so adding a check if it is topology sc then do not
check for replicated pool

Signed-off-by: parth-gr <[email protected]>
@malayparida2000
Copy link
Contributor

There is a bug for internal mode, adding a fix in second commit Tested:

parameters:
  clusterID: openshift-storage
  csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner
  csi.storage.k8s.io/controller-expand-secret-namespace: openshift-storage
  csi.storage.k8s.io/fstype: ext4
  csi.storage.k8s.io/node-stage-secret-name: rook-csi-rbd-node
  csi.storage.k8s.io/node-stage-secret-namespace: openshift-storage
  csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner
  csi.storage.k8s.io/provisioner-secret-namespace: openshift-storage
  imageFeatures: layering,deep-flatten,exclusive-lock,object-map,fast-diff
  imageFormat: "2"
  topologyConstrainedPools: |-
    [
      {
        "poolName": "ocs-storagecluster-cephblockpool-rack0",
        "domainSegments": [
          {
            "domainLabel": "rack",
            "value": "rack0"
          }
        ]
      },
      {
        "poolName": "ocs-storagecluster-cephblockpool-rack1",
        "domainSegments": [
          {
            "domainLabel": "rack",
            "value": "rack1"
          }
        ]
      },
      {
        "poolName": "ocs-storagecluster-cephblockpool-rack2",
        "domainSegments": [
          {
            "domainLabel": "rack",
            "value": "rack2"
          }
        ]
      }
    ]

Let's squash to a single commit, the bug is basically related to this only

@parth-gr
Copy link
Member Author

Done

Copy link
Contributor

@malayparida2000 malayparida2000 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 the lgtm Indicates that a PR is ready to be merged. label Mar 27, 2024
Copy link
Contributor

openshift-ci bot commented Mar 27, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iamniting, malayparida2000, parth-gr

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

@openshift-merge-bot openshift-merge-bot bot merged commit bbe9d9d into red-hat-storage:main Mar 27, 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.

4 participants