diff --git a/api/go.mod b/api/go.mod index 8ee02a4c3..8920998c5 100644 --- a/api/go.mod +++ b/api/go.mod @@ -25,4 +25,4 @@ require ( sigs.k8s.io/yaml v1.2.0 ) -replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../kyaml +replace sigs.k8s.io/kustomize/kyaml => ../kyaml diff --git a/cmd/config/go.mod b/cmd/config/go.mod index 1eaca5f55..02ff4b773 100644 --- a/cmd/config/go.mod +++ b/cmd/config/go.mod @@ -18,4 +18,4 @@ require ( sigs.k8s.io/kustomize/kyaml v0.10.3 ) -replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../kyaml +replace sigs.k8s.io/kustomize/kyaml => ../../kyaml diff --git a/cmd/gorepomod/internal/edit/editor.go b/cmd/gorepomod/internal/edit/editor.go index 85ae43311..50f3f0e18 100644 --- a/cmd/gorepomod/internal/edit/editor.go +++ b/cmd/gorepomod/internal/edit/editor.go @@ -66,8 +66,9 @@ func (e *Editor) Pin(target misc.LaModule, oldV, newV semver.SemVer) error { func (e *Editor) UnPin(target misc.LaModule, oldV semver.SemVer) error { var r strings.Builder r.WriteString(target.ImportPath()) - r.WriteString("@") - r.WriteString(oldV.String()) + // Don't specify the old version. + // r.WriteString("@") + // r.WriteString(oldV.String()) r.WriteString("=") r.WriteString(upstairs(e.module.ShortName().Depth())) r.WriteString(string(target.ShortName())) diff --git a/cmd/pluginator/go.mod b/cmd/pluginator/go.mod index 1f5b23185..19e4c89d5 100644 --- a/cmd/pluginator/go.mod +++ b/cmd/pluginator/go.mod @@ -11,6 +11,6 @@ require ( sigs.k8s.io/yaml v1.2.0 ) -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../api +replace sigs.k8s.io/kustomize/api => ../../api -replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../kyaml +replace sigs.k8s.io/kustomize/kyaml => ../../kyaml diff --git a/kustomize/go.mod b/kustomize/go.mod index c5854f452..e88b346dc 100644 --- a/kustomize/go.mod +++ b/kustomize/go.mod @@ -20,6 +20,6 @@ exclude ( sigs.k8s.io/kustomize/cmd/config v0.2.0 ) -replace sigs.k8s.io/kustomize/api v0.7.0 => ../api +replace sigs.k8s.io/kustomize/api => ../api -replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../kyaml +replace sigs.k8s.io/kustomize/kyaml => ../kyaml diff --git a/plugin/builtin/annotationstransformer/go.mod b/plugin/builtin/annotationstransformer/go.mod index 7f3cfa9ae..640c936f0 100644 --- a/plugin/builtin/annotationstransformer/go.mod +++ b/plugin/builtin/annotationstransformer/go.mod @@ -8,6 +8,6 @@ require ( sigs.k8s.io/yaml v1.2.0 ) -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api +replace sigs.k8s.io/kustomize/api => ../../../api -replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml +replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml diff --git a/plugin/builtin/configmapgenerator/go.mod b/plugin/builtin/configmapgenerator/go.mod index fccae694a..94020233f 100644 --- a/plugin/builtin/configmapgenerator/go.mod +++ b/plugin/builtin/configmapgenerator/go.mod @@ -9,4 +9,4 @@ require ( replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api +replace sigs.k8s.io/kustomize/api => ../../../api diff --git a/plugin/builtin/hashtransformer/go.mod b/plugin/builtin/hashtransformer/go.mod index 60bf6c736..b0f30c7ee 100644 --- a/plugin/builtin/hashtransformer/go.mod +++ b/plugin/builtin/hashtransformer/go.mod @@ -6,4 +6,4 @@ require sigs.k8s.io/kustomize/api v0.7.0 replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api +replace sigs.k8s.io/kustomize/api => ../../../api diff --git a/plugin/builtin/helmchartinflationgenerator/go.mod b/plugin/builtin/helmchartinflationgenerator/go.mod index ae6ccb37a..2e2b754dd 100644 --- a/plugin/builtin/helmchartinflationgenerator/go.mod +++ b/plugin/builtin/helmchartinflationgenerator/go.mod @@ -9,4 +9,4 @@ require ( sigs.k8s.io/yaml v1.2.0 ) -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api +replace sigs.k8s.io/kustomize/api => ../../../api diff --git a/plugin/builtin/imagetagtransformer/go.mod b/plugin/builtin/imagetagtransformer/go.mod index 18ebeb5ae..26e742a39 100644 --- a/plugin/builtin/imagetagtransformer/go.mod +++ b/plugin/builtin/imagetagtransformer/go.mod @@ -8,6 +8,6 @@ require ( sigs.k8s.io/yaml v1.2.0 ) -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api +replace sigs.k8s.io/kustomize/api => ../../../api -replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml +replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml diff --git a/plugin/builtin/labeltransformer/go.mod b/plugin/builtin/labeltransformer/go.mod index d43d38424..bb848bf0f 100644 --- a/plugin/builtin/labeltransformer/go.mod +++ b/plugin/builtin/labeltransformer/go.mod @@ -8,6 +8,6 @@ require ( sigs.k8s.io/yaml v1.2.0 ) -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api +replace sigs.k8s.io/kustomize/api => ../../../api -replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml +replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml diff --git a/plugin/builtin/legacyordertransformer/go.mod b/plugin/builtin/legacyordertransformer/go.mod index c2ade412b..b8df7c761 100644 --- a/plugin/builtin/legacyordertransformer/go.mod +++ b/plugin/builtin/legacyordertransformer/go.mod @@ -9,4 +9,4 @@ require ( replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api +replace sigs.k8s.io/kustomize/api => ../../../api diff --git a/plugin/builtin/namespacetransformer/go.mod b/plugin/builtin/namespacetransformer/go.mod index 83db5bc73..f87ec4a8c 100644 --- a/plugin/builtin/namespacetransformer/go.mod +++ b/plugin/builtin/namespacetransformer/go.mod @@ -8,6 +8,6 @@ require ( sigs.k8s.io/yaml v1.2.0 ) -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api +replace sigs.k8s.io/kustomize/api => ../../../api -replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml +replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml diff --git a/plugin/builtin/patchjson6902transformer/go.mod b/plugin/builtin/patchjson6902transformer/go.mod index 49719af88..ce6fb0779 100644 --- a/plugin/builtin/patchjson6902transformer/go.mod +++ b/plugin/builtin/patchjson6902transformer/go.mod @@ -10,6 +10,6 @@ require ( sigs.k8s.io/yaml v1.2.0 ) -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api +replace sigs.k8s.io/kustomize/api => ../../../api -replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml +replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml diff --git a/plugin/builtin/patchstrategicmergetransformer/go.mod b/plugin/builtin/patchstrategicmergetransformer/go.mod index 0dff81a73..fd5fb1963 100644 --- a/plugin/builtin/patchstrategicmergetransformer/go.mod +++ b/plugin/builtin/patchstrategicmergetransformer/go.mod @@ -10,4 +10,4 @@ require ( replace sigs.k8s.io/kustomize/kyaml v0.9.4 => ../../../kyaml -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api +replace sigs.k8s.io/kustomize/api => ../../../api diff --git a/plugin/builtin/patchtransformer/go.mod b/plugin/builtin/patchtransformer/go.mod index e46920588..45602e7f3 100644 --- a/plugin/builtin/patchtransformer/go.mod +++ b/plugin/builtin/patchtransformer/go.mod @@ -9,6 +9,6 @@ require ( sigs.k8s.io/yaml v1.2.0 ) -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api +replace sigs.k8s.io/kustomize/api => ../../../api -replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml +replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml diff --git a/plugin/builtin/prefixsuffixtransformer/go.mod b/plugin/builtin/prefixsuffixtransformer/go.mod index 17cb073bf..efa56656f 100644 --- a/plugin/builtin/prefixsuffixtransformer/go.mod +++ b/plugin/builtin/prefixsuffixtransformer/go.mod @@ -8,6 +8,6 @@ require ( sigs.k8s.io/yaml v1.2.0 ) -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api +replace sigs.k8s.io/kustomize/api => ../../../api -replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml +replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml diff --git a/plugin/builtin/replicacounttransformer/go.mod b/plugin/builtin/replicacounttransformer/go.mod index e4cb4fc43..0ec443920 100644 --- a/plugin/builtin/replicacounttransformer/go.mod +++ b/plugin/builtin/replicacounttransformer/go.mod @@ -8,6 +8,6 @@ require ( sigs.k8s.io/yaml v1.2.0 ) -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api +replace sigs.k8s.io/kustomize/api => ../../../api -replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml +replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml diff --git a/plugin/builtin/secretgenerator/go.mod b/plugin/builtin/secretgenerator/go.mod index 3f6d00d8a..1bc3666e1 100644 --- a/plugin/builtin/secretgenerator/go.mod +++ b/plugin/builtin/secretgenerator/go.mod @@ -9,4 +9,4 @@ require ( replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api +replace sigs.k8s.io/kustomize/api => ../../../api diff --git a/plugin/builtin/valueaddtransformer/go.mod b/plugin/builtin/valueaddtransformer/go.mod index e61df4b5c..ebddd818c 100644 --- a/plugin/builtin/valueaddtransformer/go.mod +++ b/plugin/builtin/valueaddtransformer/go.mod @@ -8,6 +8,6 @@ require ( sigs.k8s.io/yaml v1.2.0 ) -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../api +replace sigs.k8s.io/kustomize/api => ../../../api -replace sigs.k8s.io/kustomize/kyaml v0.10.3 => ../../../kyaml +replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml diff --git a/plugin/someteam.example.com/v1/bashedconfigmap/go.mod b/plugin/someteam.example.com/v1/bashedconfigmap/go.mod index 63a5e6409..299fad77b 100644 --- a/plugin/someteam.example.com/v1/bashedconfigmap/go.mod +++ b/plugin/someteam.example.com/v1/bashedconfigmap/go.mod @@ -6,4 +6,4 @@ require sigs.k8s.io/kustomize/api v0.7.0 replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api +replace sigs.k8s.io/kustomize/api => ../../../../api diff --git a/plugin/someteam.example.com/v1/dateprefixer/go.mod b/plugin/someteam.example.com/v1/dateprefixer/go.mod index 6a5d393ba..b96fb550c 100644 --- a/plugin/someteam.example.com/v1/dateprefixer/go.mod +++ b/plugin/someteam.example.com/v1/dateprefixer/go.mod @@ -10,4 +10,4 @@ require ( replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api +replace sigs.k8s.io/kustomize/api => ../../../../api diff --git a/plugin/someteam.example.com/v1/printpluginenv/go.mod b/plugin/someteam.example.com/v1/printpluginenv/go.mod index 9f892b9c6..aeaa9687d 100644 --- a/plugin/someteam.example.com/v1/printpluginenv/go.mod +++ b/plugin/someteam.example.com/v1/printpluginenv/go.mod @@ -6,4 +6,4 @@ require sigs.k8s.io/kustomize/api v0.7.0 replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api +replace sigs.k8s.io/kustomize/api => ../../../../api diff --git a/plugin/someteam.example.com/v1/secretsfromdatabase/go.mod b/plugin/someteam.example.com/v1/secretsfromdatabase/go.mod index 6b1727ce8..fc4f92f94 100644 --- a/plugin/someteam.example.com/v1/secretsfromdatabase/go.mod +++ b/plugin/someteam.example.com/v1/secretsfromdatabase/go.mod @@ -9,4 +9,4 @@ require ( replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api +replace sigs.k8s.io/kustomize/api => ../../../../api diff --git a/plugin/someteam.example.com/v1/sedtransformer/go.mod b/plugin/someteam.example.com/v1/sedtransformer/go.mod index 97056961d..c2501588f 100644 --- a/plugin/someteam.example.com/v1/sedtransformer/go.mod +++ b/plugin/someteam.example.com/v1/sedtransformer/go.mod @@ -6,4 +6,4 @@ require sigs.k8s.io/kustomize/api v0.7.0 replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api +replace sigs.k8s.io/kustomize/api => ../../../../api diff --git a/plugin/someteam.example.com/v1/someservicegenerator/go.mod b/plugin/someteam.example.com/v1/someservicegenerator/go.mod index 3eaabb4d9..77173121b 100644 --- a/plugin/someteam.example.com/v1/someservicegenerator/go.mod +++ b/plugin/someteam.example.com/v1/someservicegenerator/go.mod @@ -9,4 +9,4 @@ require ( replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api +replace sigs.k8s.io/kustomize/api => ../../../../api diff --git a/plugin/someteam.example.com/v1/stringprefixer/go.mod b/plugin/someteam.example.com/v1/stringprefixer/go.mod index bc4d8241d..392eba9a5 100644 --- a/plugin/someteam.example.com/v1/stringprefixer/go.mod +++ b/plugin/someteam.example.com/v1/stringprefixer/go.mod @@ -10,4 +10,4 @@ require ( replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api +replace sigs.k8s.io/kustomize/api => ../../../../api diff --git a/plugin/someteam.example.com/v1/validator/go.mod b/plugin/someteam.example.com/v1/validator/go.mod index 86ddb0968..5cd84f599 100644 --- a/plugin/someteam.example.com/v1/validator/go.mod +++ b/plugin/someteam.example.com/v1/validator/go.mod @@ -6,4 +6,4 @@ require sigs.k8s.io/kustomize/api v0.7.0 replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api +replace sigs.k8s.io/kustomize/api => ../../../../api diff --git a/plugin/untested/v1/gogetter/go.mod b/plugin/untested/v1/gogetter/go.mod index 3bfe093c1..0f2e5763a 100644 --- a/plugin/untested/v1/gogetter/go.mod +++ b/plugin/untested/v1/gogetter/go.mod @@ -4,4 +4,4 @@ go 1.15 require sigs.k8s.io/kustomize/api v0.7.0 -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api +replace sigs.k8s.io/kustomize/api => ../../../../api diff --git a/plugin/untested/v1/replacementtransformer/go.mod b/plugin/untested/v1/replacementtransformer/go.mod index 7609b60de..1ea39665a 100644 --- a/plugin/untested/v1/replacementtransformer/go.mod +++ b/plugin/untested/v1/replacementtransformer/go.mod @@ -9,4 +9,4 @@ require ( replace sigs.k8s.io/kustomize/kyaml => ../../../../kyaml -replace sigs.k8s.io/kustomize/api v0.7.0 => ../../../../api +replace sigs.k8s.io/kustomize/api => ../../../../api