Add Manila CSI

openshift · Oct 29, 2024 · 99e0346 · 99e0346
1 parent bfef53a
commit 99e0346
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/control-plane-operator/controllers/hostedcontrolplane/storage/assets/role.yaml b/control-plane-operator/controllers/hostedcontrolplane/storage/assets/role.yaml
@@ -15,6 +15,8 @@ rules:
     resources:
       - deployments
       - replicasets
+      - daemonsets
+      - statefulsets
     verbs:
       - '*'
   - apiGroups:
@@ -33,6 +35,7 @@ rules:
       - endpoints
       - events
       - secrets
+      - persistentvolumeclaims
     verbs:
       - '*'
   - apiGroups:
@@ -64,3 +67,9 @@ rules:
       - watch
       - list
       - get
+  - apiGroups:
+    - ""
+    resources:
+    - namespaces
+    verbs:
+    - get
diff --git a/control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go b/control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go
@@ -2422,7 +2422,6 @@ func (r *reconciler) reconcileStorage(ctx context.Context, hcp *hyperv1.HostedCo
 		log.Info("reconciled CSISnapshotController")
 	}
 
-
 	storageCR := manifests.Storage()
 	if _, err := r.CreateOrUpdate(ctx, r.client, storageCR, func() error {
 		storage.ReconcileStorage(storageCR)
@@ -2433,14 +2432,12 @@ func (r *reconciler) reconcileStorage(ctx context.Context, hcp *hyperv1.HostedCo
 		log.Info("reconciled Storage")
 	}
 
-
 	var driverNames []operatorv1.CSIDriverName
 	switch hcp.Spec.Platform.Type {
 	case hyperv1.AWSPlatform:
 		driverNames = []operatorv1.CSIDriverName{operatorv1.AWSEBSCSIDriver}
 	case hyperv1.OpenStackPlatform:
-		// TODO(stephenfin): Add Manila here once it supports Hypershift
-		driverNames = []operatorv1.CSIDriverName{operatorv1.CinderCSIDriver}
+		driverNames = []operatorv1.CSIDriverName{operatorv1.CinderCSIDriver, operatorv1.ManilaCSIDriver}
 	}
 	for _, driverName := range driverNames {
 		driver := manifests.ClusterCSIDriver(driverName)

diff --git a/hypershift-operator/controllers/hostedcluster/internal/platform/openstack/openstack.go b/hypershift-operator/controllers/hostedcluster/internal/platform/openstack/openstack.go
@@ -278,11 +278,16 @@ func (a OpenStack) ReconcileCredentials(ctx context.Context, c client.Client, cr
 	if err := a.reconcileOpenStackCredentialsSecret(ctx, c, createOrUpdate, hcluster, controlPlaneNamespace, "cloud-network-config-controller-creds"); err != nil {
 		return err
 	}
-	// Sync CSI driver secret
+	// Sync Cinder CSI driver secret
 	if err := a.reconcileOpenStackCredentialsSecret(ctx, c, createOrUpdate, hcluster, controlPlaneNamespace, "openstack-cloud-credentials"); err != nil {
 		return err
 	}
 
+	// Sync Manila CSI driver secret
+	if err := a.reconcileOpenStackCredentialsSecret(ctx, c, createOrUpdate, hcluster, controlPlaneNamespace, "manila-cloud-credentials"); err != nil {
+		return err
+	}
+
 	return nil
 }