From b7ddff7f3db835844b54a5555c80a3c1fd70bbb5 Mon Sep 17 00:00:00 2001 From: Claes Mogren Date: Sat, 5 Sep 2020 18:54:53 -0700 Subject: [PATCH] Minor code cleanup --- cmd/routed-eni-cni-plugin/cni.go | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/cmd/routed-eni-cni-plugin/cni.go b/cmd/routed-eni-cni-plugin/cni.go index e0ff1ec736..27cebe17c2 100644 --- a/cmd/routed-eni-cni-plugin/cni.go +++ b/cmd/routed-eni-cni-plugin/cni.go @@ -84,32 +84,25 @@ func init() { // LoadNetConf converts inputs (i.e. stdin) to NetConf func LoadNetConf(bytes []byte) (*NetConf, logger.Logger, error) { - var conf NetConf + // Default config + conf := NetConf{ + MTU: "9001", + VethPrefix: "eni", + } + if err := json.Unmarshal(bytes, &conf); err != nil { return nil, nil, errors.Wrap(err, "add cmd: error loading config from args") } - //logConfig logConfig := logger.Configuration{ LogLevel: conf.PluginLogLevel, LogLocation: conf.PluginLogFile, } log := logger.New(&logConfig) - // MTU - if conf.MTU == "" { - log.Debug("MTU not set, defaulting to 9001") - conf.MTU = "9001" - } - - // Default the host-side veth prefix to 'eni'. - if conf.VethPrefix == "" { - conf.VethPrefix = "eni" - } if len(conf.VethPrefix) > 4 { return nil, nil, errors.New("conf.VethPrefix can be at most 4 characters long") } - return &conf, log, nil }