From 52b5c4b555763c4c1a04fe9443b2ce6c86de4495 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Wed, 1 Apr 2020 20:06:31 -0400 Subject: [PATCH 1/5] [ci] Temporarily disable kubeval validation Kubeval depends on `hashicorp/go-multierror`, which now depends on go1.13 error methods. --- Makefile | 22 ++++++++++++---------- tools.json | 4 ---- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index ff724bb074..6dc15a20b2 100644 --- a/Makefile +++ b/Makefile @@ -107,13 +107,13 @@ install-vendor-m3: # Some deps were causing panics when using GRPC and etcd libraries were used. # See issue: https://github.com/etcd-io/etcd/issues/9357 -# TODO: Move M3 to go mod to avoid the issue entirely instead of this hack +# TODO: Move M3 to go mod to avoid the issue entirely instead of this hack # (which is bad and we should feel bad). # $ go test -v -# panic: /debug/requests is already registered. You may have two independent -# copies of golang.org/x/net/trace in your binary, trying to maintain separate +# panic: /debug/requests is already registered. You may have two independent +# copies of golang.org/x/net/trace in your binary, trying to maintain separate # state. This may involve a vendored copy of golang.org/x/net/trace. -# +# # goroutine 1 [running]: # github.com/m3db/m3/vendor/go.etcd.io/etcd/vendor/golang.org/x/net/trace.init.0() # /Users/r/go/src/github.com/m3db/m3/vendor/go.etcd.io/etcd/vendor/golang.org/x/net/trace/trace.go:123 +0x1cd @@ -323,15 +323,17 @@ test-ci-integration: define SUBDIR_RULES +# Temporarily remove kube validation until we fix a dependency issue with +# kubeval (one of its depenencies depends on go1.13). +# # We override the rules for `*-gen-kube` to just generate the kube manifest -# bundle. -ifeq ($(SUBDIR), kube) +# bundle. ifeq ($(SUBDIR), kube) # Builds the single kube bundle from individual manifest files. -all-gen-kube: install-tools - @echo "--- Generating kube bundle" - @./kube/scripts/build_bundle.sh - find kube -name '*.yaml' -print0 | PATH=$(combined_bin_paths):$(PATH) xargs -0 kubeval -v=1.12.0 +# all-gen-kube: install-tools +# @echo "--- Generating kube bundle" +# @./kube/scripts/build_bundle.sh +# find kube -name '*.yaml' -print0 | PATH=$(combined_bin_paths):$(PATH) xargs -0 kubeval -v=1.12.0 else diff --git a/tools.json b/tools.json index dc8d3e0675..a06ecd12fa 100644 --- a/tools.json +++ b/tools.json @@ -36,10 +36,6 @@ "Repository": "github.com/rakyll/statik", "Commit": "19b88da8fc15428620782ba18f68423130e7ac7d" }, - { - "Repository": "github.com/garethr/kubeval", - "Commit": "c44f5193dc944abc00e60a1b041ce48b0ae03dfb" - }, { "Repository": "github.com/google/go-jsonnet/cmd/jsonnet", "Commit": "71a3e169581ece942e77bfc47840a806eb868ca8" From fcf3e1c624a78fa88d5957bf6e3576f5b060e12b Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Wed, 1 Apr 2020 20:15:15 -0400 Subject: [PATCH 2/5] fix typo --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6dc15a20b2..fbc86a4140 100644 --- a/Makefile +++ b/Makefile @@ -335,7 +335,7 @@ define SUBDIR_RULES # @./kube/scripts/build_bundle.sh # find kube -name '*.yaml' -print0 | PATH=$(combined_bin_paths):$(PATH) xargs -0 kubeval -v=1.12.0 -else +# else .PHONY: mock-gen-$(SUBDIR) mock-gen-$(SUBDIR): install-tools From 5da2c298f672f0997b029f891149bc74d076f80c Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Wed, 1 Apr 2020 20:21:46 -0400 Subject: [PATCH 3/5] more typo --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fbc86a4140..3b1e5840e4 100644 --- a/Makefile +++ b/Makefile @@ -432,7 +432,8 @@ metalint-$(SUBDIR): install-gometalinter install-linter-badtime install-linter-i @(PATH=$(combined_bin_paths):$(PATH) $(metalint_check) \ $(metalint_config) $(metalint_exclude) src/$(SUBDIR)) -endif +# endif kubeval +# endif endef From c7cc729f2153fcdbdb72ad7eb6b1b42a9eeba020 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Wed, 1 Apr 2020 20:43:20 -0400 Subject: [PATCH 4/5] dont gen kube --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3b1e5840e4..836a827ac3 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,8 @@ SUBDIRS := \ m3ninx \ aggregator \ ctl \ - kube \ + # Disabled during kubeval dependency issue + # kube \ TOOLS := \ read_ids \ From 4ae43139f08cd262783e49fdb4a7019f1b2aeed9 Mon Sep 17 00:00:00 2001 From: Matt Schallert Date: Wed, 1 Apr 2020 21:20:28 -0400 Subject: [PATCH 5/5] issue comment --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 836a827ac3..d0cf323e9b 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ SUBDIRS := \ m3ninx \ aggregator \ ctl \ - # Disabled during kubeval dependency issue + # Disabled during kubeval dependency issue https://github.com/m3db/m3/issues/2220 # kube \ TOOLS := \ @@ -326,9 +326,11 @@ define SUBDIR_RULES # Temporarily remove kube validation until we fix a dependency issue with # kubeval (one of its depenencies depends on go1.13). +# https://github.com/m3db/m3/issues/2220 # # We override the rules for `*-gen-kube` to just generate the kube manifest -# bundle. ifeq ($(SUBDIR), kube) +# bundle. +# ifeq ($(SUBDIR), kube) # Builds the single kube bundle from individual manifest files. # all-gen-kube: install-tools