generated changes

Signed-off-by: Kaustav Majumder <[email protected]>

controllers/storageconsumer/consumer_test.go

@@ -19,6 +19,9 @@ package controllers
 import (
 	"testing"
 
+	noobaaApis "github.com/noobaa/noobaa-operator/v5/pkg/apis"
+	"github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1"
+	routev1 "github.com/openshift/api/route/v1"
 	v1 "github.com/red-hat-storage/ocs-operator/api/v4/v1"
 	ocsv1alpha1 "github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1"
 	"github.com/red-hat-storage/ocs-operator/v4/controllers/util"
@@ -46,7 +49,15 @@ func createFakeScheme(t *testing.T) *runtime.Scheme {
 
 	err = rookCephv1.AddToScheme(scheme)
 	if err != nil {
-		assert.Fail(t, "failed to add rookCephv1scheme")
+		assert.Fail(t, "failed to add rookCephv1 scheme")
+	}
+	err = routev1.AddToScheme(scheme)
+	if err != nil {
+		assert.Fail(t, "failed to add routev1 scheme")
+	}
+	err = noobaaApis.AddToScheme(scheme)
+	if err != nil {
+		assert.Fail(t, "failed to add nbapis scheme")
 	}
 
 	return scheme
@@ -91,6 +102,14 @@ func TestCephName(t *testing.T) {
 					Phase: "Ready",
 				},
 			},
+			Client: ocsv1alpha1.ClientStatus{
+				ClusterID: "consumer",
+			},
+		},
+	}
+	r.noobaaAccount = &v1alpha1.NooBaaAccount{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "consumer-acc",
 		},
 	}
 	_, err := r.reconcilePhases()
@@ -141,6 +160,12 @@ func TestCephName(t *testing.T) {
 			},
 		},
 	}
+	r.noobaaAccount = &v1alpha1.NooBaaAccount{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "consumer-acc",
+		},
+	}
+
 	_, err = r.reconcilePhases()
 	assert.NoError(t, err)
 

controllers/storageconsumer/storageconsumer_controller.go

@@ -21,9 +21,11 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"encoding/json"
+	"fmt"
 
 	"github.com/go-logr/logr"
 	"github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1"
+	"github.com/red-hat-storage/ocs-operator/v4/controllers/util"
 	rookCephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -36,6 +38,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
+	nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1"
 	ocsv1alpha1 "github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
@@ -59,12 +62,14 @@ type StorageConsumerReconciler struct {
 	storageConsumer         *ocsv1alpha1.StorageConsumer
 	cephClientHealthChecker *rookCephv1.CephClient
 	namespace               string
+	noobaaAccount           *nbv1.NooBaaAccount
 }
 
 //+kubebuilder:rbac:groups=ocs.openshift.io,resources=storageconsumers,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=ceph.rook.io,resources=cephclients,verbs=get;list;watch;create;update;delete
 //+kubebuilder:rbac:groups=ocs.openshift.io,resources=storageconsumers/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=ocs.openshift.io,resources=storagerequests,verbs=get;list;
+// +kubebuilder:rbac:groups=noobaa.io,resources=noobaaaccounts,verbs=get;list;watch;create;update;delete
 
 // Reconcile reads that state of the cluster for a StorageConsumer object and makes changes based on the state read
 // and what is in the StorageConsumer.Spec
@@ -127,6 +132,10 @@ func (r *StorageConsumerReconciler) initReconciler(request reconcile.Request) {
 	r.cephClientHealthChecker = &rookCephv1.CephClient{}
 	r.cephClientHealthChecker.Name = GenerateHashForCephClient(r.storageConsumer.Name, "global")
 	r.cephClientHealthChecker.Namespace = r.namespace
+
+	r.noobaaAccount = &nbv1.NooBaaAccount{}
+	r.noobaaAccount.Name = "noobaa-remote-" + r.storageConsumer.Name
+	r.noobaaAccount.Namespace = r.storageConsumer.Namespace
 }
 
 func (r *StorageConsumerReconciler) reconcilePhases() (reconcile.Result, error) {
@@ -145,6 +154,10 @@ func (r *StorageConsumerReconciler) reconcilePhases() (reconcile.Result, error)
 			return reconcile.Result{}, err
 		}
 
