testing/kubernetes: upgrade to 1.7.2

1 files changed, 47 insertions, 47 deletions

diff --git a/testing/kubernetes/no-gnu-grep.patch b/testing/kubernetes/no-gnu-grep.patch
index 4c7d1991ba..191b3ed404 100644
--- a/testing/kubernetes/no-gnu-grep.patch
+++ b/testing/kubernetes/no-gnu-grep.patch
@@ -1,8 +1,8 @@
-diff --git a/Makefile.generated_files b/Makefile.generated_files
-index 13a4bbb..a4ea832 100644
---- a/Makefile.generated_files
-+++ b/Makefile.generated_files
-@@ -156,7 +156,7 @@ $(foreach dir, $(ALL_GO_DIRS), $(eval           \
+diff --git a/build/root/Makefile.generated_files b/build/root/Makefile.generated_files
+index 45287dc..8617f49 100644
+--- a/build/root/Makefile.generated_files
++++ b/build/root/Makefile.generated_files
+@@ -155,7 +155,7 @@ $(foreach dir, $(ALL_GO_DIRS), $(eval           \
  # is what the .stamp file represents.
  $(foreach dir, $(ALL_GO_DIRS),  \
      $(META_DIR)/$(dir)/$(GOFILES_META)):
@@ -11,7 +11,7 @@ index 13a4bbb..a4ea832 100644
  	mkdir -p $(@D);                                           \
  	echo "gofiles__$< := $$(echo $${FILES})" >$@.tmp;         \
  	cmp -s $@.tmp $@ || touch $@.stamp;                       \
-@@ -182,7 +182,7 @@ ifeq ($(DBG_MAKEFILE),1)
+@@ -181,7 +181,7 @@ ifeq ($(DBG_MAKEFILE),1)
  endif
  ALL_K8S_TAG_FILES := $(shell                             \
      find $(ALL_GO_DIRS) -maxdepth 1 -type f -name \*.go  \
@@ -20,7 +20,7 @@ index 13a4bbb..a4ea832 100644
  )
  
  #
-@@ -209,7 +209,7 @@ ifeq ($(DBG_MAKEFILE),1)
+@@ -208,7 +208,7 @@ ifeq ($(DBG_MAKEFILE),1)
      $(warning ***** finding all +k8s:deepcopy-gen tags)
  endif
  DEEPCOPY_DIRS := $(shell                                             \
@@ -29,16 +29,16 @@ index 13a4bbb..a4ea832 100644
          | xargs -n1 dirname                                          \
          | LC_ALL=C sort -u                                           \
  )
-@@ -278,7 +278,7 @@ $(META_DIR)/$(DEEPCOPY_GEN).mk:
- 	 INDIRECT=$$(go list                                   \
- 	     -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}'          \
- 	     ./cmd/libs/go2idl/deepcopy-gen                    \
--	     | grep --color=never "^$(PRJ_SRC_PATH)"           \
-+	     | grep "^$(PRJ_SRC_PATH)"           \
- 	     | sed 's|^$(PRJ_SRC_PATH)|./|'                    \
- 	     | xargs go list -f '{{.Dir}} {{.Dir}}/*.go');     \
- 	 echo $$DIRECT $$INDIRECT                              \
-@@ -334,7 +334,7 @@ ifeq ($(DBG_MAKEFILE),1)
+@@ -275,7 +275,7 @@ $(META_DIR)/$(DEEPCOPY_GEN).mk:
+ 	 ./hack/run-in-gopath.sh go list                                      \
+ 	     -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}'  \
+ 	     ./cmd/libs/go2idl/deepcopy-gen                                   \
+-	     | grep --color=never "^$(PRJ_SRC_PATH)/"                         \
++	     | grep "^$(PRJ_SRC_PATH)/"                         \
+ 	     | xargs ./hack/run-in-gopath.sh go list                          \
+ 	         -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}'  \
+ 	     | paste -sd' ' -                                                 \
+@@ -332,7 +332,7 @@ ifeq ($(DBG_MAKEFILE),1)
      $(warning ***** finding all +k8s:defaulter-gen tags)
  endif
  DEFAULTER_DIRS := $(shell                                            \
@@ -47,16 +47,16 @@ index 13a4bbb..a4ea832 100644
          | xargs -n1 dirname                                          \
          | LC_ALL=C sort -u                                           \
  )
-@@ -429,7 +429,7 @@ $(META_DIR)/$(DEFAULTER_GEN).mk:
- 	 INDIRECT=$$(go list                                   \
- 	     -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}'          \
- 	     ./cmd/libs/go2idl/defaulter-gen                   \
--	     | grep --color=never "^$(PRJ_SRC_PATH)"           \
-+	     | grep "^$(PRJ_SRC_PATH)"           \
- 	     | sed 's|^$(PRJ_SRC_PATH)|./|'                    \
- 	     | xargs go list -f '{{.Dir}} {{.Dir}}/*.go');     \
- 	 echo $$DIRECT $$INDIRECT                              \
-@@ -475,7 +475,7 @@ ifeq ($(DBG_MAKEFILE),1)
+@@ -425,7 +425,7 @@ $(META_DIR)/$(DEFAULTER_GEN).mk:
+ 	 ./hack/run-in-gopath.sh go list                                      \
+ 	     -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}'  \
+ 	     ./cmd/libs/go2idl/defaulter-gen                                  \
+-	     | grep --color=never "^$(PRJ_SRC_PATH)/"                         \
++	     | grep "^$(PRJ_SRC_PATH)/"                         \
+ 	     | xargs ./hack/run-in-gopath.sh go list                          \
+ 	         -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}'  \
+ 	     | paste -sd' ' -                                                 \
+@@ -472,7 +472,7 @@ ifeq ($(DBG_MAKEFILE),1)
      $(warning ***** finding all +k8s:openapi-gen tags)
  endif
  OPENAPI_DIRS := $(shell                                             \
@@ -65,16 +65,16 @@ index 13a4bbb..a4ea832 100644
          | xargs -n1 dirname                                         \
          | LC_ALL=C sort -u                                          \
  )
-@@ -536,7 +536,7 @@ $(META_DIR)/$(OPENAPI_GEN).mk:
- 	 INDIRECT=$$(go list                                   \
- 	     -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}'          \
- 	     ./cmd/libs/go2idl/openapi-gen                     \
--	     | grep --color=never "^$(PRJ_SRC_PATH)"           \
-+	     | grep "^$(PRJ_SRC_PATH)"           \
- 	     | sed 's|^$(PRJ_SRC_PATH)|./|'                    \
- 	     | xargs go list -f '{{.Dir}} {{.Dir}}/*.go');     \
- 	 echo $$DIRECT $$INDIRECT                              \
-@@ -593,7 +593,7 @@ ifeq ($(DBG_MAKEFILE),1)
+@@ -523,7 +523,7 @@ $(META_DIR)/$(OPENAPI_GEN).mk:
+ 	 ./hack/run-in-gopath.sh go list                                      \
+ 	     -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}'  \
+ 	     ./cmd/libs/go2idl/openapi-gen                                    \
+-	     | grep --color=never "^$(PRJ_SRC_PATH)/"                         \
++	     | grep "^$(PRJ_SRC_PATH)/"                         \
+ 	     | xargs ./hack/run-in-gopath.sh go list                          \
+ 	         -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}'  \
+ 	     | paste -sd' ' -                                                 \
+@@ -581,7 +581,7 @@ ifeq ($(DBG_MAKEFILE),1)
      $(warning ***** finding all +k8s:conversion-gen tags)
  endif
  CONVERSION_DIRS := $(shell                                              \
@@ -83,7 +83,7 @@ index 13a4bbb..a4ea832 100644
          | cut -f1 -d:                                                   \
          | xargs -n1 dirname                                             \
          | LC_ALL=C sort -u                                              \
-@@ -651,7 +651,7 @@ $(foreach dir, $(CONVERSION_DIRS), $(eval           \
+@@ -639,7 +639,7 @@ $(foreach dir, $(CONVERSION_DIRS), $(eval           \
  # is what the .stamp file represents.
  $(foreach dir, $(CONVERSION_DIRS),  \
      $(META_DIR)/$(dir)/$(CONVERSIONS_META)):
@@ -92,12 +92,12 @@ index 13a4bbb..a4ea832 100644
  	    | cut -f2- -d=                                                  \
  	    | sed 's|$(PRJ_SRC_PATH)/||');                                  \
  	mkdir -p $(@D);                                                     \
-@@ -731,7 +731,7 @@ $(META_DIR)/$(CONVERSION_GEN).mk:
- 	 INDIRECT=$$(go list                                   \
- 	     -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}'          \
- 	     ./cmd/libs/go2idl/conversion-gen                  \
--	     | grep --color=never "^$(PRJ_SRC_PATH)"           \
-+	     | grep "^$(PRJ_SRC_PATH)"           \
- 	     | sed 's|^$(PRJ_SRC_PATH)|./|'                    \
- 	     | xargs go list -f '{{.Dir}} {{.Dir}}/*.go');     \
- 	 echo $$DIRECT $$INDIRECT                              \
+@@ -717,7 +717,7 @@ $(META_DIR)/$(CONVERSION_GEN).mk:
+ 	 ./hack/run-in-gopath.sh go list                                      \
+ 	     -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}'  \
+ 	     ./cmd/libs/go2idl/conversion-gen                                 \
+-	     | grep --color=never "^$(PRJ_SRC_PATH)/"                         \
++	     | grep "^$(PRJ_SRC_PATH)/"                         \
+ 	     | xargs ./hack/run-in-gopath.sh go list                          \
+ 	         -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}'  \
+ 	     | paste -sd' ' -                                                 \