mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 02:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: implement CSI-Addons Identity Service

Browse Source 
Depending on the way Ceph-CSI is deployed, the capabilities will be
configured for the GetCapabilities procedure. The other procedures are
more straight-forward.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos
2021-11-30 18:02:35 +01:00
committed by mergify[bot]
parent 20727bd41a
commit ab76459e87
3 changed files with 72 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/rbd/driver.go
View File

@ -132,7 +132,7 @@ func (r *Driver) Run(conf *util.Config) {
snapJournal = journal.NewCSISnapshotJournal(CSIInstanceID)
// configre CSI-Addons server and components
err = r.setupCSIAddonsServer(conf.CSIAddonsEndpoint)
err = r.setupCSIAddonsServer(conf)
if err != nil {
log.FatalLogMsg(err.Error())
}
@ -232,16 +232,17 @@ func (r *Driver) Run(conf *util.Config) {
// setupCSIAddonsServer creates a new CSI-Addons Server on the given (URL)
// endpoint. The supported CSI-Addons operations get registered as their own
// services.
func (r *Driver) setupCSIAddonsServer(endpoint string) error {
func (r *Driver) setupCSIAddonsServer(conf *util.Config) error {
var err error
r.cas, err = csiaddons.NewCSIAddonsServer(endpoint)
r.cas, err = csiaddons.NewCSIAddonsServer(conf.CSIAddonsEndpoint)
if err != nil {
return fmt.Errorf("failed to create CSI-Addons server: %w", err)
}
// register services
r.cas.RegisterService(&casrbd.IdentityServer{})
is := casrbd.NewIdentityServer(conf)
r.cas.RegisterService(is)
// start the server, this does not block, it runs a new go-routine
err = r.cas.Start()

8
internal/rbd/driver_test.go
View File

@ -22,6 +22,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/ceph/ceph-csi/internal/util"
)
func TestSetupCSIAddonsServer(t *testing.T) {
@ -31,8 +33,12 @@ func TestSetupCSIAddonsServer(t *testing.T) {
tmpDir := t.TempDir()
endpoint := "unix://" + tmpDir + "/csi-addons.sock"
config := &util.Config{
CSIAddonsEndpoint: endpoint,
}
drv := &Driver{}
err := drv.setupCSIAddonsServer(endpoint)
err := drv.setupCSIAddonsServer(config)
require.NoError(t, err)
require.NotNil(t, drv.cas)