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

ClientProfile reconcile #48

Merged
merged 4 commits into from
Aug 2, 2024
Merged

ClientProfile reconcile #48

merged 4 commits into from
Aug 2, 2024

Conversation

nb-ohad
Copy link
Collaborator

@nb-ohad nb-ohad commented Jul 21, 2024

Describe what this PR does

Initial implications for clientprofiles.csi.ceph.io controller

  • Controller validation against a cephconnection.csi.ceph.io resource
  • Shared owner logic for attached cephconnection.csi.ceph.io logic
  • Shared owner logic for Ceph CSI Config, config map
  • Reconcile a Ceph CSI Config record into the shared config map
  • Handle clean-up upon resource deletion (removal of owners, removal of configmap record, etc.)

Is there anything that requires special attention

  • PR does not include test code. Test code will be added in a new PR
  • Controller name might need to change as of pending discussion on config.csi.ceph.io name change

@nb-ohad nb-ohad requested a review from Madhu-1 July 21, 2024 21:23
@nb-ohad nb-ohad force-pushed the config-reconcile branch from 79ebd6d to 7c8203c Compare July 21, 2024 21:27
api/v1alpha1/cephcluster_types.go Outdated Show resolved Hide resolved
internal/controller/config_controller.go Show resolved Hide resolved
internal/controller/config_controller.go Outdated Show resolved Hide resolved
internal/controller/config_controller.go Outdated Show resolved Hide resolved
internal/controller/config_controller.go Outdated Show resolved Hide resolved
internal/utils/meta.go Outdated Show resolved Hide resolved
@Madhu-1
Copy link
Collaborator

Madhu-1 commented Jul 26, 2024

@nb-ohad can you please resolve merge conflicts?

@leelavg
Copy link
Contributor

leelavg commented Jul 26, 2024

can below be included in this PR?

diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml
index c26ae59..3d0a21b 100644
--- a/config/rbac/kustomization.yaml
+++ b/config/rbac/kustomization.yaml
@@ -28,3 +28,21 @@ resources:
 - operatorconfig_viewer_role.yaml
 - driver_editor_role.yaml
 - driver_viewer_role.yaml
+- csi_cephfs_ctrlplugin_clusterrole.yaml
+- csi_cephfs_ctrlplugin_clusterrole_binding.yaml
+- csi_cephfs_ctrlplugin_role.yaml
+- csi_cephfs_ctrlplugin_role_binding.yaml
+- csi_cephfs_ctrlplugin_service_account.yaml
+- csi_cephfs_nodeplugin_clusterrole.yaml
+- csi_cephfs_nodeplugin_clusterrole_binding.yaml
+- csi_cephfs_nodeplugin_service_account.yaml
+- csi_rbd_ctrlplugin_clusterrole.yaml
+- csi_rbd_ctrlplugin_clusterrole_binding.yaml
+- csi_rbd_ctrlplugin_role.yaml
+- csi_rbd_ctrlplugin_role_binding.yaml
+- csi_rbd_ctrlplugin_service_account.yaml
+- csi_rbd_nodeplugin_clusterrole.yaml
+- csi_rbd_nodeplugin_clusterrole_binding.yaml
+- csi_rbd_nodeplugin_role.yaml
+- csi_rbd_nodeplugin_role_binding.yaml
+- csi_rbd_nodeplugin_service_account.yaml

@nb-ohad nb-ohad force-pushed the config-reconcile branch from 935e0e5 to 41831b1 Compare July 29, 2024 17:39
@nb-ohad nb-ohad changed the title Config reconcile ClientProfile reconcile Jul 29, 2024
@nb-ohad nb-ohad force-pushed the config-reconcile branch 3 times, most recently from f69ca0d to ab934ce Compare July 29, 2024 20:46
@nb-ohad
Copy link
Collaborator Author

nb-ohad commented Jul 29, 2024

@Madhu-1 I am adding the hold label on this one to make sure that #65 is merged first. That PR contains a small fix for map-to-string serialization needed in the code supporting Kernal and Fuse mount options.

I cannot just rebase this PR on top of the fix PR because this PR is already rebased on top of the API changes which is not yet merged

@nb-ohad
Copy link
Collaborator Author

nb-ohad commented Jul 29, 2024

can below be included in this PR?

diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml
index c26ae59..3d0a21b 100644
--- a/config/rbac/kustomization.yaml
+++ b/config/rbac/kustomization.yaml
@@ -28,3 +28,21 @@ resources:
 - operatorconfig_viewer_role.yaml
 - driver_editor_role.yaml
 - driver_viewer_role.yaml
+- csi_cephfs_ctrlplugin_clusterrole.yaml
+- csi_cephfs_ctrlplugin_clusterrole_binding.yaml
+- csi_cephfs_ctrlplugin_role.yaml
+- csi_cephfs_ctrlplugin_role_binding.yaml
+- csi_cephfs_ctrlplugin_service_account.yaml
+- csi_cephfs_nodeplugin_clusterrole.yaml
+- csi_cephfs_nodeplugin_clusterrole_binding.yaml
+- csi_cephfs_nodeplugin_service_account.yaml
+- csi_rbd_ctrlplugin_clusterrole.yaml
+- csi_rbd_ctrlplugin_clusterrole_binding.yaml
+- csi_rbd_ctrlplugin_role.yaml
+- csi_rbd_ctrlplugin_role_binding.yaml
+- csi_rbd_ctrlplugin_service_account.yaml
+- csi_rbd_nodeplugin_clusterrole.yaml
+- csi_rbd_nodeplugin_clusterrole_binding.yaml
+- csi_rbd_nodeplugin_role.yaml
+- csi_rbd_nodeplugin_role_binding.yaml
+- csi_rbd_nodeplugin_service_account.yaml

@leelavg is this request still relevant? Aren't these changes already in main?

@leelavg
Copy link
Contributor

leelavg commented Jul 30, 2024

 is this request still relevant? Aren't these changes already in main?

  • Yep, should have been part of fixes PR that was merged. In main the manifests are defined but will not be included in the bundle unless referenced in Kustomization.yml

@nb-ohad
Copy link
Collaborator Author

nb-ohad commented Jul 30, 2024

is this request still relevant? Aren't these changes already in main?

  • Yep, should have been part of fixes PR that was merged. In main the manifests are defined but will not be included in the bundle unless referenced in Kustomization.yml

This request is out of scope of this PR. If you have the solution please provide a PR. If not please open a gitissue to track

@nb-ohad
Copy link
Collaborator Author

nb-ohad commented Jul 30, 2024

@Madhu-1
PR refreshed, hold removed.

@nb-ohad nb-ohad force-pushed the config-reconcile branch 2 times, most recently from 9aa1ac4 to 8948145 Compare July 31, 2024 11:31
@Madhu-1 Madhu-1 merged commit 70e00b8 into ceph:main Aug 2, 2024
8 checks passed
rewantsoni pushed a commit to rewantsoni/ceph-csi-operator that referenced this pull request Nov 27, 2024
Syncing latest changes from main for cephcsi-operator
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants