From 8ff0922d747478aa03f2d1e58484bf7f91209f62 Mon Sep 17 00:00:00 2001 From: Rashed Kamal Date: Mon, 18 Mar 2024 08:33:02 -0400 Subject: [PATCH] chore: Update YTT path Signed-off-by: Rashed Kamal --- Makefile | 2 +- hack/go.mod | 2 +- hack/go.sum | 4 ++-- hack/tools.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 4e6347a..3e289ed 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ GOIMPORTS ?= go run -modfile hack/go.mod golang.org/x/tools/cmd/goimports KAPP ?= go run -modfile hack/go.mod github.com/vmware-tanzu/carvel-kapp/cmd/kapp KO ?= go run -modfile hack/go.mod github.com/google/ko KUSTOMIZE ?= go run -modfile hack/go.mod sigs.k8s.io/kustomize/kustomize/v5 -YTT ?= go run -modfile hack/go.mod github.com/vmware-tanzu/carvel-ytt/cmd/ytt +YTT ?= go run -modfile hack/go.mod carvel.dev/ytt/cmd/ytt WOKE ?= go run -modfile hack/go.mod github.com/get-woke/woke CA_DATA ?= dist/ca.pem diff --git a/hack/go.mod b/hack/go.mod index f0c2673..3944b68 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -5,10 +5,10 @@ go 1.21 toolchain go1.21.5 require ( + carvel.dev/ytt v0.48.0 dies.dev/diegen v0.10.1 github.com/google/ko v0.15.2 github.com/vmware-tanzu/carvel-kapp v0.60.0 - github.com/vmware-tanzu/carvel-ytt v0.47.0 golang.org/x/tools v0.19.0 sigs.k8s.io/controller-tools v0.14.0 sigs.k8s.io/kustomize/kustomize/v5 v5.3.0 diff --git a/hack/go.sum b/hack/go.sum index 3f52c27..3aed27b 100644 --- a/hack/go.sum +++ b/hack/go.sum @@ -1,3 +1,5 @@ +carvel.dev/ytt v0.48.0 h1:NNLW6mHBxYFhz8tRlaUW4xjtDmq8u8unmC0dcsCKPxU= +carvel.dev/ytt v0.48.0/go.mod h1:ss9N6IKCUxg5yH5xomguFBQmuLnEwQr8slbAjTToCPQ= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -560,8 +562,6 @@ github.com/vmware-tanzu/carvel-kapp-controller v0.46.2 h1:TQRXFnZ6PryhQxx+4X1w2N github.com/vmware-tanzu/carvel-kapp-controller v0.46.2/go.mod h1:LJf4oaNfKW8kk6ddD8uRaayaUecGiqrz278oe4AEBSc= github.com/vmware-tanzu/carvel-vendir v0.33.1 h1:5wzx0aRyEiorkWwrpGvACJOpFcgvmCeVqhIY9TPuLvk= github.com/vmware-tanzu/carvel-vendir v0.33.1/go.mod h1:cZEa46rwzPt/ROdAuIgrCXLDJ+LqxNZaNxbz8MLtwWc= -github.com/vmware-tanzu/carvel-ytt v0.47.0 h1:iPJcZg2y00ozs5o9+ud3pfDJp2N84nGlibmecuX7jNY= -github.com/vmware-tanzu/carvel-ytt v0.47.0/go.mod h1:Xarf0th61vX6VY07l3KBSi3uaMCQ2UyPPiCPiaVpHME= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= diff --git a/hack/tools.go b/hack/tools.go index 103ae03..43d0754 100644 --- a/hack/tools.go +++ b/hack/tools.go @@ -21,10 +21,10 @@ limitations under the License. package tools import ( + _ "carvel.dev/ytt/cmd/ytt" _ "dies.dev/diegen" _ "github.com/google/ko" _ "github.com/vmware-tanzu/carvel-kapp/cmd/kapp" - _ "github.com/vmware-tanzu/carvel-ytt/cmd/ytt" _ "golang.org/x/tools/cmd/goimports" _ "sigs.k8s.io/controller-tools/cmd/controller-gen" _ "sigs.k8s.io/kustomize/kustomize/v5"