Merge pull request #2830 from openshift-cherrypick-robot/cherry-pick-…

…2828-to-release-4.17 Bug 2314200:[release-4.17] Ignore sending healthchecker & rook-ceph-mon secrets via storageconfig
red-hat-storage · Sep 30, 2024 · 4a5d03d · 4a5d03d
2 parents 535ef9d + c901732
commit 4a5d03d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 99 deletions.
diff --git a/services/provider/server/server.go b/services/provider/server/server.go
@@ -357,51 +357,6 @@ func (s *OCSProviderServer) getExternalResources(ctx context.Context, consumerRe
 			"MonitoringPort":     strconv.Itoa(int(port)),
 		})})
 
-	healthCheckerSecretName := ""
-	healthCheckerName := ""
-	for _, cephRes := range consumerResource.Status.CephResources {
-		if cephRes.Kind == "CephClient" {
-			clientSecretName, cephUserType, err := s.getCephClientInformation(ctx, cephRes.Name)
-			if err != nil {
-				return nil, err
-			} else if cephUserType == "healthchecker" {
-				healthCheckerSecretName = clientSecretName
-				healthCheckerName = cephRes.Name
-				break
-			}
-		}
-	}
-
-	if healthCheckerSecretName == "" {
-		return nil, fmt.Errorf("no healthchecker secret found")
-	}
-
-	cephUserSecret := &v1.Secret{}
-	err = s.client.Get(ctx, types.NamespacedName{Name: healthCheckerSecretName, Namespace: s.namespace}, cephUserSecret)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get %s secret. %v", healthCheckerSecretName, err)
-	}
-
-	extR = append(extR, &pb.ExternalResource{
-		Name: healthCheckerSecretName,
-		Kind: "Secret",
-		Data: mustMarshal(map[string]string{
-			"userID":  healthCheckerName,
-			"userKey": string(cephUserSecret.Data[healthCheckerName]),
-		}),
-	})
-
-	extR = append(extR, &pb.ExternalResource{
-		Name: monSecret,
-		Kind: "Secret",
-		Data: mustMarshal(map[string]string{
-			"fsid":          fsid,
-			"mon-secret":    "mon-secret",
-			"ceph-username": fmt.Sprintf("client.%s", healthCheckerName),
-			"ceph-secret":   string(cephUserSecret.Data[healthCheckerName]),
-		}),
-	})
-
 	if consumerResource.Spec.StorageQuotaInGiB > 0 {
 		clusterResourceQuotaSpec := &quotav1.ClusterResourceQuotaSpec{
 			Selector: quotav1.ClusterResourceQuotaSelector{

diff --git a/services/provider/server/server_test.go b/services/provider/server/server_test.go
@@ -80,16 +80,6 @@ var mockExtR = map[string]*externalResource{
 			"mapping":  "{}",
 		},
 	},
-	"rook-ceph-mon": {
-		Name: "rook-ceph-mon",
-		Kind: "Secret",
-		Data: map[string]string{
-			"ceph-username": "client.995e66248ad3e8642de868f461cdd827",
-			"fsid":          "b88c2d78-9de9-4227-9313-a63f62f78743",
-			"mon-secret":    "mon-secret",
-			"ceph-secret":   "AQADw/hhqBOcORAAJY3fKIvte++L/zYhASjYPQ==",
-		},
-	},
 	"monitoring-endpoint": {
 		Name: "monitoring-endpoint",
 		Kind: "CephCluster",
@@ -98,14 +88,7 @@ var mockExtR = map[string]*externalResource{
 			"MonitoringPort":     "9283",
 		},
 	},
-	"rook-ceph-client-995e66248ad3e8642de868f461cdd827": {
-		Name: "rook-ceph-client-995e66248ad3e8642de868f461cdd827",
-		Kind: "Secret",
-		Data: map[string]string{
-			"userID":  "995e66248ad3e8642de868f461cdd827",
-			"userKey": "AQADw/hhqBOcORAAJY3fKIvte++L/zYhASjYPQ==",
-		},
-	},
+
 	"QuotaForConsumer": {
 		Name: "QuotaForConsumer",
 		Kind: "ClusterResourceQuota",
@@ -138,13 +121,8 @@ var (
 			Namespace: serverNamespace,
 		},
 		Status: ocsv1alpha1.StorageConsumerStatus{
-			CephResources: []*ocsv1alpha1.CephResourcesSpec{
-				{
-					Name: "995e66248ad3e8642de868f461cdd827",
-					Kind: "CephClient",
-				},
-			},
-			State: ocsv1alpha1.StorageConsumerStateReady,
+			CephResources: []*ocsv1alpha1.CephResourcesSpec{},
+			State:         ocsv1alpha1.StorageConsumerStateReady,
 		},
 	}
 
@@ -263,30 +241,6 @@ func TestGetExternalResources(t *testing.T) {
 		consumerManager: consumerManager,
 	}
 
-	cephClient := &rookCephv1.CephClient{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "995e66248ad3e8642de868f461cdd827",
-			Namespace: server.namespace,
-			Annotations: map[string]string{
-				controllers.StorageCephUserTypeAnnotation: "healthchecker",
-				controllers.StorageRequestAnnotation:      "global",
-				controllers.StorageConsumerAnnotation:     "consumer",
-			},
-		},
-		Status: &rookCephv1.CephClientStatus{
-			Info: map[string]string{
-				"secretName": "rook-ceph-client-995e66248ad3e8642de868f461cdd827",
-			},
-		},
-	}
-
-	secret := &v1.Secret{
-		ObjectMeta: metav1.ObjectMeta{Name: "rook-ceph-client-995e66248ad3e8642de868f461cdd827", Namespace: server.namespace},
-		Data: map[string][]byte{
-			"995e66248ad3e8642de868f461cdd827": []byte("AQADw/hhqBOcORAAJY3fKIvte++L/zYhASjYPQ=="),
-		},
-	}
-
 	noobaaRemoteJoinSecretConsumer := &v1.Secret{
 		ObjectMeta: metav1.ObjectMeta{Name: "noobaa-account-consumer", Namespace: server.namespace},
 		Data: map[string][]byte{
@@ -308,9 +262,6 @@ func TestGetExternalResources(t *testing.T) {
 		},
 	}
 
-	assert.NoError(t, client.Create(ctx, cephClient))
-	assert.NoError(t, client.Create(ctx, secret))
-
 	assert.NoError(t, client.Create(ctx, noobaaRemoteJoinSecretConsumer))
 	assert.NoError(t, client.Create(ctx, noobaaRemoteJoinSecretConsumer6))
 	assert.NoError(t, client.Create(ctx, noobaaMgmtRoute))
@@ -397,8 +348,8 @@ func TestGetExternalResources(t *testing.T) {
 	// When ocsv1alpha1.StorageConsumerStateReady but ceph resources is empty
 	req.StorageConsumerUUID = string(consumerResource5.UID)
 	storageConRes, err = server.GetStorageConfig(ctx, &req)
-	assert.Error(t, err)
-	assert.Nil(t, storageConRes)
+	assert.NoError(t, err)
+	assert.NotNil(t, storageConRes)
 
 	// When ocsv1alpha1.StorageConsumerStateReady but secret is not ready
 	for _, i := range consumerResource.Status.CephResources {