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.

Sign up for GitHub

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

Ignore sending healthchecker & rook-ceph-mon secrets via storageconfig #2828

Merged
merged 1 commit into from
Sep 30, 2024
Merged

Ignore sending healthchecker & rook-ceph-mon secrets via storageconfig #2828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions services/provider/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,51 +363,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{
Expand Down
59 changes: 5 additions & 54 deletions services/provider/server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,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",
Expand All @@ -97,14 +87,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",
Expand Down Expand Up @@ -137,13 +120,8 @@ var (
Namespace: serverNamespace,
},
Status: ocsv1alpha1.StorageConsumerStatus{
CephResources: []*ocsv1alpha1.CephResourcesSpec{
{
Name: "995e66248ad3e8642de868f461cdd827",
Kind: "CephClient",
},
},
State: ocsv1alpha1.StorageConsumerStateReady,
CephResources: []*ocsv1alpha1.CephResourcesSpec{},
State: ocsv1alpha1.StorageConsumerStateReady,
},
}

Expand Down Expand Up @@ -262,30 +240,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{
Expand All @@ -307,9 +261,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))
Expand Down Expand Up @@ -396,8 +347,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)
Comment on lines +350 to +351
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should not have these changes, please remove secrets from this file related to monitor and health checker

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the current change since the health checker and monitor secrets are not getting created , the test condition when StorageConsumerState is ready it need not have cephresources and can be empty. It should not return an error and the storageconfig should not be empty

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we need to remove those as well as a follow-up but not a must-have for now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tracking in this #2829


// When ocsv1alpha1.StorageConsumerStateReady but secret is not ready
for _, i := range consumerResource.Status.CephResources {
Expand Down
Loading