mirror of
https://github.com/k8snetworkplumbingwg/multus-cni.git
synced 2025-09-17 15:07:14 +00:00
[increment] fixes up mkdir problem, attempts adding the opaque params properly
This commit is contained in:
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user