From 125762d94db42c0f382ed77f41f18cc5942bac84 Mon Sep 17 00:00:00 2001 From: jregan Date: Wed, 9 Dec 2020 22:33:02 -0800 Subject: [PATCH] Pin kustomize to api/v0.6.7 --- hack/testExamplesAgainstKustomize.sh | 2 +- kustomize/go.mod | 2 -- kustomize/go.sum | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/testExamplesAgainstKustomize.sh b/hack/testExamplesAgainstKustomize.sh index da1e147d2..5cd622f2d 100755 --- a/hack/testExamplesAgainstKustomize.sh +++ b/hack/testExamplesAgainstKustomize.sh @@ -16,7 +16,7 @@ version=$1 # We test against the latest release, and HEAD, and presumably # any branch using this label, so it should probably get # a new value. -mdrip --mode test \ +mdrip --mode test --blockTimeOut 9m \ --label testAgainstLatestRelease examples # TODO: make work for non-linux diff --git a/kustomize/go.mod b/kustomize/go.mod index 1818322d4..f4930a92a 100644 --- a/kustomize/go.mod +++ b/kustomize/go.mod @@ -19,5 +19,3 @@ 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 diff --git a/kustomize/go.sum b/kustomize/go.sum index 961a46e11..6835c6c8b 100644 --- a/kustomize/go.sum +++ b/kustomize/go.sum @@ -623,6 +623,8 @@ k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl 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.6.7 h1:12tbj8x8S3hqus6obQrMWTqpcibf3v4iFo+hX/jIQ8g= +sigs.k8s.io/kustomize/api v0.6.7/go.mod h1:3TxKEyaxwOIfHmRbQF14hDUSRmVQI0iSn8qDA5zaO/0= sigs.k8s.io/kustomize/cmd/config v0.8.6 h1:Rr7eyD+h32OfruN6V+cgUqHRpC2Y5ZnjjAPbjhKFLGE= sigs.k8s.io/kustomize/cmd/config v0.8.6/go.mod h1:e4PgdLUNnkf+Iapvjyb6gTG9DZQkDZIR6uS1Bv4YA6s= sigs.k8s.io/kustomize/kyaml v0.10.3 h1:ARSJUMN/c3k31DYxRfZ+vp/UepUQjg9zCwny7Oj908I=