Merge pull request kubernetes#22 from negz/lock

Update k8s.io/kubernetes/pkg/util/iptables dependency
varunmar · Oct 4, 2018 · 8532f20 · 8532f20
2 parents b5e8569 + 424e376
commit 8532f20
Show file tree

Hide file tree

Showing 260 changed files with 162,209 additions and 333 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Makefile b/Makefile
@@ -61,7 +61,7 @@ endif
 
 IMAGE := $(REGISTRY)/$(BIN)-$(ARCH)
 
-BUILD_IMAGE ?= golang:1.7-alpine
+BUILD_IMAGE ?= golang:1.11-alpine
 
 # If you want to build all binaries, see the 'all-build' rule.
 # If you want to build all containers, see the 'all-container' rule.
@@ -97,6 +97,7 @@ bin/$(ARCH)/$(BIN): build-dirs
 	    -v $$(pwd)/bin/$(ARCH):/go/bin/linux_$(ARCH)                       \
 	    -v $$(pwd)/.go/std/$(ARCH):/usr/local/go/pkg/linux_$(ARCH)_static  \
 	    -w /go/src/$(PKG)                                                  \
+            -e GOCACHE=off                                                     \
 	    $(BUILD_IMAGE)                                                     \
 	    /bin/sh -c "                                                       \
 	        ARCH=$(ARCH)                                                   \
@@ -144,6 +145,7 @@ test: build-dirs
 	    -v $$(pwd)/bin/$(ARCH):/go/bin                                     \
 	    -v $$(pwd)/.go/std/$(ARCH):/usr/local/go/pkg/linux_$(ARCH)_static  \
 	    -w /go/src/$(PKG)                                                  \
+            -e GOCACHE=off                                                     \
 	    $(BUILD_IMAGE)                                                     \
 	    /bin/sh -c "                                                       \
 	        ./build/test.sh $(SRC_DIRS)                                    \

diff --git a/cmd/ip-masq-agent/ip-masq-agent.go b/cmd/ip-masq-agent/ip-masq-agent.go
@@ -31,9 +31,9 @@ import (
 	"k8s.io/apiserver/pkg/util/logs"
 	"k8s.io/ip-masq-agent/cmd/ip-masq-agent/testing/fakefs"
 	utildbus "k8s.io/kubernetes/pkg/util/dbus"
-	utilexec "k8s.io/kubernetes/pkg/util/exec"
 	utiliptables "k8s.io/kubernetes/pkg/util/iptables"
 	"k8s.io/kubernetes/pkg/version/verflag"
+	utilexec "k8s.io/utils/exec"
 
 	"github.com/golang/glog"
 )

