[increment] fixes up mkdir problem, attempts adding the opaque params properly

This commit is contained in:
dougbtv
2025-03-27 13:24:10 -04:00
parent 926f835fc3
commit 2d53701a62
2 changed files with 19 additions and 9 deletions

View File

@@ -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:
- opaque:
driver: multus-dra.k8s.cni.cncf.io
nadName: macvlan-conf
nadNamespace: default
parameters:
networks: bridge-net
---
apiVersion: v1
kind: Pod

View File

@@ -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)
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