Merge pull request #440 from prashantrewar/change-go-module-name

Update the module name
carvel-dev · Feb 22, 2024 · c7d6589 · c7d6589
2 parents a743210 + 6e87eb3
commit c7d6589
Show file tree

Hide file tree

Showing 56 changed files with 128 additions and 128 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,4 +1,4 @@
-module github.com/vmware-tanzu/carvel-kbld
+module carvel.dev/kbld
 
 go 1.21
 

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,15 +10,15 @@ import (
 	"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"
-	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 {

diff --git a/pkg/kbld/config/conf.go b/pkg/kbld/config/conf.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 
 	"carvel.dev/imgpkg/pkg/imgpkg/lockconfig"
-	ctlres "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/resources"
+	ctlres "carvel.dev/kbld/pkg/kbld/resources"
 )
 
 type Conf struct {

diff --git a/pkg/kbld/config/config.go b/pkg/kbld/config/config.go
@@ -8,10 +8,10 @@ import (
 	"os"
 
 	"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"
-	ctlres "github.com/vmware-tanzu/carvel-kbld/pkg/kbld/resources"
-	"github.com/vmware-tanzu/carvel-kbld/pkg/kbld/version"
 	"sigs.k8s.io/yaml"
 )
 

diff --git 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
@@ -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 {