From c7a504c9cf8849eb1cc36356d6547c8971317b9e Mon Sep 17 00:00:00 2001 From: monopole Date: Sat, 13 Feb 2021 13:51:59 -0800 Subject: [PATCH] Add 4.0.1 to example tests and unpin. --- Makefile | 4 ++-- hack/testExamplesAgainstKustomize.sh | 4 +--- kustomize/go.mod | 6 ++++++ kustomize/go.sum | 6 ------ 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 9138decfb..e09cb843b 100644 --- a/Makefile +++ b/Makefile @@ -282,11 +282,11 @@ test-examples-kustomize-against-HEAD: $(MYGOBIN)/kustomize $(MYGOBIN)/mdrip .PHONY: test-examples-kustomize-against-4.0: $(MYGOBIN)/mdrip - ./hack/testExamplesAgainstKustomize.sh v4.0.0 + ./hack/testExamplesAgainstKustomize.sh v4@v4.0.1 .PHONY: test-examples-kustomize-against-3.10: $(MYGOBIN)/mdrip - ./hack/testExamplesAgainstKustomize.sh v3.10.0 + ./hack/testExamplesAgainstKustomize.sh v3@v3.10.0 # linux only. # This is for testing an example plugin that diff --git a/hack/testExamplesAgainstKustomize.sh b/hack/testExamplesAgainstKustomize.sh index f29241a51..f90230136 100755 --- a/hack/testExamplesAgainstKustomize.sh +++ b/hack/testExamplesAgainstKustomize.sh @@ -19,10 +19,8 @@ echo "Installing kustomize ${version}" rm -f $(go env GOPATH)/bin/kustomize if [ "$version" == "HEAD" ]; then (cd kustomize; go install .) -elif [ "$version" == "v3.10.0" ]; then - GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/v3@v3.10.0 else - GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/v4@v4.0.0 + GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/${version} fi # TODO: change the label? diff --git a/kustomize/go.mod b/kustomize/go.mod index 6d85fe200..b57578b61 100644 --- a/kustomize/go.mod +++ b/kustomize/go.mod @@ -17,3 +17,9 @@ exclude ( sigs.k8s.io/kustomize/api v0.2.0 sigs.k8s.io/kustomize/cmd/config v0.2.0 ) + +replace sigs.k8s.io/kustomize/api => ../api + +replace sigs.k8s.io/kustomize/cmd/config => ../cmd/config + +replace sigs.k8s.io/kustomize/kyaml => ../kyaml diff --git a/kustomize/go.sum b/kustomize/go.sum index 4d4eebbf1..36aded733 100644 --- a/kustomize/go.sum +++ b/kustomize/go.sum @@ -426,12 +426,6 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod h1:4G1h5nDURzA3bwVMZIVpwbkw+04kSxk3rAtzlimaUJw= -sigs.k8s.io/kustomize/api v0.8.1 h1:7HNZ82JKD45Hnl3jLi4DR9+LbWbN0OdyeOnSGqbZ8wQ= -sigs.k8s.io/kustomize/api v0.8.1/go.mod h1:M0HMIEWuO4nBaZ3WhRe4tHKTVCqCqYkqhrRpZ0B/ElA= -sigs.k8s.io/kustomize/cmd/config v0.9.2 h1:5sRJAB9dDZZZ+tnL4kTmoeCz8kd8E8mXJ7KgRqjgSPo= -sigs.k8s.io/kustomize/cmd/config v0.9.2/go.mod h1:8p6Hqj7w1v4ABfRJlm/HYAfznIWPxPikigIpANXG8LA= -sigs.k8s.io/kustomize/kyaml v0.10.10 h1:caAxDDkaXZp+0kDsZVik4leFJV8LCy09PdVqpaoNeF4= -sigs.k8s.io/kustomize/kyaml v0.10.10/go.mod h1:K9yg1k/HB/6xNOf5VH3LhTo1DK9/5ykSZO5uIv+Y/1k= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=