From 3c0b3257237bf38eeac1776bb1863e433b6aff14 Mon Sep 17 00:00:00 2001 From: Prashant Rewar <108176843+prashantrewar@users.noreply.github.com> Date: Mon, 20 Nov 2023 11:57:45 +0530 Subject: [PATCH] Update module name to carvel.dev Signed-off-by: Prashant Rewar <108176843+prashantrewar@users.noreply.github.com> --- .goreleaser.yml | 2 +- cmd/kbld/kbld.go | 2 +- go.mod | 8 ++++---- go.sum | 12 ++++++------ hack/build-binaries.sh | 2 +- hack/build.sh | 2 +- hack/errcheck_excludes.txt | 6 +++--- pkg/kbld/builder/bazel/bazel.go | 6 +++--- pkg/kbld/builder/docker/docker.go | 4 ++-- pkg/kbld/builder/docker/docker_buildx.go | 6 +++--- pkg/kbld/builder/ko/ko.go | 6 +++--- .../builder/kubectlbuildkit/kubectl_buildkit.go | 6 +++--- pkg/kbld/builder/pack/pack.go | 4 ++-- pkg/kbld/cmd/file_flags.go | 4 ++-- pkg/kbld/cmd/image.go | 2 +- pkg/kbld/cmd/image_queue.go | 2 +- pkg/kbld/cmd/image_set.go | 10 +++++----- pkg/kbld/cmd/inspect.go | 6 +++--- pkg/kbld/cmd/kbld.go | 2 +- pkg/kbld/cmd/package.go | 12 ++++++------ pkg/kbld/cmd/registry_flags.go | 2 +- pkg/kbld/cmd/relocate.go | 12 ++++++------ pkg/kbld/cmd/resolve.go | 16 ++++++++-------- pkg/kbld/cmd/resolve_test.go | 4 ++-- pkg/kbld/cmd/tar_image_set.go | 6 +++--- pkg/kbld/cmd/unpackage.go | 12 ++++++------ pkg/kbld/cmd/version.go | 2 +- pkg/kbld/config/conf.go | 4 ++-- pkg/kbld/config/config.go | 8 ++++---- pkg/kbld/config/image_origin.go | 2 +- pkg/kbld/image/built.go | 12 ++++++------ pkg/kbld/image/digested.go | 2 +- pkg/kbld/image/err.go | 2 +- pkg/kbld/image/factory.go | 16 ++++++++-------- pkg/kbld/image/git_test.go | 2 +- pkg/kbld/image/matcher.go | 2 +- pkg/kbld/image/matcher_test.go | 4 ++-- pkg/kbld/image/platform_selected.go | 4 ++-- pkg/kbld/image/platform_selected_test.go | 4 ++-- pkg/kbld/image/preresolved.go | 2 +- pkg/kbld/image/preresolved_test.go | 4 ++-- pkg/kbld/image/resolved.go | 6 +++--- pkg/kbld/image/tag_selected.go | 8 ++++---- pkg/kbld/image/tagged.go | 4 ++-- pkg/kbld/imagedesc/described_layer.go | 4 ++-- pkg/kbld/imagedesc/image_ref_descriptors.go | 2 +- pkg/kbld/imagetar/tar_file.go | 2 +- pkg/kbld/imagetar/tar_reader.go | 2 +- pkg/kbld/imagetar/tar_writer.go | 4 ++-- pkg/kbld/imageutils/gzip/zip.go | 2 +- pkg/kbld/imageutils/verify/verify.go | 2 +- pkg/kbld/logger/logger_test.go | 2 +- pkg/kbld/search/fields.go | 4 ++-- pkg/kbld/search/image_refs.go | 4 ++-- pkg/kbld/search/image_refs_test.go | 4 ++-- pkg/kbld/search/rule_matcher.go | 6 +++--- pkg/kbld/search/rules_matcher.go | 4 ++-- .../carvel-imgpkg => carvel.dev/imgpkg}/LICENSE | 0 .../carvel-imgpkg => carvel.dev/imgpkg}/NOTICE | 0 .../imgpkg}/pkg/imgpkg/lockconfig/bundle_lock.go | 0 .../imgpkg}/pkg/imgpkg/lockconfig/generic.go | 0 .../imgpkg}/pkg/imgpkg/lockconfig/images_lock.go | 0 .../carvel-vendir => carvel.dev/vendir}/LICENSE | 0 .../carvel-vendir => carvel.dev/vendir}/NOTICE | 0 .../vendir}/pkg/vendir/versions/selector.go | 2 +- .../vendir}/pkg/vendir/versions/semvers.go | 2 +- .../pkg/vendir/versions/v1alpha1/config.go | 0 .../pkg/vendir/versions/v1alpha1/generated.pb.go | 4 ++-- .../pkg/vendir/versions/v1alpha1/generated.proto | 0 .../versions/v1alpha1/zz_generated.deepcopy.go | 0 vendor/modules.txt | 16 ++++++++-------- 71 files changed, 155 insertions(+), 155 deletions(-) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/LICENSE (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/NOTICE (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/lockconfig/bundle_lock.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/lockconfig/generic.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-imgpkg => carvel.dev/imgpkg}/pkg/imgpkg/lockconfig/images_lock.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/LICENSE (100%) rename vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/NOTICE (100%) rename vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/versions/selector.go (96%) rename vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/versions/semvers.go (97%) rename vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/versions/v1alpha1/config.go (100%) rename vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/versions/v1alpha1/generated.pb.go (98%) rename vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/versions/v1alpha1/generated.proto (100%) rename vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/versions/v1alpha1/zz_generated.deepcopy.go (100%) diff --git a/.goreleaser.yml b/.goreleaser.yml index 9fa1e1fe..e78f37a3 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -17,7 +17,7 @@ builds: - -trimpath ldflags: - - -X github.com/vmware-tanzu/carvel-kbld/pkg/kbld/version.Version={{ .Version }} + - -X carvel.dev/kbld/pkg/kbld/version.Version={{ .Version }} archives: - format: binary diff --git a/cmd/kbld/kbld.go b/cmd/kbld/kbld.go index 9df025d4..efe3c477 100644 --- a/cmd/kbld/kbld.go +++ b/cmd/kbld/kbld.go @@ -10,9 +10,9 @@ import ( "os" "time" + "carvel.dev/kbld/pkg/kbld/cmd" uierrs "github.com/cppforlife/go-cli-ui/errors" "github.com/cppforlife/go-cli-ui/ui" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/cmd" ) func main() { diff --git a/go.mod b/go.mod index fda1d220..50c22880 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,10 @@ -module github.com/vmware-tanzu/carvel-kbld +module carvel.dev/kbld go 1.21 require ( + carvel.dev/imgpkg v0.39.0 + carvel.dev/vendir v0.37.0 github.com/cppforlife/cobrautil v0.0.0-20221021151949-d60711905d65 github.com/cppforlife/go-cli-ui v0.0.0-20220428182907-73db60c7611a github.com/google/go-containerregistry v0.16.1 @@ -10,8 +12,6 @@ require ( github.com/kisielk/errcheck v1.6.3 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 - github.com/vmware-tanzu/carvel-imgpkg v0.38.2 - github.com/vmware-tanzu/carvel-vendir v0.35.2 golang.org/x/sync v0.3.0 k8s.io/apimachinery v0.28.1 sigs.k8s.io/yaml v1.3.0 @@ -24,7 +24,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/cli v24.0.0+incompatible // indirect github.com/docker/distribution v2.8.2+incompatible // indirect - github.com/docker/docker v24.0.0+incompatible // indirect + github.com/docker/docker v24.0.7+incompatible // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/gogo/protobuf v1.3.2 // indirect diff --git a/go.sum b/go.sum index 983811ca..ceb058e8 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,7 @@ +carvel.dev/imgpkg v0.39.0 h1:faaWTLGo+CyhryyihSfSQpMoE5eHJDI1eloRbmCy7gM= +carvel.dev/imgpkg v0.39.0/go.mod h1:7aFGpUJsheXAZ8/fXMiMwU4pKXafS/ddLRjTHW9fMx8= +carvel.dev/vendir v0.37.0 h1:aNoz+KOIdMgWOQA33AWOtOSnyLWK5gCiWdAmRL+Yvto= +carvel.dev/vendir v0.37.0/go.mod h1:p0j/ROMfI4UBV80dYuvhZ8ZA5eGYygMcDH68cGJQGcE= github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/carvel-dev/semver/v4 v4.0.1-0.20230221220520-8090ce423695 h1:naCDnpJeqQq5OHOYR6j01yIVVUk3WI5MuSHpDTy+M1A= github.com/carvel-dev/semver/v4 v4.0.1-0.20230221220520-8090ce423695/go.mod h1:4cFTBLAr/U11ykiEEQMccu4uJ1i0GS+atJmeETHCFtI= @@ -21,8 +25,8 @@ github.com/docker/cli v24.0.0+incompatible h1:0+1VshNwBQzQAx9lOl+OYCTCEAD8fKs/qe github.com/docker/cli v24.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.0+incompatible h1:z4bf8HvONXX9Tde5lGBMQ7yCJgNahmJumdrStZAbeY4= -github.com/docker/docker v24.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= +github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -129,10 +133,6 @@ github.com/vbatts/tar-split v0.11.3 h1:hLFqsOLQ1SsppQNTMpkpPXClLDfC2A3Zgy9OUU+RV github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXSTY7wGrAokY= github.com/vito/go-interact v1.0.1 h1:O8xi8c93bRUv2Tb/v6HdiuGc+WnWt+AQzF74MOOdlBs= github.com/vito/go-interact v1.0.1/go.mod h1:HrdHSJXD2yn1MhlTwSIMeFgQ5WftiIorszVGd3S/DAA= -github.com/vmware-tanzu/carvel-imgpkg v0.38.2 h1:fSeYT7TbLV6P2JcfLW6MF9miNVJaEDpV3gfLxpZA6nA= -github.com/vmware-tanzu/carvel-imgpkg v0.38.2/go.mod h1:v9BcO1qfXwwIQFw2zmksdUkx8eI1e+/a0Md3xG2BzDE= -github.com/vmware-tanzu/carvel-vendir v0.35.2 h1:8np0Wjvz3R+9ehGKn+NHf6QhOBGDE2l0S9LF5pM2LsI= -github.com/vmware-tanzu/carvel-vendir v0.35.2/go.mod h1:66JYYPMEUc7NJXez2SpJzqnwN9BMXNSzp9su54AWUtc= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/hack/build-binaries.sh b/hack/build-binaries.sh index bf6dfa6f..61971553 100755 --- a/hack/build-binaries.sh +++ b/hack/build-binaries.sh @@ -10,7 +10,7 @@ VERSION="${1:-`get_latest_git_tag`}" # makes builds reproducible export CGO_ENABLED=0 -LDFLAGS="-X github.com/vmware-tanzu/carvel-kbld/pkg/kbld/version.Version=$VERSION" +LDFLAGS="-X carvel.dev/kbld/pkg/kbld/version.Version=$VERSION" GOOS=darwin GOARCH=amd64 go build -ldflags="$LDFLAGS" -trimpath -o kbld-darwin-amd64 ./cmd/kbld/... GOOS=darwin GOARCH=arm64 go build -ldflags="$LDFLAGS" -trimpath -o kbld-darwin-arm64 ./cmd/kbld/... diff --git a/hack/build.sh b/hack/build.sh index d704af5d..efdd84d5 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -7,7 +7,7 @@ VERSION="${1:-$LATEST_GIT_TAG}" # makes builds reproducible export CGO_ENABLED=0 -LDFLAGS="-X github.com/vmware-tanzu/carvel-kbld/pkg/kbld/version.Version=$VERSION" +LDFLAGS="-X carvel.dev/kbld/pkg/kbld/version.Version=$VERSION" go fmt ./cmd/... ./pkg/... ./test/... go mod vendor diff --git a/hack/errcheck_excludes.txt b/hack/errcheck_excludes.txt index aef070cb..b1538912 100644 --- a/hack/errcheck_excludes.txt +++ b/hack/errcheck_excludes.txt @@ -1,7 +1,7 @@ os.RemoveAll -(*github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger.LoggerPrefixWriter).Write -(*github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger.LoggerPrefixWriter).WriteStr -(github.com/vmware-tanzu/carvel-kbld/pkg/kbld/imagetar.Logger).WriteStr +(*carvel.dev/kbld/pkg/kbld/logger.LoggerPrefixWriter).Write +(*carvel.dev/kbld/pkg/kbld/logger.LoggerPrefixWriter).WriteStr +(carvel.dev/kbld/pkg/kbld/imagetar.Logger).WriteStr (io.Closer).Close (*archive/tar.Writer).Close fmt.Fprintf diff --git a/pkg/kbld/builder/bazel/bazel.go b/pkg/kbld/builder/bazel/bazel.go index c7d1bffb..9c1760ad 100644 --- a/pkg/kbld/builder/bazel/bazel.go +++ b/pkg/kbld/builder/bazel/bazel.go @@ -10,9 +10,9 @@ import ( "os/exec" "regexp" - ctlbdk "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder/docker" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctllog "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger" + ctlbdk "carvel.dev/kbld/pkg/kbld/builder/docker" + "carvel.dev/kbld/pkg/kbld/config" + ctllog "carvel.dev/kbld/pkg/kbld/logger" ) var ( diff --git a/pkg/kbld/builder/docker/docker.go b/pkg/kbld/builder/docker/docker.go index 85a761be..29fa0537 100644 --- a/pkg/kbld/builder/docker/docker.go +++ b/pkg/kbld/builder/docker/docker.go @@ -12,9 +12,9 @@ import ( "os/exec" "strings" + ctlb "carvel.dev/kbld/pkg/kbld/builder" + ctllog "carvel.dev/kbld/pkg/kbld/logger" regname "github.com/google/go-containerregistry/pkg/name" - ctlb "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder" - ctllog "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger" ) type Docker struct { diff --git a/pkg/kbld/builder/docker/docker_buildx.go b/pkg/kbld/builder/docker/docker_buildx.go index e907bc9f..147eef50 100644 --- a/pkg/kbld/builder/docker/docker_buildx.go +++ b/pkg/kbld/builder/docker/docker_buildx.go @@ -12,10 +12,10 @@ import ( "regexp" "strings" + ctlb "carvel.dev/kbld/pkg/kbld/builder" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctllog "carvel.dev/kbld/pkg/kbld/logger" regname "github.com/google/go-containerregistry/pkg/name" - ctlb "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctllog "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger" ) /* diff --git a/pkg/kbld/builder/ko/ko.go b/pkg/kbld/builder/ko/ko.go index 59ffe5bc..d7a4dbca 100644 --- a/pkg/kbld/builder/ko/ko.go +++ b/pkg/kbld/builder/ko/ko.go @@ -10,9 +10,9 @@ import ( "os/exec" "strings" - ctlbdk "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder/docker" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctllog "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger" + ctlbdk "carvel.dev/kbld/pkg/kbld/builder/docker" + "carvel.dev/kbld/pkg/kbld/config" + ctllog "carvel.dev/kbld/pkg/kbld/logger" ) type Ko struct { diff --git a/pkg/kbld/builder/kubectlbuildkit/kubectl_buildkit.go b/pkg/kbld/builder/kubectlbuildkit/kubectl_buildkit.go index 177c576c..4d46bbf9 100644 --- a/pkg/kbld/builder/kubectlbuildkit/kubectl_buildkit.go +++ b/pkg/kbld/builder/kubectlbuildkit/kubectl_buildkit.go @@ -10,10 +10,10 @@ import ( "os/exec" "regexp" + ctlb "carvel.dev/kbld/pkg/kbld/builder" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctllog "carvel.dev/kbld/pkg/kbld/logger" regname "github.com/google/go-containerregistry/pkg/name" - ctlb "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctllog "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger" ) var ( diff --git a/pkg/kbld/builder/pack/pack.go b/pkg/kbld/builder/pack/pack.go index 073caa07..96f49899 100644 --- a/pkg/kbld/builder/pack/pack.go +++ b/pkg/kbld/builder/pack/pack.go @@ -10,8 +10,8 @@ import ( "os/exec" "regexp" - ctlbdk "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder/docker" - ctllog "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger" + ctlbdk "carvel.dev/kbld/pkg/kbld/builder/docker" + ctllog "carvel.dev/kbld/pkg/kbld/logger" ) var ( diff --git a/pkg/kbld/cmd/file_flags.go b/pkg/kbld/cmd/file_flags.go index 4ac92bd5..5ae19df2 100644 --- a/pkg/kbld/cmd/file_flags.go +++ b/pkg/kbld/cmd/file_flags.go @@ -4,9 +4,9 @@ package cmd import ( + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctlres "carvel.dev/kbld/pkg/kbld/resources" "github.com/spf13/cobra" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctlres "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/resources" ) type FileFlags struct { diff --git a/pkg/kbld/cmd/image.go b/pkg/kbld/cmd/image.go index 8f805bb8..a3c38d52 100644 --- a/pkg/kbld/cmd/image.go +++ b/pkg/kbld/cmd/image.go @@ -7,7 +7,7 @@ import ( "reflect" "strings" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" + ctlconf "carvel.dev/kbld/pkg/kbld/config" "sigs.k8s.io/yaml" ) diff --git a/pkg/kbld/cmd/image_queue.go b/pkg/kbld/cmd/image_queue.go index 60e11881..dbf6ec6b 100644 --- a/pkg/kbld/cmd/image_queue.go +++ b/pkg/kbld/cmd/image_queue.go @@ -7,7 +7,7 @@ import ( "fmt" "sync" - ctlimg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/image" + ctlimg "carvel.dev/kbld/pkg/kbld/image" ) type ImageQueue struct { diff --git a/pkg/kbld/cmd/image_set.go b/pkg/kbld/cmd/image_set.go index f9aaa2cf..ca193cf3 100644 --- a/pkg/kbld/cmd/image_set.go +++ b/pkg/kbld/cmd/image_set.go @@ -6,12 +6,12 @@ package cmd import ( "fmt" + ctlimg "carvel.dev/kbld/pkg/kbld/image" + "carvel.dev/kbld/pkg/kbld/imagedesc" + ctllog "carvel.dev/kbld/pkg/kbld/logger" + ctlreg "carvel.dev/kbld/pkg/kbld/registry" + "carvel.dev/kbld/pkg/kbld/util" regname "github.com/google/go-containerregistry/pkg/name" - ctlimg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/image" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/imagedesc" - ctllog "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger" - ctlreg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/registry" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/util" ) type ImageSet struct { diff --git a/pkg/kbld/cmd/inspect.go b/pkg/kbld/cmd/inspect.go index 158b4341..03bd05ec 100644 --- a/pkg/kbld/cmd/inspect.go +++ b/pkg/kbld/cmd/inspect.go @@ -4,12 +4,12 @@ package cmd import ( + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctlres "carvel.dev/kbld/pkg/kbld/resources" + ctlser "carvel.dev/kbld/pkg/kbld/search" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctlres "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/resources" - ctlser "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/search" ) type InspectOptions struct { diff --git a/pkg/kbld/cmd/kbld.go b/pkg/kbld/cmd/kbld.go index cef43651..df49fe9b 100644 --- a/pkg/kbld/cmd/kbld.go +++ b/pkg/kbld/cmd/kbld.go @@ -6,10 +6,10 @@ package cmd import ( "io" + "carvel.dev/kbld/pkg/kbld/version" "github.com/cppforlife/cobrautil" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/version" ) type KbldOptions struct { diff --git a/pkg/kbld/cmd/package.go b/pkg/kbld/cmd/package.go index 4005d0ca..cee70053 100644 --- a/pkg/kbld/cmd/package.go +++ b/pkg/kbld/cmd/package.go @@ -7,15 +7,15 @@ import ( "fmt" "os" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + "carvel.dev/kbld/pkg/kbld/imagedesc" + ctllog "carvel.dev/kbld/pkg/kbld/logger" + ctlreg "carvel.dev/kbld/pkg/kbld/registry" + ctlres "carvel.dev/kbld/pkg/kbld/resources" + ctlser "carvel.dev/kbld/pkg/kbld/search" "github.com/cppforlife/go-cli-ui/ui" regname "github.com/google/go-containerregistry/pkg/name" "github.com/spf13/cobra" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/imagedesc" - ctllog "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger" - ctlreg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/registry" - ctlres "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/resources" - ctlser "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/search" ) type PackageOptions struct { diff --git a/pkg/kbld/cmd/registry_flags.go b/pkg/kbld/cmd/registry_flags.go index 34248d14..565a1b7d 100644 --- a/pkg/kbld/cmd/registry_flags.go +++ b/pkg/kbld/cmd/registry_flags.go @@ -4,8 +4,8 @@ package cmd import ( + ctlreg "carvel.dev/kbld/pkg/kbld/registry" "github.com/spf13/cobra" - ctlreg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/registry" ) type RegistryFlags struct { diff --git a/pkg/kbld/cmd/relocate.go b/pkg/kbld/cmd/relocate.go index 4da64fe9..e729d414 100644 --- a/pkg/kbld/cmd/relocate.go +++ b/pkg/kbld/cmd/relocate.go @@ -7,15 +7,15 @@ import ( "fmt" "os" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctllog "carvel.dev/kbld/pkg/kbld/logger" + ctlreg "carvel.dev/kbld/pkg/kbld/registry" + ctlres "carvel.dev/kbld/pkg/kbld/resources" + ctlser "carvel.dev/kbld/pkg/kbld/search" + "carvel.dev/kbld/pkg/kbld/version" "github.com/cppforlife/go-cli-ui/ui" regname "github.com/google/go-containerregistry/pkg/name" "github.com/spf13/cobra" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctllog "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger" - ctlreg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/registry" - ctlres "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/resources" - ctlser "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/search" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/version" "sigs.k8s.io/yaml" ) diff --git a/pkg/kbld/cmd/resolve.go b/pkg/kbld/cmd/resolve.go index cb388f6c..3b554262 100644 --- a/pkg/kbld/cmd/resolve.go +++ b/pkg/kbld/cmd/resolve.go @@ -10,16 +10,16 @@ import ( "os" "strings" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctlimg "carvel.dev/kbld/pkg/kbld/image" + ctllog "carvel.dev/kbld/pkg/kbld/logger" + ctlreg "carvel.dev/kbld/pkg/kbld/registry" + ctlres "carvel.dev/kbld/pkg/kbld/resources" + ctlser "carvel.dev/kbld/pkg/kbld/search" + "carvel.dev/kbld/pkg/kbld/version" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctlimg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/image" - ctllog "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger" - ctlreg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/registry" - ctlres "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/resources" - ctlser "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/search" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/version" "sigs.k8s.io/yaml" ) diff --git a/pkg/kbld/cmd/resolve_test.go b/pkg/kbld/cmd/resolve_test.go index fe527402..912c6c09 100644 --- a/pkg/kbld/cmd/resolve_test.go +++ b/pkg/kbld/cmd/resolve_test.go @@ -7,9 +7,9 @@ import ( "fmt" "testing" + ctlcmd "carvel.dev/kbld/pkg/kbld/cmd" + ctlconf "carvel.dev/kbld/pkg/kbld/config" "github.com/stretchr/testify/assert" - ctlcmd "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/cmd" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" ) func TestNewPlatformSelection(t *testing.T) { diff --git a/pkg/kbld/cmd/tar_image_set.go b/pkg/kbld/cmd/tar_image_set.go index 4e958b3b..11e92bb1 100644 --- a/pkg/kbld/cmd/tar_image_set.go +++ b/pkg/kbld/cmd/tar_image_set.go @@ -8,10 +8,10 @@ import ( "io" "os" + "carvel.dev/kbld/pkg/kbld/imagetar" + ctllog "carvel.dev/kbld/pkg/kbld/logger" + ctlreg "carvel.dev/kbld/pkg/kbld/registry" regname "github.com/google/go-containerregistry/pkg/name" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/imagetar" - ctllog "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger" - ctlreg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/registry" ) type TarImageSet struct { diff --git a/pkg/kbld/cmd/unpackage.go b/pkg/kbld/cmd/unpackage.go index 9d631378..28ce2b37 100644 --- a/pkg/kbld/cmd/unpackage.go +++ b/pkg/kbld/cmd/unpackage.go @@ -7,15 +7,15 @@ import ( "fmt" "os" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctllog "carvel.dev/kbld/pkg/kbld/logger" + ctlreg "carvel.dev/kbld/pkg/kbld/registry" + ctlres "carvel.dev/kbld/pkg/kbld/resources" + ctlser "carvel.dev/kbld/pkg/kbld/search" + "carvel.dev/kbld/pkg/kbld/version" "github.com/cppforlife/go-cli-ui/ui" regname "github.com/google/go-containerregistry/pkg/name" "github.com/spf13/cobra" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctllog "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger" - ctlreg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/registry" - ctlres "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/resources" - ctlser "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/search" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/version" "sigs.k8s.io/yaml" ) diff --git a/pkg/kbld/cmd/version.go b/pkg/kbld/cmd/version.go index 0c5b9c9f..f200577d 100644 --- a/pkg/kbld/cmd/version.go +++ b/pkg/kbld/cmd/version.go @@ -6,9 +6,9 @@ package cmd import ( "fmt" + "carvel.dev/kbld/pkg/kbld/version" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/version" ) type VersionOptions struct { diff --git a/pkg/kbld/config/conf.go b/pkg/kbld/config/conf.go index ba6fc5c3..dd4f9447 100644 --- a/pkg/kbld/config/conf.go +++ b/pkg/kbld/config/conf.go @@ -6,8 +6,8 @@ package config import ( "reflect" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - ctlres "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/resources" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + ctlres "carvel.dev/kbld/pkg/kbld/resources" ) type Conf struct { diff --git a/pkg/kbld/config/config.go b/pkg/kbld/config/config.go index 39e062d5..5b81ec1a 100644 --- a/pkg/kbld/config/config.go +++ b/pkg/kbld/config/config.go @@ -7,11 +7,11 @@ import ( "fmt" "io/ioutil" + "carvel.dev/imgpkg/pkg/imgpkg/lockconfig" + ctlres "carvel.dev/kbld/pkg/kbld/resources" + "carvel.dev/kbld/pkg/kbld/version" + versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" semver "github.com/hashicorp/go-version" - "github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig" - ctlres "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/resources" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/version" - versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" "sigs.k8s.io/yaml" ) diff --git a/pkg/kbld/config/image_origin.go b/pkg/kbld/config/image_origin.go index 62f0a73c..31014c26 100644 --- a/pkg/kbld/config/image_origin.go +++ b/pkg/kbld/config/image_origin.go @@ -62,7 +62,7 @@ func NewOriginsFromString(str string) ([]Origin, error) { // deploy than was used to package) there would likely be a flurry // of warnings. So, the feature would quickly need an enhancement // to de-dup such warnings. (read: added complexity) - // see also https://github.com/vmware-tanzu/carvel-kbld/issues/160 + // see also https://carvel.dev/kbld/issues/160 err := yaml.Unmarshal([]byte(str), &origins) if err != nil { return []Origin{}, err diff --git a/pkg/kbld/image/built.go b/pkg/kbld/image/built.go index eedff3b6..c37845e9 100644 --- a/pkg/kbld/image/built.go +++ b/pkg/kbld/image/built.go @@ -6,12 +6,12 @@ package image import ( "path/filepath" - ctlbbz "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder/bazel" - ctlbdk "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder/docker" - ctlbko "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder/ko" - ctlbkb "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder/kubectlbuildkit" - ctlbpk "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder/pack" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" + ctlbbz "carvel.dev/kbld/pkg/kbld/builder/bazel" + ctlbdk "carvel.dev/kbld/pkg/kbld/builder/docker" + ctlbko "carvel.dev/kbld/pkg/kbld/builder/ko" + ctlbkb "carvel.dev/kbld/pkg/kbld/builder/kubectlbuildkit" + ctlbpk "carvel.dev/kbld/pkg/kbld/builder/pack" + ctlconf "carvel.dev/kbld/pkg/kbld/config" ) type BuiltImage struct { diff --git a/pkg/kbld/image/digested.go b/pkg/kbld/image/digested.go index 9d57267d..7923852b 100644 --- a/pkg/kbld/image/digested.go +++ b/pkg/kbld/image/digested.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" + ctlconf "carvel.dev/kbld/pkg/kbld/config" regname "github.com/google/go-containerregistry/pkg/name" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" ) const digestSep = "@" diff --git a/pkg/kbld/image/err.go b/pkg/kbld/image/err.go index a1a53688..35b76a2b 100644 --- a/pkg/kbld/image/err.go +++ b/pkg/kbld/image/err.go @@ -4,7 +4,7 @@ package image import ( - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" + ctlconf "carvel.dev/kbld/pkg/kbld/config" ) type ErrImage struct { diff --git a/pkg/kbld/image/factory.go b/pkg/kbld/image/factory.go index c4a68634..2e3c9bb5 100644 --- a/pkg/kbld/image/factory.go +++ b/pkg/kbld/image/factory.go @@ -6,14 +6,14 @@ package image import ( "fmt" - ctlbbz "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder/bazel" - ctlbdk "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder/docker" - ctlbko "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder/ko" - ctlbkb "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder/kubectlbuildkit" - ctlbpk "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/builder/pack" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctllog "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger" - ctlreg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/registry" + ctlbbz "carvel.dev/kbld/pkg/kbld/builder/bazel" + ctlbdk "carvel.dev/kbld/pkg/kbld/builder/docker" + ctlbko "carvel.dev/kbld/pkg/kbld/builder/ko" + ctlbkb "carvel.dev/kbld/pkg/kbld/builder/kubectlbuildkit" + ctlbpk "carvel.dev/kbld/pkg/kbld/builder/pack" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctllog "carvel.dev/kbld/pkg/kbld/logger" + ctlreg "carvel.dev/kbld/pkg/kbld/registry" ) type Image interface { diff --git a/pkg/kbld/image/git_test.go b/pkg/kbld/image/git_test.go index 9d60e2a9..9728089d 100644 --- a/pkg/kbld/image/git_test.go +++ b/pkg/kbld/image/git_test.go @@ -15,7 +15,7 @@ import ( "strings" "testing" - ctlimg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/image" + ctlimg "carvel.dev/kbld/pkg/kbld/image" ) func TestMain(m *testing.M) { diff --git a/pkg/kbld/image/matcher.go b/pkg/kbld/image/matcher.go index cf4233eb..1237aba0 100644 --- a/pkg/kbld/image/matcher.go +++ b/pkg/kbld/image/matcher.go @@ -7,7 +7,7 @@ import ( "fmt" "regexp" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" + ctlconf "carvel.dev/kbld/pkg/kbld/config" ) type Matcher struct { diff --git a/pkg/kbld/image/matcher_test.go b/pkg/kbld/image/matcher_test.go index 927ee486..4101f64c 100644 --- a/pkg/kbld/image/matcher_test.go +++ b/pkg/kbld/image/matcher_test.go @@ -6,8 +6,8 @@ package image_test import ( "testing" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctlimg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/image" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctlimg "carvel.dev/kbld/pkg/kbld/image" ) func TestMatcherMatches(t *testing.T) { diff --git a/pkg/kbld/image/platform_selected.go b/pkg/kbld/image/platform_selected.go index f525de9d..f0d2ea5d 100644 --- a/pkg/kbld/image/platform_selected.go +++ b/pkg/kbld/image/platform_selected.go @@ -6,11 +6,11 @@ package image import ( "fmt" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctlreg "carvel.dev/kbld/pkg/kbld/registry" regname "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" regtypes "github.com/google/go-containerregistry/pkg/v1/types" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctlreg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/registry" ) // PlatformSelectedImage selects specific image matching arch/platform diff --git a/pkg/kbld/image/platform_selected_test.go b/pkg/kbld/image/platform_selected_test.go index b751f596..6fd20f5a 100644 --- a/pkg/kbld/image/platform_selected_test.go +++ b/pkg/kbld/image/platform_selected_test.go @@ -6,9 +6,9 @@ package image_test import ( "testing" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctlimg "carvel.dev/kbld/pkg/kbld/image" v1 "github.com/google/go-containerregistry/pkg/v1" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctlimg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/image" ) // TestMatchesPlatform runs test cases on the matchesPlatform function which verifies diff --git a/pkg/kbld/image/preresolved.go b/pkg/kbld/image/preresolved.go index df2361e0..45910138 100644 --- a/pkg/kbld/image/preresolved.go +++ b/pkg/kbld/image/preresolved.go @@ -4,7 +4,7 @@ package image import ( - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" + ctlconf "carvel.dev/kbld/pkg/kbld/config" ) type PreresolvedImage struct { diff --git a/pkg/kbld/image/preresolved_test.go b/pkg/kbld/image/preresolved_test.go index 3d97d135..f2441f75 100644 --- a/pkg/kbld/image/preresolved_test.go +++ b/pkg/kbld/image/preresolved_test.go @@ -6,9 +6,9 @@ package image_test import ( "testing" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + . "carvel.dev/kbld/pkg/kbld/image" "github.com/stretchr/testify/assert" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - . "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/image" ) func TestPreResolvedOrigins(t *testing.T) { diff --git a/pkg/kbld/image/resolved.go b/pkg/kbld/image/resolved.go index f248c752..17ca3a34 100644 --- a/pkg/kbld/image/resolved.go +++ b/pkg/kbld/image/resolved.go @@ -6,9 +6,9 @@ package image import ( "fmt" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctlreg "carvel.dev/kbld/pkg/kbld/registry" regname "github.com/google/go-containerregistry/pkg/name" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctlreg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/registry" ) // ResolvedImage represents an image that will be resolved into url+digest @@ -34,7 +34,7 @@ func (i ResolvedImage) URL() (string, []ctlconf.Origin, error) { // Resolve image second time because some older registry can // return "random" digests that change for every request. - // See https://github.com/vmware-tanzu/carvel-kbld/issues/21 for details. + // See https://carvel.dev/kbld/issues/21 for details. imgDescriptor2, err := i.registry.Generic(tag) if err != nil { return "", nil, err diff --git a/pkg/kbld/image/tag_selected.go b/pkg/kbld/image/tag_selected.go index 37192869..deba8fb9 100644 --- a/pkg/kbld/image/tag_selected.go +++ b/pkg/kbld/image/tag_selected.go @@ -6,11 +6,11 @@ package image import ( "fmt" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctlreg "carvel.dev/kbld/pkg/kbld/registry" + "carvel.dev/vendir/pkg/vendir/versions" + "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" regname "github.com/google/go-containerregistry/pkg/name" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctlreg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/registry" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" ) // TagSelectedImage represents an image that will be resolved into url+digest diff --git a/pkg/kbld/image/tagged.go b/pkg/kbld/image/tagged.go index fb232bfc..71c6ece6 100644 --- a/pkg/kbld/image/tagged.go +++ b/pkg/kbld/image/tagged.go @@ -4,9 +4,9 @@ package image import ( + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctlreg "carvel.dev/kbld/pkg/kbld/registry" regname "github.com/google/go-containerregistry/pkg/name" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctlreg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/registry" ) // TaggedImage represents an image that will be tagged when its URL is requested diff --git a/pkg/kbld/imagedesc/described_layer.go b/pkg/kbld/imagedesc/described_layer.go index 6a6bd4ee..cc33bcdc 100644 --- a/pkg/kbld/imagedesc/described_layer.go +++ b/pkg/kbld/imagedesc/described_layer.go @@ -7,10 +7,10 @@ import ( "fmt" "io" + "carvel.dev/kbld/pkg/kbld/imageutils/gzip" + "carvel.dev/kbld/pkg/kbld/imageutils/verify" regv1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/types" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/imageutils/gzip" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/imageutils/verify" ) type DescribedLayer struct { diff --git a/pkg/kbld/imagedesc/image_ref_descriptors.go b/pkg/kbld/imagedesc/image_ref_descriptors.go index be600248..c4801400 100644 --- a/pkg/kbld/imagedesc/image_ref_descriptors.go +++ b/pkg/kbld/imagedesc/image_ref_descriptors.go @@ -11,11 +11,11 @@ import ( "strings" "sync" + "carvel.dev/kbld/pkg/kbld/util" regname "github.com/google/go-containerregistry/pkg/name" regv1 "github.com/google/go-containerregistry/pkg/v1" regtran "github.com/google/go-containerregistry/pkg/v1/remote/transport" regtypes "github.com/google/go-containerregistry/pkg/v1/types" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/util" "golang.org/x/sync/errgroup" ) diff --git a/pkg/kbld/imagetar/tar_file.go b/pkg/kbld/imagetar/tar_file.go index b5b0a36f..c7e461bf 100644 --- a/pkg/kbld/imagetar/tar_file.go +++ b/pkg/kbld/imagetar/tar_file.go @@ -10,8 +10,8 @@ import ( "os" "strings" + "carvel.dev/kbld/pkg/kbld/imagedesc" regv1 "github.com/google/go-containerregistry/pkg/v1" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/imagedesc" ) type tarFile struct { diff --git a/pkg/kbld/imagetar/tar_reader.go b/pkg/kbld/imagetar/tar_reader.go index 8a506aae..f38a00b9 100644 --- a/pkg/kbld/imagetar/tar_reader.go +++ b/pkg/kbld/imagetar/tar_reader.go @@ -6,7 +6,7 @@ package imagetar import ( "io/ioutil" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/imagedesc" + "carvel.dev/kbld/pkg/kbld/imagedesc" ) type TarReader struct { diff --git a/pkg/kbld/imagetar/tar_writer.go b/pkg/kbld/imagetar/tar_writer.go index bdd3aeb3..fb1d98f8 100644 --- a/pkg/kbld/imagetar/tar_writer.go +++ b/pkg/kbld/imagetar/tar_writer.go @@ -12,9 +12,9 @@ import ( "sort" "time" + "carvel.dev/kbld/pkg/kbld/imagedesc" + "carvel.dev/kbld/pkg/kbld/util" regv1 "github.com/google/go-containerregistry/pkg/v1" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/imagedesc" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/util" ) type Logger interface { diff --git a/pkg/kbld/imageutils/gzip/zip.go b/pkg/kbld/imageutils/gzip/zip.go index 5a2b3bb1..1ec8df0f 100644 --- a/pkg/kbld/imageutils/gzip/zip.go +++ b/pkg/kbld/imageutils/gzip/zip.go @@ -24,7 +24,7 @@ import ( "compress/gzip" "io" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/imageutils/and" + "carvel.dev/kbld/pkg/kbld/imageutils/and" ) var gzipMagicHeader = []byte{'\x1f', '\x8b'} diff --git a/pkg/kbld/imageutils/verify/verify.go b/pkg/kbld/imageutils/verify/verify.go index 20de1032..6d61fd4b 100644 --- a/pkg/kbld/imageutils/verify/verify.go +++ b/pkg/kbld/imageutils/verify/verify.go @@ -25,8 +25,8 @@ import ( "hash" "io" + "carvel.dev/kbld/pkg/kbld/imageutils/and" v1 "github.com/google/go-containerregistry/pkg/v1" - "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/imageutils/and" ) type verifyReader struct { diff --git a/pkg/kbld/logger/logger_test.go b/pkg/kbld/logger/logger_test.go index 9ab05653..054b9e66 100644 --- a/pkg/kbld/logger/logger_test.go +++ b/pkg/kbld/logger/logger_test.go @@ -7,7 +7,7 @@ import ( "bytes" "testing" - ctllog "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/logger" + ctllog "carvel.dev/kbld/pkg/kbld/logger" ) func TestLogger(t *testing.T) { diff --git a/pkg/kbld/search/fields.go b/pkg/kbld/search/fields.go index 8189518b..0058c93b 100644 --- a/pkg/kbld/search/fields.go +++ b/pkg/kbld/search/fields.go @@ -4,8 +4,8 @@ package search import ( - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctlres "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/resources" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctlres "carvel.dev/kbld/pkg/kbld/resources" ) type Fields struct { diff --git a/pkg/kbld/search/image_refs.go b/pkg/kbld/search/image_refs.go index 0201d196..350c9183 100644 --- a/pkg/kbld/search/image_refs.go +++ b/pkg/kbld/search/image_refs.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctlres "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/resources" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctlres "carvel.dev/kbld/pkg/kbld/resources" "sigs.k8s.io/yaml" ) diff --git a/pkg/kbld/search/image_refs_test.go b/pkg/kbld/search/image_refs_test.go index 2d462637..c57b246c 100644 --- a/pkg/kbld/search/image_refs_test.go +++ b/pkg/kbld/search/image_refs_test.go @@ -9,8 +9,8 @@ import ( "sort" "testing" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctlser "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/search" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctlser "carvel.dev/kbld/pkg/kbld/search" ) func TestImageRefsMatches(t *testing.T) { diff --git a/pkg/kbld/search/rule_matcher.go b/pkg/kbld/search/rule_matcher.go index 7d8b5e71..38cec5b7 100644 --- a/pkg/kbld/search/rule_matcher.go +++ b/pkg/kbld/search/rule_matcher.go @@ -6,9 +6,9 @@ package search import ( "reflect" - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctlimg "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/image" - ctlres "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/resources" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctlimg "carvel.dev/kbld/pkg/kbld/image" + ctlres "carvel.dev/kbld/pkg/kbld/resources" ) type Matcher interface { diff --git a/pkg/kbld/search/rules_matcher.go b/pkg/kbld/search/rules_matcher.go index 1afe0c65..e01c979d 100644 --- a/pkg/kbld/search/rules_matcher.go +++ b/pkg/kbld/search/rules_matcher.go @@ -4,8 +4,8 @@ package search import ( - ctlconf "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/config" - ctlres "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/resources" + ctlconf "carvel.dev/kbld/pkg/kbld/config" + ctlres "carvel.dev/kbld/pkg/kbld/resources" ) type RulesMatcher struct { diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/LICENSE b/vendor/carvel.dev/imgpkg/LICENSE similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/LICENSE rename to vendor/carvel.dev/imgpkg/LICENSE diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/NOTICE b/vendor/carvel.dev/imgpkg/NOTICE similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/NOTICE rename to vendor/carvel.dev/imgpkg/NOTICE diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig/bundle_lock.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/lockconfig/bundle_lock.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig/bundle_lock.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/lockconfig/bundle_lock.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig/generic.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/lockconfig/generic.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig/generic.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/lockconfig/generic.go diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig/images_lock.go b/vendor/carvel.dev/imgpkg/pkg/imgpkg/lockconfig/images_lock.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig/images_lock.go rename to vendor/carvel.dev/imgpkg/pkg/imgpkg/lockconfig/images_lock.go diff --git a/vendor/github.com/vmware-tanzu/carvel-vendir/LICENSE b/vendor/carvel.dev/vendir/LICENSE similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-vendir/LICENSE rename to vendor/carvel.dev/vendir/LICENSE diff --git a/vendor/github.com/vmware-tanzu/carvel-vendir/NOTICE b/vendor/carvel.dev/vendir/NOTICE similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-vendir/NOTICE rename to vendor/carvel.dev/vendir/NOTICE diff --git a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/selector.go b/vendor/carvel.dev/vendir/pkg/vendir/versions/selector.go similarity index 96% rename from vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/selector.go rename to vendor/carvel.dev/vendir/pkg/vendir/versions/selector.go index 292650a5..14ed3311 100644 --- a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/selector.go +++ b/vendor/carvel.dev/vendir/pkg/vendir/versions/selector.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" ) type ConstraintCallback struct { diff --git a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/semvers.go b/vendor/carvel.dev/vendir/pkg/vendir/versions/semvers.go similarity index 97% rename from vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/semvers.go rename to vendor/carvel.dev/vendir/pkg/vendir/versions/semvers.go index 517829f2..29cba730 100644 --- a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/semvers.go +++ b/vendor/carvel.dev/vendir/pkg/vendir/versions/semvers.go @@ -8,8 +8,8 @@ import ( "sort" "strings" + "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" semver "github.com/carvel-dev/semver/v4" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" ) type Semvers struct { diff --git a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/config.go b/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/config.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/config.go rename to vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/config.go diff --git a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.pb.go b/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.pb.go similarity index 98% rename from vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.pb.go rename to vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.pb.go index c67facc7..53865db4 100644 --- a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.pb.go +++ b/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto +// source: carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto package v1alpha1 @@ -117,7 +117,7 @@ func init() { } func init() { - proto.RegisterFile("github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto", fileDescriptor_8d3ef80c738fc456) + proto.RegisterFile("carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto", fileDescriptor_8d3ef80c738fc456) } var fileDescriptor_8d3ef80c738fc456 = []byte{ diff --git a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto b/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto rename to vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto diff --git a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/zz_generated.deepcopy.go b/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/zz_generated.deepcopy.go rename to vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/zz_generated.deepcopy.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 9761cbfe..e0e0e6d7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,3 +1,10 @@ +# carvel.dev/imgpkg v0.39.0 +## explicit; go 1.21 +carvel.dev/imgpkg/pkg/imgpkg/lockconfig +# carvel.dev/vendir v0.37.0 +## explicit; go 1.21 +carvel.dev/vendir/pkg/vendir/versions +carvel.dev/vendir/pkg/vendir/versions/v1alpha1 # github.com/carvel-dev/semver/v4 v4.0.1-0.20230221220520-8090ce423695 ## explicit; go 1.14 github.com/carvel-dev/semver/v4 @@ -28,7 +35,7 @@ github.com/docker/cli/cli/config/types # github.com/docker/distribution v2.8.2+incompatible ## explicit github.com/docker/distribution/registry/client/auth/challenge -# github.com/docker/docker v24.0.0+incompatible +# github.com/docker/docker v24.0.7+incompatible ## explicit github.com/docker/docker/pkg/homedir # github.com/docker/docker-credential-helpers v0.7.0 @@ -142,13 +149,6 @@ github.com/vbatts/tar-split/archive/tar # github.com/vito/go-interact v1.0.1 ## explicit; go 1.12 github.com/vito/go-interact/interact -# github.com/vmware-tanzu/carvel-imgpkg v0.38.2 -## explicit; go 1.21 -github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig -# github.com/vmware-tanzu/carvel-vendir v0.35.2 -## explicit; go 1.21 -github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions -github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1 # golang.org/x/mod v0.12.0 ## explicit; go 1.17 golang.org/x/mod/semver