+		if err := r.reconcileNoobaaAccount(); err != nil {
+			return reconcile.Result{}, err
+		}
+
 		cephResourcesReady := true
 		for _, cephResource := range r.storageConsumer.Status.CephResources {
 			if cephResource.Phase != "Ready" {
@@ -205,6 +218,25 @@ func (r *StorageConsumerReconciler) reconcileCephClientHealthChecker() error {
 	return nil
 }
 
+func (r *StorageConsumerReconciler) reconcileNoobaaAccount() error {
+	_, err := ctrl.CreateOrUpdate(r.ctx, r.Client, r.noobaaAccount, func() error {
+		if err := r.own(r.noobaaAccount); err != nil {
+			return err
+		}
+		// the following annotation will enable noobaa-operator to create a auth_token secret based on this account
+		util.AddAnnotation(r.noobaaAccount, "remote-operator", "true")
+		return nil
+	})
+	if err != nil {
+		return fmt.Errorf("failed to create noobaa account for storageConsumer %v: %v", r.storageConsumer.Name, err)
+	}
+
+	phase := string(r.noobaaAccount.Status.Phase)
+	r.setCephResourceStatus(r.noobaaAccount.Name, "NooBaaAccount", phase, nil)
+
+	return nil
+}
+
 func (r *StorageConsumerReconciler) setCephResourceStatus(name string, kind string, phase string, cephClients map[string]string) {
 	cephResourceSpec := ocsv1alpha1.CephResourcesSpec{
 		Name:        name,

deploy/ocs-operator/manifests/provider-role.yaml

@@ -68,3 +68,10 @@ rules:
   verbs:
   - get
   - list
+- apiGroups:
+  - route.openshift.io
+  resources:
+  - routes
+  verbs:
+  - get
+  - list

rbac/provider-role.yaml

@@ -68,15 +68,6 @@ rules:
   verbs:
   - get
   - list
-- apiGroups:
-  - noobaa.io
-  resources:
-  - noobaaaccounts
-  verbs:
-  - get
-  - list
-  - create
-  - delete
 - apiGroups:
   - route.openshift.io
   resources:

services/provider/server/consumer.go

@@ -4,12 +4,9 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"strings"
 	"sync"
 
-	nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1"
 	ocsv1alpha1 "github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1"
-	"github.com/red-hat-storage/ocs-operator/v4/controllers/util"
 	ifaces "github.com/red-hat-storage/ocs-operator/v4/services/provider/interfaces"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -229,47 +226,3 @@ func (c *ocsConsumerManager) UpdateConsumerStatus(ctx context.Context, id string
 	klog.Infof("successfully updated Status for StorageConsumer %v", consumerObj.Name)
 	return nil
 }
-
-func (c *ocsConsumerManager) CreateNoobaaAccount(ctx context.Context, id string) error {
-
-	consumerObj, err := c.Get(ctx, id)
-	if err != nil {
-		return err
-	}
-	consumerClusterID := strings.TrimPrefix(consumerObj.Name, "storageconsumer-")
-	if consumerClusterID != "" && len(consumerClusterID) == 0 {
-		return fmt.Errorf("failed to get clusterID from consumerResource Name: %s %v", consumerObj.Name, err)
-	}
-
-	noobaaAccountName := fmt.Sprintf("noobaa-remote-%s", consumerClusterID)
-	nbAccountObj := &nbv1.NooBaaAccount{}
-	nbAccountObj.Name = noobaaAccountName
-	nbAccountObj.Namespace = consumerObj.Namespace
-	// the following annotation will enable noobaa-operator to create a auth_token secret based on this account
-	util.AddAnnotation(nbAccountObj, "remote-operator", "true")
-
-	err = c.client.Create(ctx, nbAccountObj)
-	if err != nil {
-		return fmt.Errorf("failed to create noobaa account for storageConsumer %v: %v", consumerObj.Name, err)
-	}
-	return nil
-}
-
-func (c *ocsConsumerManager) DeleteNoobaaAccount(ctx context.Context, id string) error {
-	consumerObj, err := c.Get(ctx, id)
-	if err != nil {
-		return err
-	}
-	clusterID := strings.TrimPrefix(consumerObj.Name, "storageconsumer-")
-	if clusterID != "" && len(clusterID) == 0 {
-		return fmt.Errorf("failed to get clusterID from consumerResource Name: %s %v", consumerObj.Name, err)
-	}
-	noobaaAccountName := fmt.Sprintf("noobaa-remote-%s", clusterID)
-	nbAccountObj := &nbv1.NooBaaAccount{}
-	nbAccountObj.Name = noobaaAccountName
-	nbAccountObj.Namespace = consumerObj.Namespace
-	if err := c.client.Delete(ctx, nbAccountObj); err != nil {
-		return fmt.Errorf("failed to delete Noobaa account %q. %v", nbAccountObj.Name, err)
-	}
-	return nil
-}

services/provider/server/server.go

@@ -19,7 +19,6 @@ import (
 	"time"
 
 	"github.com/blang/semver/v4"
-	nbapis "github.com/noobaa/noobaa-operator/v5/pkg/apis"
 	nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1"
 	quotav1 "github.com/openshift/api/quota/v1"
 	routev1 "github.com/openshift/api/route/v1"
@@ -151,10 +150,6 @@ func (s *OCSProviderServer) AcknowledgeOnboarding(ctx context.Context, req *pb.A
 		}
 		return nil, status.Errorf(codes.Internal, "Failed to update the storageConsumer. %v", err)
 	}
-	// create noobaa account CR
-	if err := s.consumerManager.CreateNoobaaAccount(ctx, req.StorageConsumerUUID); err != nil {
-		return nil, status.Errorf(codes.Internal, "Failed to create noobaa account for storageconsumer. %v", err)
-	}
 	return &pb.AcknowledgeOnboardingResponse{}, nil
 }
 
@@ -194,12 +189,7 @@ func (s *OCSProviderServer) GetStorageConfig(ctx context.Context, req *pb.Storag
 
 // OffboardConsumer RPC call to delete the StorageConsumer CR
 func (s *OCSProviderServer) OffboardConsumer(ctx context.Context, req *pb.OffboardConsumerRequest) (*pb.OffboardConsumerResponse, error) {
-	// remove noobaa account
-	err := s.consumerManager.DeleteNoobaaAccount(ctx, req.StorageConsumerUUID)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to delete noobaaAccount resource with the provided UUID. %v", err)
-	}
-	err = s.consumerManager.Delete(ctx, req.StorageConsumerUUID)
+	err := s.consumerManager.Delete(ctx, req.StorageConsumerUUID)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to delete storageConsumer resource with the provided UUID. %v", err)
 	}
@@ -257,10 +247,6 @@ func newClient() (client.Client, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to add routev1 to scheme. %v", err)
 	}
-	err = nbapis.AddToScheme(scheme)
-	if err != nil {
-		return nil, fmt.Errorf("failed to add nbapis to scheme. %v", err)
-	}
 
 	config, err := config.GetConfig()
 	if err != nil {
@@ -435,26 +421,25 @@ func (s *OCSProviderServer) getExternalResources(ctx context.Context, consumerRe
 	}
 
 	// Fetch noobaa remote secret and management address and append to extResources
+	consumerName := consumerResource.Name
 	noobaaOperatorSecret := &v1.Secret{}
-	clusterID := strings.TrimPrefix(consumerResource.Name, "storageconsumer-")
-	if clusterID != "" && len(clusterID) == 0 {
-		return nil, fmt.Errorf("failed to get clusterID from consumerResource Name: %s %v", consumerResource.Name, err)
-	}
+	noobaaOperatorSecret.Name = fmt.Sprintf("noobaa-account-%s", consumerName)
+	noobaaOperatorSecret.Namespace = s.namespace
 
-	noobaaOperatorSecretName := fmt.Sprintf("noobaa-remote-join-secret-%s", clusterID)
-	err = s.client.Get(ctx, types.NamespacedName{Name: noobaaOperatorSecretName, Namespace: s.namespace}, noobaaOperatorSecret)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get %s secret. %v", noobaaOperatorSecretName, err)
+	if err := s.client.Get(ctx, client.ObjectKeyFromObject(noobaaOperatorSecret), noobaaOperatorSecret); err != nil {
+		return nil, fmt.Errorf("failed to get %s secret. %v", noobaaOperatorSecret.Name, err)
 	}
 
 	authToken, ok := noobaaOperatorSecret.Data["auth_token"]
 	if !ok || len(authToken) == 0 {
-		return nil, fmt.Errorf("auth_token not found in %s secret", noobaaOperatorSecretName)
+		return nil, fmt.Errorf("auth_token not found in %s secret", noobaaOperatorSecret.Name)
 	}
 
 	noobaMgmtRoute := &routev1.Route{}
-	err = s.client.Get(ctx, types.NamespacedName{Name: "noobaa-mgmt", Namespace: s.namespace}, noobaMgmtRoute)
-	if err != nil {
+	noobaMgmtRoute.Name = "noobaa-mgmt"
+	noobaMgmtRoute.Namespace = s.namespace
+
+	if err = s.client.Get(ctx, client.ObjectKeyFromObject(noobaMgmtRoute), noobaMgmtRoute); err != nil {
 		return nil, fmt.Errorf("failed to get noobaa-mgmt route. %v", err)
 	}
 	if noobaMgmtRoute.Status.Ingress == nil || len(noobaMgmtRoute.Status.Ingress) == 0 {
@@ -465,27 +450,23 @@ func (s *OCSProviderServer) getExternalResources(ctx context.Context, consumerRe
 	if noobaaMgmtAddress == "" {
 		return nil, fmt.Errorf("no Host found in noobaa-mgmt route Ingress")
 	}
-	joinSecret := &corev1.Secret{
-		Data: map[string][]byte{
-			"auth_token": authToken,
-			"mgmt_addr":  []byte(noobaaMgmtAddress),
-		},
-	}
 	extR = append(extR, &pb.ExternalResource{
 		Name: "noobaa-remote-join-secret",
 		Kind: "Secret",
-		Data: mustMarshal(joinSecret),
+		Data: mustMarshal(map[string][]byte{
+			"auth_token": authToken,
+			"mgmt_addr":  []byte(noobaaMgmtAddress),
+		}),
 	})
 
-	noobaaSpec := &nbv1.NooBaaSpec{
-		JoinSecret: &v1.SecretReference{
-			Name: "noobaa-remote-join-secret",
-		},
-	}
 	extR = append(extR, &pb.ExternalResource{
 		Name: "noobaa-remote",
 		Kind: "Noobaa",
-		Data: mustMarshal(noobaaSpec),
+		Data: mustMarshal(&nbv1.NooBaaSpec{
+			JoinSecret: &v1.SecretReference{
+				Name: "noobaa-remote-join-secret",
+			},
+		}),
 	})
 	return extR, nil
 }