diff --git a/pkg/server/api/api.go b/pkg/server/api/api.go index 4715609a..a80721a3 100644 --- a/pkg/server/api/api.go +++ b/pkg/server/api/api.go @@ -69,7 +69,7 @@ func DoCNI(url string, req interface{}, socketPath string) ([]byte, error) { // GetAPIEndpoint returns endpoint URL for multus-daemon func GetAPIEndpoint(endpoint string) string { - return fmt.Sprintf("http://dummy/%s", endpoint) + return fmt.Sprintf("http://dummy%s", endpoint) } // CreateDelegateRequest creates Request for delegate API request diff --git a/pkg/server/server.go b/pkg/server/server.go index 44509cf5..955ed39f 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -446,11 +446,10 @@ func cmdDelegateAdd(cmdArgs *skel.CmdArgs, k8sArgs *types.K8sArgs, exec invoke.E return nil, err } - delegateCNIConf := &types.DelegateNetConf{} - if err := json.Unmarshal(cmdArgs.StdinData, delegateCNIConf); err != nil { + delegateCNIConf, err := types.LoadDelegateNetConf(cmdArgs.StdinData, nil, "", "") + if err != nil { return nil, err } - delegateCNIConf.Bytes = cmdArgs.StdinData logging.Debugf("CmdDelegateAdd for [%s/%s]. CNI conf: %+v", namespace, podName, *cmdArgs) rt, _ := types.CreateCNIRuntimeConf(cmdArgs, k8sArgs, cmdArgs.IfName, nil, delegateCNIConf) @@ -486,11 +485,10 @@ func cmdDelegateDel(cmdArgs *skel.CmdArgs, k8sArgs *types.K8sArgs, exec invoke.E return err } - delegateCNIConf := &types.DelegateNetConf{} - if err := json.Unmarshal(cmdArgs.StdinData, delegateCNIConf); err != nil { + delegateCNIConf, err := types.LoadDelegateNetConf(cmdArgs.StdinData, nil, "", "") + if err != nil { return err } - delegateCNIConf.Bytes = cmdArgs.StdinData rt, _ := types.CreateCNIRuntimeConf(cmdArgs, k8sArgs, cmdArgs.IfName, nil, delegateCNIConf) return multus.DelegateDel(exec, pod, delegateCNIConf, rt, multusConfig) }