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.

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

add rpc call for RevokeBlockPoolPeering #2493

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 31 additions & 1 deletion deploy/ocs-operator/manifests/provider-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,24 @@ rules:
- ""
resources:
- configmaps
- secrets
- services
verbs:
- get
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- create
- update
- delete
- apiGroups:
- ceph.rook.io
resources:
- cephblockpools/finalizers
verbs:
- update
- apiGroups:
- ceph.rook.io
resources:
Expand All @@ -19,6 +33,14 @@ rules:
verbs:
- get
- list
- apiGroups:
- ceph.rook.io
resources:
- cephblockpools
verbs:
- get
- list
- update
- apiGroups:
- ocs.openshift.io
resources:
Expand Down Expand Up @@ -61,3 +83,11 @@ rules:
verbs:
- get
- list
- apiGroups:
- ceph.rook.io
resources:
- cephrbdmirrors
verbs:
- get
- create
- delete
32 changes: 31 additions & 1 deletion rbac/provider-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,24 @@ rules:
- ""
resources:
- configmaps
- secrets
- services
verbs:
- get
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- create
- update
- delete
- apiGroups:
- ceph.rook.io
resources:
- cephblockpools/finalizers
verbs:
- update
- apiGroups:
- ceph.rook.io
resources:
Expand All @@ -19,6 +33,14 @@ rules:
verbs:
- get
- list
- apiGroups:
- ceph.rook.io
resources:
- cephblockpools
verbs:
- get
- list
- update
- apiGroups:
- ocs.openshift.io
resources:
Expand Down Expand Up @@ -61,3 +83,11 @@ rules:
verbs:
- get
- list
- apiGroups:
- ceph.rook.io
resources:
- cephrbdmirrors
verbs:
- get
- create
- delete
33 changes: 33 additions & 0 deletions services/provider/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -207,3 +207,36 @@ func (cc *OCSProviderClient) ReportStatus(ctx context.Context, consumerUUID stri

return cc.Client.ReportStatus(apiCtx, req)
}

func (cc *OCSProviderClient) PeerBlockPool(ctx context.Context, secretName string, pool, token []byte) (*pb.PeerBlockPoolResponse, error) {
if cc.Client == nil || cc.clientConn == nil {
return nil, fmt.Errorf("OCS client is closed")
}

req := &pb.PeerBlockPoolRequest{
SecretName: secretName,
Pool: pool,
Token: token,
}

apiCtx, cancel := context.WithTimeout(ctx, cc.timeout)
defer cancel()

return cc.Client.PeerBlockPool(apiCtx, req)
}

func (cc *OCSProviderClient) RevokeBlockPoolPeering(ctx context.Context, secretName string, pool []byte) (*pb.RevokeBlockPoolPeeringResponse, error) {
if cc.Client == nil || cc.clientConn == nil {
return nil, fmt.Errorf("OCS client is closed")
}

req := &pb.RevokeBlockPoolPeeringRequest{
SecretName: secretName,
Pool: pool,
}

apiCtx, cancel := context.WithTimeout(ctx, cc.timeout)
defer cancel()

return cc.Client.RevokeBlockPoolPeering(apiCtx, req)
}