From 0275b007c6a0d21e33d52af376d7f7d99f8f17b9 Mon Sep 17 00:00:00 2001 From: Euan Harris Date: Wed, 26 Jun 2019 16:50:56 +0100 Subject: [PATCH 1/4] vet: Fix composite literal uses unkeyed fields warnings Signed-off-by: Euan Harris --- libnetwork/drivers/overlay/ostweaks_linux.go | 6 +++--- libnetwork/osl/namespace_linux.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libnetwork/drivers/overlay/ostweaks_linux.go b/libnetwork/drivers/overlay/ostweaks_linux.go index de946a5846..fa0a470921 100644 --- a/libnetwork/drivers/overlay/ostweaks_linux.go +++ b/libnetwork/drivers/overlay/ostweaks_linux.go @@ -7,9 +7,9 @@ import ( ) var ovConfig = map[string]*kernel.OSValue{ - "net.ipv4.neigh.default.gc_thresh1": {"8192", checkHigher}, - "net.ipv4.neigh.default.gc_thresh2": {"49152", checkHigher}, - "net.ipv4.neigh.default.gc_thresh3": {"65536", checkHigher}, + "net.ipv4.neigh.default.gc_thresh1": {Value: "8192", CheckFn: checkHigher}, + "net.ipv4.neigh.default.gc_thresh2": {Value: "49152", CheckFn: checkHigher}, + "net.ipv4.neigh.default.gc_thresh3": {Value: "65536", CheckFn: checkHigher}, } func checkHigher(val1, val2 string) bool { diff --git a/libnetwork/osl/namespace_linux.go b/libnetwork/osl/namespace_linux.go index 3879b03444..ed44311418 100644 --- a/libnetwork/osl/namespace_linux.go +++ b/libnetwork/osl/namespace_linux.go @@ -40,7 +40,7 @@ var ( loadBalancerConfig = map[string]*kernel.OSValue{ // expires connection from the IPVS connection table when the backend is not available // more info: https://github.com/torvalds/linux/blob/master/Documentation/networking/ipvs-sysctl.txt#L126:1 - "net.ipv4.vs.expire_nodest_conn": {"1", nil}, + "net.ipv4.vs.expire_nodest_conn": {Value: "1", CheckFn: nil}, } ) From 746e680871154a1048a566d705a3728560e95728 Mon Sep 17 00:00:00 2001 From: Euan Harris Date: Wed, 26 Jun 2019 16:51:22 +0100 Subject: [PATCH 2/4] vet: Fix format string warnings Signed-off-by: Euan Harris --- libnetwork/drivers/bridge/setup_ip_tables.go | 2 +- libnetwork/network.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libnetwork/drivers/bridge/setup_ip_tables.go b/libnetwork/drivers/bridge/setup_ip_tables.go index 5865a18f18..438b842a82 100644 --- a/libnetwork/drivers/bridge/setup_ip_tables.go +++ b/libnetwork/drivers/bridge/setup_ip_tables.go @@ -302,7 +302,7 @@ func setINC(iface string, enable bool) error { if i == 1 { // Rollback the rule installed on first chain if err2 := iptables.ProgramRule(iptables.Filter, chains[0], iptables.Delete, rules[0]); err2 != nil { - logrus.Warn("Failed to rollback iptables rule after failure (%v): %v", err, err2) + logrus.Warnf("Failed to rollback iptables rule after failure (%v): %v", err, err2) } } return fmt.Errorf(msg) diff --git a/libnetwork/network.go b/libnetwork/network.go index b08916303b..9446a2dfff 100644 --- a/libnetwork/network.go +++ b/libnetwork/network.go @@ -1054,7 +1054,7 @@ func (n *network) delete(force bool, rmLBEndpoint bool) error { t.Name(), n.Name(), err) } } else { - logrus.Warnf("Could not find configuration network %q during removal of network %q", n.configOnly, n.Name()) + logrus.Warnf("Could not find configuration network %q during removal of network %q", n.configFrom, n.Name()) } } From 84414583f0622b4adb8dff9d8a9ded879e14f52c Mon Sep 17 00:00:00 2001 From: Euan Harris Date: Wed, 26 Jun 2019 16:54:31 +0100 Subject: [PATCH 3/4] gofmt: Fix formatting warnings Signed-off-by: Euan Harris --- libnetwork/drivers/windows/windows.go | 2 +- libnetwork/resolvconf/resolvconf_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libnetwork/drivers/windows/windows.go b/libnetwork/drivers/windows/windows.go index b8a5f73b96..76c631cefe 100644 --- a/libnetwork/drivers/windows/windows.go +++ b/libnetwork/drivers/windows/windows.go @@ -433,7 +433,7 @@ func convertQosPolicies(qosPolicies []types.QosPolicy) ([]json.RawMessage, error // understood by the HCS. for _, elem := range qosPolicies { encodedPolicy, err := json.Marshal(hcsshim.QosPolicy{ - Type: "QOS", + Type: "QOS", MaximumOutgoingBandwidthInBytes: elem.MaxEgressBandwidth, }) diff --git a/libnetwork/resolvconf/resolvconf_test.go b/libnetwork/resolvconf/resolvconf_test.go index 5282353521..48843a3505 100644 --- a/libnetwork/resolvconf/resolvconf_test.go +++ b/libnetwork/resolvconf/resolvconf_test.go @@ -41,7 +41,7 @@ search example.com`: {"1.2.3.4", "40.3.200.10"}, `nameserver 1.2.3.4 search example.com nameserver 4.30.20.100`: {"1.2.3.4", "4.30.20.100"}, - ``: {}, + ``: {}, ` nameserver 1.2.3.4 `: {"1.2.3.4"}, `search example.com nameserver 1.2.3.4 @@ -65,7 +65,7 @@ search example.com`: {"1.2.3.4/32", "40.3.200.10/32"}, `nameserver 1.2.3.4 search example.com nameserver 4.30.20.100`: {"1.2.3.4/32", "4.30.20.100/32"}, - ``: {}, + ``: {}, ` nameserver 1.2.3.4 `: {"1.2.3.4/32"}, `search example.com nameserver 1.2.3.4 From 3eeda3d91cc37dc619018069cf882c27b38e980e Mon Sep 17 00:00:00 2001 From: Euan Harris Date: Wed, 26 Jun 2019 16:54:53 +0100 Subject: [PATCH 4/4] Dockerfile: Update to Go 1.12.6, matching moby/moby Signed-off-by: Euan Harris --- libnetwork/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnetwork/Dockerfile b/libnetwork/Dockerfile index 9ffe9971d2..dd4787abb7 100644 --- a/libnetwork/Dockerfile +++ b/libnetwork/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.10.7 as dev +FROM golang:1.12.6 as dev RUN apt-get update && apt-get -y install iptables \ protobuf-compiler