diff --git a/cmd/dra-multus-driver/example.yaml b/cmd/dra-multus-driver/example.yaml index ac6e74d12..457a0f9e1 100644 --- a/cmd/dra-multus-driver/example.yaml +++ b/cmd/dra-multus-driver/example.yaml @@ -6,9 +6,9 @@ metadata: namespace: default spec: config: '{ - "cniVersion": "0.3.1", + "cniVersion": "0.4.0", "type": "bridge", - "bridge": "br0", + "bridge": "cni0", "ipam": { "type": "static", "addresses": [ @@ -41,11 +41,10 @@ spec: - name: bridge-net deviceClassName: multus-dra.k8s.cni.cncf.io config: - name: netattachdef - parameters: - driver: multus-dra.k8s.cni.cncf.io - nadName: macvlan-conf - nadNamespace: default + - opaque: + driver: multus-dra.k8s.cni.cncf.io + parameters: + networks: bridge-net --- apiVersion: v1 kind: Pod diff --git a/cmd/dra-multus-driver/main.go b/cmd/dra-multus-driver/main.go index fcd424643..39cb3418b 100644 --- a/cmd/dra-multus-driver/main.go +++ b/cmd/dra-multus-driver/main.go @@ -96,16 +96,27 @@ func newApp() *cli.App { } func StartPlugin(ctx context.Context, config *Config) error { + klog.Infof("Creating driver plugin directory: %s", DriverPluginPath) err := os.MkdirAll(DriverPluginPath, 0750) if err != nil { return err } - err = os.MkdirAll(config.flags.resolvedConfigDir, 0750) - if err != nil { + klog.Infof("Checking CDI root: %s", config.flags.cdiRoot) + info, err := os.Stat(config.flags.cdiRoot) + switch { + case err != nil && os.IsNotExist(err): + err := os.MkdirAll(config.flags.cdiRoot, 0750) + if err != nil { + return err + } + case err != nil: return err + case !info.IsDir(): + return fmt.Errorf("path for cdi file generation is not a directory: '%v'", err) } + klog.Infof("Starting %s", DriverName) driver, err := NewDriver(ctx, config) if err != nil { return err