diff --git a/cmd/ip-masq-agent/ip-masq-agent_test.go b/cmd/ip-masq-agent/ip-masq-agent_test.go
@@ -82,7 +82,7 @@ var syncConfigTests = []struct {
 	cfg  *MasqConfig       // expected values of the configuration after loading from fs
 }{
 	// valid yaml
-	{"valid yaml file, all keys", fakefs.StringFS{`
+	{"valid yaml file, all keys", fakefs.StringFS{File: `
 nonMasqueradeCIDRs:
   - 172.16.0.0/12
   - 10.0.0.0/8
@@ -93,33 +93,33 @@ resyncInterval: 5s
 		MasqLinkLocal:      true,
 		ResyncInterval:     Duration(5 * time.Second)}},
 
-	{"valid yaml file, just nonMasqueradeCIDRs", fakefs.StringFS{`
+	{"valid yaml file, just nonMasqueradeCIDRs", fakefs.StringFS{File: `
 nonMasqueradeCIDRs:
   - 192.168.0.0/16
 `}, nil, &MasqConfig{
 		NonMasqueradeCIDRs: []string{"192.168.0.0/16"},
 		MasqLinkLocal:      NewMasqConfig().MasqLinkLocal,
 		ResyncInterval:     NewMasqConfig().ResyncInterval}},
 
-	{"valid yaml file, just masqLinkLocal", fakefs.StringFS{`
+	{"valid yaml file, just masqLinkLocal", fakefs.StringFS{File: `
 masqLinkLocal: true
 `}, nil, &MasqConfig{
 		NonMasqueradeCIDRs: NewMasqConfig().NonMasqueradeCIDRs,
 		MasqLinkLocal:      true,
 		ResyncInterval:     NewMasqConfig().ResyncInterval}},
 
-	{"valid yaml file, just resyncInterval", fakefs.StringFS{`
+	{"valid yaml file, just resyncInterval", fakefs.StringFS{File: `
 resyncInterval: 5m
 `}, nil, &MasqConfig{
 		NonMasqueradeCIDRs: NewMasqConfig().NonMasqueradeCIDRs,
 		MasqLinkLocal:      NewMasqConfig().MasqLinkLocal,
 		ResyncInterval:     Duration(5 * time.Minute)}},
 
 	// invalid yaml
-	{"invalid yaml file", fakefs.StringFS{`*`}, fmt.Errorf("yaml: did not find expected alphabetic or numeric character"), NewMasqConfig()},
+	{"invalid yaml file", fakefs.StringFS{File: `*`}, fmt.Errorf("yaml: did not find expected alphabetic or numeric character"), NewMasqConfig()},
 
 	// valid json
-	{"valid json file, all keys", fakefs.StringFS{`
+	{"valid json file, all keys", fakefs.StringFS{File: `
 {
   "nonMasqueradeCIDRs": ["172.16.0.0/12", "10.0.0.0/8"],
   "masqLinkLocal": true,
@@ -131,7 +131,7 @@ resyncInterval: 5m
 			MasqLinkLocal:      true,
 			ResyncInterval:     Duration(5 * time.Second)}},
 
-	{"valid json file, just nonMasqueradeCIDRs", fakefs.StringFS{`
+	{"valid json file, just nonMasqueradeCIDRs", fakefs.StringFS{File: `
 {
 	"nonMasqueradeCIDRs": ["192.168.0.0/16"]
 }
@@ -141,7 +141,7 @@ resyncInterval: 5m
 			MasqLinkLocal:      NewMasqConfig().MasqLinkLocal,
 			ResyncInterval:     NewMasqConfig().ResyncInterval}},
 
-	{"valid json file, just masqLinkLocal", fakefs.StringFS{`
+	{"valid json file, just masqLinkLocal", fakefs.StringFS{File: `
 {
 	"masqLinkLocal": true
 }
@@ -151,7 +151,7 @@ resyncInterval: 5m
 			MasqLinkLocal:      true,
 			ResyncInterval:     NewMasqConfig().ResyncInterval}},
 
-	{"valid json file, just resyncInterval", fakefs.StringFS{`
+	{"valid json file, just resyncInterval", fakefs.StringFS{File: `
 {
 	"resyncInterval": "5m"
 }
@@ -162,7 +162,7 @@ resyncInterval: 5m
 			ResyncInterval:     Duration(5 * time.Minute)}},
 
 	// invalid json
-	{"invalid json file", fakefs.StringFS{`{*`}, fmt.Errorf("invalid character '*' looking for beginning of object key string"), NewMasqConfig()},
+	{"invalid json file", fakefs.StringFS{File: `{*`}, fmt.Errorf("invalid character '*' looking for beginning of object key string"), NewMasqConfig()},
 
 	// file does not exist
 	{"no config file", fakefs.NotExistFS{}, nil, NewMasqConfig()}, // If the file does not exist, defaults should be used

diff --git a/vendor/golang.org/x/sys/AUTHORS b/vendor/golang.org/x/sys/AUTHORS
diff --git a/vendor/golang.org/x/sys/CONTRIBUTORS b/vendor/golang.org/x/sys/CONTRIBUTORS
diff --git a/vendor/golang.org/x/sys/LICENSE b/vendor/golang.org/x/sys/LICENSE
diff --git a/vendor/golang.org/x/sys/PATENTS b/vendor/golang.org/x/sys/PATENTS
diff --git a/vendor/golang.org/x/sys/unix/.gitignore b/vendor/golang.org/x/sys/unix/.gitignore