Merge pull request #48 from nb-ohad/config-reconcile

ClientProfile reconcile
ceph · Aug 2, 2024 · 70e00b8 · 70e00b8
2 parents 233fc9f + 85dda60
commit 70e00b8
Show file tree

Hide file tree

Showing 9 changed files with 402 additions and 76 deletions.
diff --git a/api/v1alpha1/cephconnection_types.go b/api/v1alpha1/cephconnection_types.go
@@ -34,7 +34,7 @@ type CephConnectionSpec struct {
 	Monitors []string `json:"monitors"`
 
 	//+kubebuilder:validation:Optional
-	ReadAffinity ReadAffinitySpec `json:"readAffinity,omitempty"`
+	ReadAffinity *ReadAffinitySpec `json:"readAffinity,omitempty"`
 
 	//+kubebuilder:validation:Optional
 	//+kubebuilder:validation:Minimum:=1

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/cmd/main.go b/cmd/main.go
@@ -129,11 +129,11 @@ func main() {
 		setupLog.Error(err, "unable to create controller", "controller", "Driver")
 		os.Exit(1)
 	}
-	if err = (&controller.ConfigReconciler{
+	if err = (&controller.ClientProfileReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
 	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "Config")
+		setupLog.Error(err, "unable to create controller", "controller", "ClientProfile")
 		os.Exit(1)
 	}
 	if err = (&controller.ClientProfileMappingReconciler{

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -9,8 +9,13 @@ rules:
   resources:
   - configmaps
   verbs:
+  - create
+  - delete
   - get
   - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - ""
   resources:
@@ -47,6 +52,15 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - csi.ceph.io
+  resources:
+  - cephconnections
+  verbs:
+  - get
+  - list
+  - update
+  - watch
 - apiGroups:
   - csi.ceph.io
   resources:
@@ -76,7 +90,7 @@ rules:
 - apiGroups:
   - csi.ceph.io
   resources:
-  - configs
+  - clientprofiles
   verbs:
   - create
   - delete
@@ -88,13 +102,13 @@ rules:
 - apiGroups:
   - csi.ceph.io
   resources:
-  - configs/finalizers
+  - clientprofiles/finalizers
   verbs:
   - update
 - apiGroups:
   - csi.ceph.io
   resources:
-  - configs/status
+  - clientprofiles/status
   verbs:
   - get
   - patch