From 589e79314f63ae8ad514e64ec8cd3ff8959f2b42 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Sat, 6 Jun 2020 13:20:47 -0700 Subject: [PATCH] pin kyaml version to v0.2.0 for release --- cmd/config/go.mod | 19 +------------------ cmd/config/go.sum | 2 ++ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/cmd/config/go.mod b/cmd/config/go.mod index be2523f3c..2b5b18cbe 100644 --- a/cmd/config/go.mod +++ b/cmd/config/go.mod @@ -15,22 +15,5 @@ require ( k8s.io/client-go v0.17.3 k8s.io/kubectl v0.0.0-20191219154910-1528d4eea6dd sigs.k8s.io/cli-utils v0.12.0 - // TODO: Fix this -- this should depend on v0.0.0 and be replaced (below), - // however the cli-runtime dependency causes `go mod` to set this as the - // dependency. - sigs.k8s.io/kustomize/kyaml v0.1.13 // Don't change this! -) - -// TODO: Fix this -- we sould only depend on v0.0.0 and replace that one. -// -// This line is managed by the release script -- releasing/releasemodule.sh -// Pinning to a released version of kyaml will invalidate the e2e tests used to -// test kyaml changes as the e2e tests will run against the pinned version, not -// the HEAD. -// -// releasing/releasemodule.sh will remove this line and set the require version -// to the kyaml version specified in releasing/VERSIONS -replace ( - sigs.k8s.io/kustomize/kyaml v0.0.0 => ../../kyaml - sigs.k8s.io/kustomize/kyaml v0.1.13 => ../../kyaml + sigs.k8s.io/kustomize/kyaml v0.2.0 ) diff --git a/cmd/config/go.sum b/cmd/config/go.sum index 6e6ca3eea..2998513d9 100644 --- a/cmd/config/go.sum +++ b/cmd/config/go.sum @@ -623,6 +623,8 @@ sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbL sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= sigs.k8s.io/kustomize/kyaml v0.1.4 h1:cDG2u7v6CTAZmWKzCjk0hKG7AIN+2mCHx2ifwPbvKrs= sigs.k8s.io/kustomize/kyaml v0.1.4/go.mod h1:461i94nj0h0ylJ6w83jLkR4SqqVhn1iY6fjD0JSTQeE= +sigs.k8s.io/kustomize/kyaml v0.2.0 h1:xlFMTAHTSIFvHzih5nSFQNxM+3ksnt5Nhfv5dLQWDA8= +sigs.k8s.io/kustomize/kyaml v0.2.0/go.mod h1:72/rLkSi+L/pHM1oCjwrf3ClU+tH5kZQvvdLSqIHwWU= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06 h1:zD2IemQ4LmOcAumeiyDWXKUI2SO0NYDe3H6QGvPOVgU=