Update module name to carvel.dev

Signed-off-by: Prashant Rewar <[email protected]>
carvel-dev · Nov 20, 2023 · 3c0b325 · 3c0b325
1 parent 359d310
commit 3c0b325
Show file tree

Hide file tree

Showing 71 changed files with 155 additions and 155 deletions.
diff --git 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
@@ -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
@@ -1,17 +1,17 @@
-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
 	github.com/hashicorp/go-version v1.6.0
 	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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -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 {
@@ Expand Down @@