From ae626b4aa56044bafd705607f21b6f346be11dcf Mon Sep 17 00:00:00 2001 From: dougbtv Date: Thu, 18 Oct 2018 11:15:58 -0400 Subject: [PATCH] [bugfix][divergence] Diverges from master in requiring change to logging.Debugf value changed from string --- types/conf.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/types/conf.go b/types/conf.go index ffc330ec4..5073aa580 100644 --- a/types/conf.go +++ b/types/conf.go @@ -27,9 +27,9 @@ import ( ) const ( - defaultCNIDir = "/var/lib/cni/multus" - defaultConfDir = "/etc/cni/multus/net.d" - defaultBinDir = "/opt/cni/bin" + defaultCNIDir = "/var/lib/cni/multus" + defaultConfDir = "/etc/cni/multus/net.d" + defaultBinDir = "/opt/cni/bin" defaultReadinessIndicatorFile = "" ) @@ -104,7 +104,7 @@ func LoadCNIRuntimeConf(args *skel.CmdArgs, k8sArgs *K8sArgs, ifName string) (*l } func LoadNetworkStatus(r types.Result, netName string, defaultNet bool) (*NetworkStatus, error) { - logging.Debugf("LoadNetworkStatus: %v, %s, %s", r, netName, defaultNet) + logging.Debugf("LoadNetworkStatus: %v, %s, %v", r, netName, defaultNet) // Convert whatever the IPAM result was into the current Result type result, err := current.NewResultFromResult(r)