From 84ff31be157a76bdf4c9f6b034d93b3f459101bb Mon Sep 17 00:00:00 2001 From: Leela Venkaiah G Date: Mon, 18 Mar 2024 12:44:31 +0530 Subject: [PATCH] add suffix for external ceph client secret name during gRPC response when provider & client are running in same namespace the cephclient secret name clashes and as the contents will be different we'll add a suffix ".csi" to the secret which wll be managed by client. Signed-off-by: Leela Venkaiah G --- services/provider/server/server.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/provider/server/server.go b/services/provider/server/server.go index 4c9b4ebbd8..fd2be28f9f 100644 --- a/services/provider/server/server.go +++ b/services/provider/server/server.go @@ -570,7 +570,10 @@ func (s *OCSProviderServer) GetStorageClassClaimConfig(ctx context.Context, req keyProp = "adminKey" } extR = append(extR, &pb.ExternalResource{ - Name: clientSecretName, + // a common suffix '.csi' is being added to distinguish secrets that are created + // by ocs-client-operator vs rook-operator when both these operators are deployed in same namespace + // TODO: need to transform existing secrets during migration manually + Name: clientSecretName + ".csi", Kind: "Secret", Data: mustMarshal(map[string]string{ idProp: cephRes.Name,