diff --git a/.goreleaser.yml b/.goreleaser.yml index b359eafb6..a98df672f 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -21,7 +21,7 @@ builds: ldflags: - -buildid= - - -X github.com/vmware-tanzu/carvel-kapp/pkg/kapp/version.Version={{ .Version }} + - -X carvel.dev/kapp/pkg/kapp/version.Version={{ .Version }} archives: - format: binary @@ -32,20 +32,20 @@ archives: windows: Windows amd64: x86_64 checksum: - name_template: 'checksums.txt' + name_template: "checksums.txt" algorithm: sha256 disable: false signs: - artifacts: checksum - certificate: '${artifact}.pem' + certificate: "${artifact}.pem" cmd: cosign args: - sign-blob - "--yes" - - '--output-certificate=${certificate}' - - '--output-signature=${signature}' - - '${artifact}' - output: true + - "--output-certificate=${certificate}" + - "--output-signature=${signature}" + - "${artifact}" + output: true snapshot: name_template: "{{ .Tag }}-next" release: @@ -76,7 +76,7 @@ release:

Installation and signature verification

 ### Installation - + #### By downloading binary from the release For instance, if you are using Linux on an AMD64 architecture: @@ -140,5 +140,5 @@ changelog: # the changelog # Default is empty exclude: - - '^docs:' + - "^docs:" - typo diff --git a/cmd/kapp/kapp.go b/cmd/kapp/kapp.go index 79b93c60e..3bc54ba4f 100644 --- a/cmd/kapp/kapp.go +++ b/cmd/kapp/kapp.go @@ -8,11 +8,11 @@ import ( "os" "time" + "carvel.dev/kapp/pkg/kapp/cmd" + cmdapp "carvel.dev/kapp/pkg/kapp/cmd/app" "github.com/cppforlife/cobrautil" uierrs "github.com/cppforlife/go-cli-ui/errors" "github.com/cppforlife/go-cli-ui/ui" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd" - cmdapp "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/app" // Import to initialize client auth plugins. _ "k8s.io/client-go/plugin/pkg/client/auth" diff --git a/go.mod b/go.mod index 9b921512d..b6b3dc26b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/vmware-tanzu/carvel-kapp +module carvel.dev/kapp go 1.22 diff --git a/hack/build-binaries.sh b/hack/build-binaries.sh index a9a2a7996..588a35147 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-kapp/pkg/kapp/version.Version=$VERSION -buildid=" +LDFLAGS="-X carvel.dev/kapp/pkg/kapp/version.Version=$VERSION -buildid=" GOOS=darwin GOARCH=amd64 go build -ldflags="$LDFLAGS" -trimpath -o kapp-darwin-amd64 ./cmd/kapp/... GOOS=darwin GOARCH=arm64 go build -ldflags="$LDFLAGS" -trimpath -o kapp-darwin-arm64 ./cmd/kapp/... diff --git a/hack/build.sh b/hack/build.sh index 41a806e6b..4b4fb7b52 100755 --- a/hack/build.sh +++ b/hack/build.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-kapp/pkg/kapp/version.Version=$VERSION -buildid=" +LDFLAGS="-X carvel.dev/kapp/pkg/kapp/version.Version=$VERSION -buildid=" go mod vendor go mod tidy diff --git a/pkg/kapp/app/apps.go b/pkg/kapp/app/apps.go index daffb8f4f..f9c06b420 100644 --- a/pkg/kapp/app/apps.go +++ b/pkg/kapp/app/apps.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + "carvel.dev/kapp/pkg/kapp/logger" + ctlres "carvel.dev/kapp/pkg/kapp/resources" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/kubernetes" diff --git a/pkg/kapp/app/labeled_app.go b/pkg/kapp/app/labeled_app.go index 96515fcb3..f3221a08e 100644 --- a/pkg/kapp/app/labeled_app.go +++ b/pkg/kapp/app/labeled_app.go @@ -8,7 +8,7 @@ import ( "strings" "time" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/kapp/app/preparation.go b/pkg/kapp/app/preparation.go index 6bed6ce00..e5fd6086d 100644 --- a/pkg/kapp/app/preparation.go +++ b/pkg/kapp/app/preparation.go @@ -8,8 +8,8 @@ import ( "strings" "time" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + ctlresm "carvel.dev/kapp/pkg/kapp/resourcesmisc" ) const ( diff --git a/pkg/kapp/app/recorded_app.go b/pkg/kapp/app/recorded_app.go index f73da296f..368526aa1 100644 --- a/pkg/kapp/app/recorded_app.go +++ b/pkg/kapp/app/recorded_app.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + "carvel.dev/kapp/pkg/kapp/logger" + ctlres "carvel.dev/kapp/pkg/kapp/resources" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/kapp/clusterapply/add_or_update_change.go b/pkg/kapp/clusterapply/add_or_update_change.go index 08d8ee43d..2e1f3f250 100644 --- a/pkg/kapp/clusterapply/add_or_update_change.go +++ b/pkg/kapp/clusterapply/add_or_update_change.go @@ -7,10 +7,10 @@ import ( "fmt" "time" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/util" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + "carvel.dev/kapp/pkg/kapp/util" "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/pkg/kapp/clusterapply/applying_changes.go b/pkg/kapp/clusterapply/applying_changes.go index f01282e93..0487c0b06 100644 --- a/pkg/kapp/clusterapply/applying_changes.go +++ b/pkg/kapp/clusterapply/applying_changes.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - ctldgraph "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/util" + ctldgraph "carvel.dev/kapp/pkg/kapp/diffgraph" + "carvel.dev/kapp/pkg/kapp/util" ) type ApplyingChangesOpts struct { diff --git a/pkg/kapp/clusterapply/change_set_view.go b/pkg/kapp/clusterapply/change_set_view.go index 510af95d2..14e1bd69c 100644 --- a/pkg/kapp/clusterapply/change_set_view.go +++ b/pkg/kapp/clusterapply/change_set_view.go @@ -6,12 +6,12 @@ package clusterapply import ( "fmt" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + "carvel.dev/kapp/pkg/kapp/diff" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/cppforlife/color" "github.com/cppforlife/go-cli-ui/ui" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type ChangeSetViewOpts struct { diff --git a/pkg/kapp/clusterapply/changes_view.go b/pkg/kapp/clusterapply/changes_view.go index ebcbd21e1..5480b5e05 100644 --- a/pkg/kapp/clusterapply/changes_view.go +++ b/pkg/kapp/clusterapply/changes_view.go @@ -7,12 +7,12 @@ import ( "fmt" "strings" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/mitchellh/go-wordwrap" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type ChangeView interface { diff --git a/pkg/kapp/clusterapply/cluster_change.go b/pkg/kapp/clusterapply/cluster_change.go index 3baed573b..3e66f8c31 100644 --- a/pkg/kapp/clusterapply/cluster_change.go +++ b/pkg/kapp/clusterapply/cluster_change.go @@ -7,11 +7,11 @@ import ( "fmt" "strings" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + ctlresm "carvel.dev/kapp/pkg/kapp/resourcesmisc" uierrs "github.com/cppforlife/go-cli-ui/errors" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" ) const ( diff --git a/pkg/kapp/clusterapply/cluster_change_factory.go b/pkg/kapp/clusterapply/cluster_change_factory.go index d32a50f63..7dd0243da 100644 --- a/pkg/kapp/clusterapply/cluster_change_factory.go +++ b/pkg/kapp/clusterapply/cluster_change_factory.go @@ -4,9 +4,9 @@ package clusterapply import ( - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type ClusterChangeFactory struct { diff --git a/pkg/kapp/clusterapply/cluster_change_set.go b/pkg/kapp/clusterapply/cluster_change_set.go index afed4cb8b..ba66fb385 100644 --- a/pkg/kapp/clusterapply/cluster_change_set.go +++ b/pkg/kapp/clusterapply/cluster_change_set.go @@ -7,11 +7,11 @@ import ( "fmt" "strings" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" + ctldgraph "carvel.dev/kapp/pkg/kapp/diffgraph" + "carvel.dev/kapp/pkg/kapp/logger" uierrs "github.com/cppforlife/go-cli-ui/errors" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - ctldgraph "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" ) type ClusterChangeSetOpts struct { diff --git a/pkg/kapp/clusterapply/converged_resource.go b/pkg/kapp/clusterapply/converged_resource.go index 0dffdc788..31059b0c4 100644 --- a/pkg/kapp/clusterapply/converged_resource.go +++ b/pkg/kapp/clusterapply/converged_resource.go @@ -8,9 +8,9 @@ import ( "reflect" "sort" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + ctlresm "carvel.dev/kapp/pkg/kapp/resourcesmisc" "github.com/cppforlife/color" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" ) const ( diff --git a/pkg/kapp/clusterapply/converged_resource_factory.go b/pkg/kapp/clusterapply/converged_resource_factory.go index 1be059366..775610d41 100644 --- a/pkg/kapp/clusterapply/converged_resource_factory.go +++ b/pkg/kapp/clusterapply/converged_resource_factory.go @@ -4,9 +4,9 @@ package clusterapply import ( - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + ctlresm "carvel.dev/kapp/pkg/kapp/resourcesmisc" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/kapp/clusterapply/delete_change.go b/pkg/kapp/clusterapply/delete_change.go index d7e609ea3..aabd871f5 100644 --- a/pkg/kapp/clusterapply/delete_change.go +++ b/pkg/kapp/clusterapply/delete_change.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + ctlresm "carvel.dev/kapp/pkg/kapp/resourcesmisc" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" ) @@ -93,7 +93,7 @@ func (c DeleteChange) IsDoneApplying() (ctlresm.DoneApplyState, []string, error) // it should not matter if change is ignored or not // because it should be deleted eventually anyway (thru GC) // We should check for the UID check because of the following bug: - // https://github.com/vmware-tanzu/carvel-kapp/issues/229 + // https://github.com/carvel-dev/kapp/issues/229 existingRes, exists, err := c.identifiedResources.Exists(res, ctlres.ExistsOpts{SameUID: true}) if err != nil { return ctlresm.DoneApplyState{}, nil, err diff --git a/pkg/kapp/clusterapply/exists_change.go b/pkg/kapp/clusterapply/exists_change.go index 9b40ea8ba..78bc4bb0e 100644 --- a/pkg/kapp/clusterapply/exists_change.go +++ b/pkg/kapp/clusterapply/exists_change.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package clusterapply @@ -6,8 +6,8 @@ package clusterapply import ( "fmt" - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type ExistsChange struct { diff --git a/pkg/kapp/clusterapply/reconciling_change.go b/pkg/kapp/clusterapply/reconciling_change.go index 444b95dd7..1db48dd63 100644 --- a/pkg/kapp/clusterapply/reconciling_change.go +++ b/pkg/kapp/clusterapply/reconciling_change.go @@ -4,10 +4,10 @@ package clusterapply import ( - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" + "carvel.dev/kapp/pkg/kapp/logger" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + ctlresm "carvel.dev/kapp/pkg/kapp/resourcesmisc" ) type ReconcilingChange struct { diff --git a/pkg/kapp/clusterapply/ui.go b/pkg/kapp/clusterapply/ui.go index b3fc7956b..dd87874bc 100644 --- a/pkg/kapp/clusterapply/ui.go +++ b/pkg/kapp/clusterapply/ui.go @@ -4,7 +4,7 @@ package clusterapply import ( - ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" + ctlresm "carvel.dev/kapp/pkg/kapp/resourcesmisc" ) type UI interface { diff --git a/pkg/kapp/clusterapply/waiting_changes.go b/pkg/kapp/clusterapply/waiting_changes.go index ee0c0abfa..1026821e8 100644 --- a/pkg/kapp/clusterapply/waiting_changes.go +++ b/pkg/kapp/clusterapply/waiting_changes.go @@ -8,10 +8,10 @@ import ( "strings" "time" + ctldgraph "carvel.dev/kapp/pkg/kapp/diffgraph" + ctlresm "carvel.dev/kapp/pkg/kapp/resourcesmisc" + "carvel.dev/kapp/pkg/kapp/util" uierrs "github.com/cppforlife/go-cli-ui/errors" - ctldgraph "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" - ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/util" ) type WaitingChangesOpts struct { diff --git a/pkg/kapp/cmd/app/app_flags.go b/pkg/kapp/cmd/app/app_flags.go index a54a1a6b8..b0e452680 100644 --- a/pkg/kapp/cmd/app/app_flags.go +++ b/pkg/kapp/cmd/app/app_flags.go @@ -6,7 +6,7 @@ package app import ( "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" ) type Flags struct { diff --git a/pkg/kapp/cmd/app/apply_flags.go b/pkg/kapp/cmd/app/apply_flags.go index d3cc55c22..9174f97ca 100644 --- a/pkg/kapp/cmd/app/apply_flags.go +++ b/pkg/kapp/cmd/app/apply_flags.go @@ -7,8 +7,8 @@ import ( "fmt" "time" + ctlcap "carvel.dev/kapp/pkg/kapp/clusterapply" "github.com/spf13/cobra" - ctlcap "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/clusterapply" ) var ( diff --git a/pkg/kapp/cmd/app/delete.go b/pkg/kapp/cmd/app/delete.go index 8a9270960..9f998320c 100644 --- a/pkg/kapp/cmd/app/delete.go +++ b/pkg/kapp/cmd/app/delete.go @@ -4,18 +4,18 @@ package app import ( + ctlapp "carvel.dev/kapp/pkg/kapp/app" + ctlcap "carvel.dev/kapp/pkg/kapp/clusterapply" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + cmdtools "carvel.dev/kapp/pkg/kapp/cmd/tools" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" + ctldgraph "carvel.dev/kapp/pkg/kapp/diffgraph" + ctldiffui "carvel.dev/kapp/pkg/kapp/diffui" + "carvel.dev/kapp/pkg/kapp/logger" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - ctlapp "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/app" - ctlcap "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/clusterapply" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - cmdtools "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/tools" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - ctldgraph "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" - ctldiffui "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffui" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type DeleteOptions struct { @@ -292,7 +292,7 @@ const ( func (o *DeleteOptions) changeIgnored(resources []ctlres.Resource) { // Good example for use of this annotation is PVCs created by StatefulSet // (PVCs do not get deleted when StatefulSet is deleted: - // https://github.com/vmware-tanzu/carvel-kapp/issues/36) + // https://github.com/carvel-dev/kapp/issues/36) for _, res := range resources { if _, found := res.Annotations()[ownedForDeletionAnnKey]; found { res.MarkTransient(false) diff --git a/pkg/kapp/cmd/app/deploy.go b/pkg/kapp/cmd/app/deploy.go index 31dd1bd49..f4b95915b 100644 --- a/pkg/kapp/cmd/app/deploy.go +++ b/pkg/kapp/cmd/app/deploy.go @@ -18,19 +18,19 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" - ctlapp "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/app" - ctlcap "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/clusterapply" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - cmdtools "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/tools" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - ctldgraph "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" - ctldiffui "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffui" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - ctllogs "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logs" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/preflight" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" + ctlapp "carvel.dev/kapp/pkg/kapp/app" + ctlcap "carvel.dev/kapp/pkg/kapp/clusterapply" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + cmdtools "carvel.dev/kapp/pkg/kapp/cmd/tools" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" + ctldgraph "carvel.dev/kapp/pkg/kapp/diffgraph" + ctldiffui "carvel.dev/kapp/pkg/kapp/diffui" + "carvel.dev/kapp/pkg/kapp/logger" + ctllogs "carvel.dev/kapp/pkg/kapp/logs" + "carvel.dev/kapp/pkg/kapp/preflight" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + ctlresm "carvel.dev/kapp/pkg/kapp/resourcesmisc" ) const ( diff --git a/pkg/kapp/cmd/app/deploy_config.go b/pkg/kapp/cmd/app/deploy_config.go index c5ec8f0c2..d27aae6fb 100644 --- a/pkg/kapp/cmd/app/deploy_config.go +++ b/pkg/kapp/cmd/app/deploy_config.go @@ -4,10 +4,10 @@ package app import ( + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + ctlconf "carvel.dev/kapp/pkg/kapp/config" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" ) type DeployConfigOptions struct { diff --git a/pkg/kapp/cmd/app/deploy_flags.go b/pkg/kapp/cmd/app/deploy_flags.go index 68aff05f5..ec483305b 100644 --- a/pkg/kapp/cmd/app/deploy_flags.go +++ b/pkg/kapp/cmd/app/deploy_flags.go @@ -6,8 +6,8 @@ package app import ( "fmt" + ctlapp "carvel.dev/kapp/pkg/kapp/app" "github.com/spf13/cobra" - ctlapp "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/app" ) type DeployFlags struct { diff --git a/pkg/kapp/cmd/app/factory.go b/pkg/kapp/cmd/app/factory.go index b4d73ab6a..6bc72d637 100644 --- a/pkg/kapp/cmd/app/factory.go +++ b/pkg/kapp/cmd/app/factory.go @@ -4,10 +4,10 @@ package app import ( - ctlapp "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlapp "carvel.dev/kapp/pkg/kapp/app" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + "carvel.dev/kapp/pkg/kapp/logger" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "k8s.io/client-go/kubernetes" ) diff --git a/pkg/kapp/cmd/app/failing_api_services_policy.go b/pkg/kapp/cmd/app/failing_api_services_policy.go index 021fa7e1d..e9db597eb 100644 --- a/pkg/kapp/cmd/app/failing_api_services_policy.go +++ b/pkg/kapp/cmd/app/failing_api_services_policy.go @@ -4,7 +4,7 @@ package app import ( - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/kapp/cmd/app/inspect.go b/pkg/kapp/cmd/app/inspect.go index 9ace805b1..c16431335 100644 --- a/pkg/kapp/cmd/app/inspect.go +++ b/pkg/kapp/cmd/app/inspect.go @@ -6,14 +6,14 @@ package app import ( "fmt" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + cmdtools "carvel.dev/kapp/pkg/kapp/cmd/tools" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" + "carvel.dev/kapp/pkg/kapp/logger" + "carvel.dev/kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - cmdtools "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/tools" - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type InspectOptions struct { diff --git a/pkg/kapp/cmd/app/inspect_status_view.go b/pkg/kapp/cmd/app/inspect_status_view.go index 1fd2a2927..ba1df9583 100644 --- a/pkg/kapp/cmd/app/inspect_status_view.go +++ b/pkg/kapp/cmd/app/inspect_status_view.go @@ -6,10 +6,10 @@ package app import ( "fmt" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type InspectStatusView struct { diff --git a/pkg/kapp/cmd/app/label.go b/pkg/kapp/cmd/app/label.go index b3f3bd166..f5d517577 100644 --- a/pkg/kapp/cmd/app/label.go +++ b/pkg/kapp/cmd/app/label.go @@ -4,10 +4,10 @@ package app import ( + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + "carvel.dev/kapp/pkg/kapp/logger" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" ) type LabelOptions struct { diff --git a/pkg/kapp/cmd/app/list.go b/pkg/kapp/cmd/app/list.go index 73b82a908..a734ad09f 100644 --- a/pkg/kapp/cmd/app/list.go +++ b/pkg/kapp/cmd/app/list.go @@ -7,12 +7,12 @@ import ( "fmt" "time" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + cmdtools "carvel.dev/kapp/pkg/kapp/cmd/tools" + "carvel.dev/kapp/pkg/kapp/logger" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - cmdtools "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/tools" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" ) type ListOptions struct { diff --git a/pkg/kapp/cmd/app/logs.go b/pkg/kapp/cmd/app/logs.go index 72f51a6ce..e4617ae2a 100644 --- a/pkg/kapp/cmd/app/logs.go +++ b/pkg/kapp/cmd/app/logs.go @@ -4,13 +4,13 @@ package app import ( + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + "carvel.dev/kapp/pkg/kapp/logger" + ctllogs "carvel.dev/kapp/pkg/kapp/logs" + "carvel.dev/kapp/pkg/kapp/matcher" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - ctllogs "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logs" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/matcher" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/kapp/cmd/app/logs_flags.go b/pkg/kapp/cmd/app/logs_flags.go index a85784d47..a735128c1 100644 --- a/pkg/kapp/cmd/app/logs_flags.go +++ b/pkg/kapp/cmd/app/logs_flags.go @@ -6,8 +6,8 @@ package app import ( "fmt" + ctllogs "carvel.dev/kapp/pkg/kapp/logs" "github.com/spf13/cobra" - ctllogs "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logs" ) type LogsFlags struct { diff --git a/pkg/kapp/cmd/app/rename.go b/pkg/kapp/cmd/app/rename.go index ff96fe2bd..f69f2c8ab 100644 --- a/pkg/kapp/cmd/app/rename.go +++ b/pkg/kapp/cmd/app/rename.go @@ -6,10 +6,10 @@ package app import ( "fmt" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + "carvel.dev/kapp/pkg/kapp/logger" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" ) type RenameOptions struct { diff --git a/pkg/kapp/cmd/app/used_gks_scope.go b/pkg/kapp/cmd/app/used_gks_scope.go index e4f729d5f..45eea04cf 100644 --- a/pkg/kapp/cmd/app/used_gks_scope.go +++ b/pkg/kapp/cmd/app/used_gks_scope.go @@ -4,7 +4,7 @@ package app import ( - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/kapp/cmd/appchange/cmd.go b/pkg/kapp/cmd/appchange/cmd.go index 1c979d3aa..caddad485 100644 --- a/pkg/kapp/cmd/appchange/cmd.go +++ b/pkg/kapp/cmd/appchange/cmd.go @@ -4,8 +4,8 @@ package appchange import ( + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" ) func NewCmd() *cobra.Command { diff --git a/pkg/kapp/cmd/appchange/gc.go b/pkg/kapp/cmd/appchange/gc.go index db69e2fd6..78f6fd899 100644 --- a/pkg/kapp/cmd/appchange/gc.go +++ b/pkg/kapp/cmd/appchange/gc.go @@ -4,12 +4,12 @@ package appchange import ( + ctlapp "carvel.dev/kapp/pkg/kapp/app" + cmdapp "carvel.dev/kapp/pkg/kapp/cmd/app" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + "carvel.dev/kapp/pkg/kapp/logger" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - ctlapp "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/app" - cmdapp "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" ) type GCOptions struct { diff --git a/pkg/kapp/cmd/appchange/list.go b/pkg/kapp/cmd/appchange/list.go index 171a3dc3d..bec9fc286 100644 --- a/pkg/kapp/cmd/appchange/list.go +++ b/pkg/kapp/cmd/appchange/list.go @@ -8,13 +8,13 @@ import ( "strings" "time" + ctlapp "carvel.dev/kapp/pkg/kapp/app" + cmdapp "carvel.dev/kapp/pkg/kapp/cmd/app" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + "carvel.dev/kapp/pkg/kapp/logger" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - ctlapp "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/app" - cmdapp "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" ) type ListOptions struct { diff --git a/pkg/kapp/cmd/appgroup/app_group_flags.go b/pkg/kapp/cmd/appgroup/app_group_flags.go index cface3d13..3dc8546e7 100644 --- a/pkg/kapp/cmd/appgroup/app_group_flags.go +++ b/pkg/kapp/cmd/appgroup/app_group_flags.go @@ -4,8 +4,8 @@ package appgroup import ( + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" ) type Flags struct { diff --git a/pkg/kapp/cmd/appgroup/cmd.go b/pkg/kapp/cmd/appgroup/cmd.go index 0d01446fa..077f10697 100644 --- a/pkg/kapp/cmd/appgroup/cmd.go +++ b/pkg/kapp/cmd/appgroup/cmd.go @@ -4,8 +4,8 @@ package appgroup import ( + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" ) func NewCmd() *cobra.Command { diff --git a/pkg/kapp/cmd/appgroup/delete.go b/pkg/kapp/cmd/appgroup/delete.go index 7cfa503dd..b66041cea 100644 --- a/pkg/kapp/cmd/appgroup/delete.go +++ b/pkg/kapp/cmd/appgroup/delete.go @@ -6,12 +6,12 @@ package appgroup import ( "fmt" + cmdapp "carvel.dev/kapp/pkg/kapp/cmd/app" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + cmdtools "carvel.dev/kapp/pkg/kapp/cmd/tools" + "carvel.dev/kapp/pkg/kapp/logger" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdapp "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - cmdtools "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/tools" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" ) const ( diff --git a/pkg/kapp/cmd/appgroup/deploy.go b/pkg/kapp/cmd/appgroup/deploy.go index a5bbc34d8..04685a92b 100644 --- a/pkg/kapp/cmd/appgroup/deploy.go +++ b/pkg/kapp/cmd/appgroup/deploy.go @@ -9,13 +9,13 @@ import ( "os" "path/filepath" + cmdapp "carvel.dev/kapp/pkg/kapp/cmd/app" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + cmdtools "carvel.dev/kapp/pkg/kapp/cmd/tools" + "carvel.dev/kapp/pkg/kapp/logger" + "carvel.dev/kapp/pkg/kapp/preflight" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdapp "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - cmdtools "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/tools" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/preflight" ) type DeployOptions struct { diff --git a/pkg/kapp/cmd/configmap/cmd.go b/pkg/kapp/cmd/configmap/cmd.go index 488a08bbb..fa0f5105e 100644 --- a/pkg/kapp/cmd/configmap/cmd.go +++ b/pkg/kapp/cmd/configmap/cmd.go @@ -4,8 +4,8 @@ package configmap import ( + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" ) func NewCmd() *cobra.Command { diff --git a/pkg/kapp/cmd/configmap/list.go b/pkg/kapp/cmd/configmap/list.go index 4f3dbb08b..de56ad83c 100644 --- a/pkg/kapp/cmd/configmap/list.go +++ b/pkg/kapp/cmd/configmap/list.go @@ -4,12 +4,12 @@ package configmap import ( + cmdapp "carvel.dev/kapp/pkg/kapp/cmd/app" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + "carvel.dev/kapp/pkg/kapp/logger" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - cmdapp "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" ) type ListOptions struct { diff --git a/pkg/kapp/cmd/kapp.go b/pkg/kapp/cmd/kapp.go index 678db9bed..bb8eff3ec 100644 --- a/pkg/kapp/cmd/kapp.go +++ b/pkg/kapp/cmd/kapp.go @@ -6,21 +6,21 @@ package cmd import ( "io" + cmdapp "carvel.dev/kapp/pkg/kapp/cmd/app" + cmdac "carvel.dev/kapp/pkg/kapp/cmd/appchange" + cmdag "carvel.dev/kapp/pkg/kapp/cmd/appgroup" + cmdcm "carvel.dev/kapp/pkg/kapp/cmd/configmap" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + cmdsa "carvel.dev/kapp/pkg/kapp/cmd/serviceaccount" + cmdtools "carvel.dev/kapp/pkg/kapp/cmd/tools" + "carvel.dev/kapp/pkg/kapp/crdupgradesafety" + "carvel.dev/kapp/pkg/kapp/logger" + "carvel.dev/kapp/pkg/kapp/permissions" + "carvel.dev/kapp/pkg/kapp/preflight" + "carvel.dev/kapp/pkg/kapp/version" "github.com/cppforlife/cobrautil" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdapp "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/app" - cmdac "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/appchange" - cmdag "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/appgroup" - cmdcm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/configmap" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - cmdsa "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/serviceaccount" - cmdtools "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/tools" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/crdupgradesafety" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/permissions" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/preflight" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/version" ) type KappOptions struct { @@ -162,7 +162,7 @@ func NewKappCmd(o *KappOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Comman configureTTYFlag := func(cmd *cobra.Command) { var forceTTY bool - // Default tty to true for deploy and delete commands: https://github.com/vmware-tanzu/carvel-kapp/issues/28 + // Default tty to true for deploy and delete commands: https://github.com/carvel-dev/kapp/issues/28 _, defaultTTY := cmd.Annotations[cmdapp.TTYByDefaultKey] cmd.Flags().BoolVar(&forceTTY, "tty", defaultTTY, "Force TTY-like output") diff --git a/pkg/kapp/cmd/logger_flags.go b/pkg/kapp/cmd/logger_flags.go index 516d2f59d..efd56e996 100644 --- a/pkg/kapp/cmd/logger_flags.go +++ b/pkg/kapp/cmd/logger_flags.go @@ -4,9 +4,9 @@ package cmd import ( + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + "carvel.dev/kapp/pkg/kapp/logger" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" ) type LoggerFlags struct { diff --git a/pkg/kapp/cmd/profiling.go b/pkg/kapp/cmd/profiling.go index 5320b4591..056afdae2 100644 --- a/pkg/kapp/cmd/profiling.go +++ b/pkg/kapp/cmd/profiling.go @@ -10,8 +10,8 @@ import ( "runtime" "runtime/pprof" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" ) type ProfilingFlags struct { diff --git a/pkg/kapp/cmd/serviceaccount/cmd.go b/pkg/kapp/cmd/serviceaccount/cmd.go index 246462ffc..3dcf0b3ca 100644 --- a/pkg/kapp/cmd/serviceaccount/cmd.go +++ b/pkg/kapp/cmd/serviceaccount/cmd.go @@ -4,8 +4,8 @@ package serviceaccount import ( + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" ) func NewCmd() *cobra.Command { diff --git a/pkg/kapp/cmd/serviceaccount/list.go b/pkg/kapp/cmd/serviceaccount/list.go index abcaf97ea..5a094a8af 100644 --- a/pkg/kapp/cmd/serviceaccount/list.go +++ b/pkg/kapp/cmd/serviceaccount/list.go @@ -4,13 +4,13 @@ package serviceaccount import ( + cmdapp "carvel.dev/kapp/pkg/kapp/cmd/app" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + "carvel.dev/kapp/pkg/kapp/logger" + "carvel.dev/kapp/pkg/kapp/resources" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - cmdapp "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type ListOptions struct { diff --git a/pkg/kapp/cmd/serviceaccount/rbac.go b/pkg/kapp/cmd/serviceaccount/rbac.go index 2c16a783e..26b52a1a7 100644 --- a/pkg/kapp/cmd/serviceaccount/rbac.go +++ b/pkg/kapp/cmd/serviceaccount/rbac.go @@ -4,7 +4,7 @@ package serviceaccount import ( - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "sigs.k8s.io/yaml" ) diff --git a/pkg/kapp/cmd/serviceaccount/rbac_resources.go b/pkg/kapp/cmd/serviceaccount/rbac_resources.go index bd283e51f..50613f7a2 100644 --- a/pkg/kapp/cmd/serviceaccount/rbac_resources.go +++ b/pkg/kapp/cmd/serviceaccount/rbac_resources.go @@ -4,7 +4,7 @@ package serviceaccount import ( - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type RBACResources struct { diff --git a/pkg/kapp/cmd/tools/app_filter_flags.go b/pkg/kapp/cmd/tools/app_filter_flags.go index 64db0c34e..9a1196894 100644 --- a/pkg/kapp/cmd/tools/app_filter_flags.go +++ b/pkg/kapp/cmd/tools/app_filter_flags.go @@ -7,8 +7,8 @@ import ( "fmt" "time" + "carvel.dev/kapp/pkg/kapp/app" "github.com/spf13/cobra" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/app" ) type AppFilterFlags struct { diff --git a/pkg/kapp/cmd/tools/cmd.go b/pkg/kapp/cmd/tools/cmd.go index f7f510038..e243c80bd 100644 --- a/pkg/kapp/cmd/tools/cmd.go +++ b/pkg/kapp/cmd/tools/cmd.go @@ -4,8 +4,8 @@ package tools import ( + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" ) func NewCmd() *cobra.Command { diff --git a/pkg/kapp/cmd/tools/diff.go b/pkg/kapp/cmd/tools/diff.go index 2ea56d520..e1700fd87 100644 --- a/pkg/kapp/cmd/tools/diff.go +++ b/pkg/kapp/cmd/tools/diff.go @@ -9,10 +9,10 @@ import ( "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - ctlcap "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/clusterapply" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlcap "carvel.dev/kapp/pkg/kapp/clusterapply" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type DiffOptions struct { diff --git a/pkg/kapp/cmd/tools/diff_flags.go b/pkg/kapp/cmd/tools/diff_flags.go index 9faab98dc..131c2f74d 100644 --- a/pkg/kapp/cmd/tools/diff_flags.go +++ b/pkg/kapp/cmd/tools/diff_flags.go @@ -4,9 +4,9 @@ package tools import ( + ctlcap "carvel.dev/kapp/pkg/kapp/clusterapply" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" "github.com/spf13/cobra" - ctlcap "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/clusterapply" - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" ) type DiffFlags struct { diff --git a/pkg/kapp/cmd/tools/inspect.go b/pkg/kapp/cmd/tools/inspect.go index 047ae54a4..c26c940c4 100644 --- a/pkg/kapp/cmd/tools/inspect.go +++ b/pkg/kapp/cmd/tools/inspect.go @@ -9,8 +9,8 @@ import ( "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type InspectOptions struct { diff --git a/pkg/kapp/cmd/tools/inspect_tree_view.go b/pkg/kapp/cmd/tools/inspect_tree_view.go index 363da41f9..20ccc2c33 100644 --- a/pkg/kapp/cmd/tools/inspect_tree_view.go +++ b/pkg/kapp/cmd/tools/inspect_tree_view.go @@ -8,12 +8,12 @@ import ( "io" "strings" + ctlcap "carvel.dev/kapp/pkg/kapp/clusterapply" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/cppforlife/color" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" - ctlcap "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/clusterapply" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type InspectTreeView struct { diff --git a/pkg/kapp/cmd/tools/inspect_view.go b/pkg/kapp/cmd/tools/inspect_view.go index c6639c834..abde0abff 100644 --- a/pkg/kapp/cmd/tools/inspect_view.go +++ b/pkg/kapp/cmd/tools/inspect_view.go @@ -6,11 +6,11 @@ package tools import ( "fmt" + ctlcap "carvel.dev/kapp/pkg/kapp/clusterapply" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" - ctlcap "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/clusterapply" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type InspectView struct { diff --git a/pkg/kapp/cmd/tools/list_labels.go b/pkg/kapp/cmd/tools/list_labels.go index f78018fab..5190b37a8 100644 --- a/pkg/kapp/cmd/tools/list_labels.go +++ b/pkg/kapp/cmd/tools/list_labels.go @@ -6,12 +6,12 @@ package tools import ( "fmt" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + "carvel.dev/kapp/pkg/kapp/logger" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" "k8s.io/apimachinery/pkg/labels" ) diff --git a/pkg/kapp/cmd/tools/resource_filter_flags.go b/pkg/kapp/cmd/tools/resource_filter_flags.go index 83f43aa53..fc5617154 100644 --- a/pkg/kapp/cmd/tools/resource_filter_flags.go +++ b/pkg/kapp/cmd/tools/resource_filter_flags.go @@ -7,8 +7,8 @@ import ( "fmt" "time" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/spf13/cobra" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type ResourceFilterFlags struct { diff --git a/pkg/kapp/cmd/ui_flags.go b/pkg/kapp/cmd/ui_flags.go index 8e8856197..f3837824d 100644 --- a/pkg/kapp/cmd/ui_flags.go +++ b/pkg/kapp/cmd/ui_flags.go @@ -4,10 +4,10 @@ package cmd import ( + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" ) type UIFlags struct { diff --git a/pkg/kapp/cmd/version.go b/pkg/kapp/cmd/version.go index 1f7017d32..e4662b660 100644 --- a/pkg/kapp/cmd/version.go +++ b/pkg/kapp/cmd/version.go @@ -6,10 +6,10 @@ package cmd import ( "fmt" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + "carvel.dev/kapp/pkg/kapp/version" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/version" ) type VersionOptions struct { diff --git a/pkg/kapp/cmd/warning_flags.go b/pkg/kapp/cmd/warning_flags.go index 52bc91e39..32ea6578d 100644 --- a/pkg/kapp/cmd/warning_flags.go +++ b/pkg/kapp/cmd/warning_flags.go @@ -1,11 +1,11 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package cmd import ( + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" ) type WarningFlags struct { diff --git a/pkg/kapp/config/conf.go b/pkg/kapp/config/conf.go index 47ba5b21e..3a3c2486e 100644 --- a/pkg/kapp/config/conf.go +++ b/pkg/kapp/config/conf.go @@ -6,7 +6,7 @@ package config import ( "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/kapp/config/config.go b/pkg/kapp/config/config.go index 9762f3da9..014d2fa9d 100644 --- a/pkg/kapp/config/config.go +++ b/pkg/kapp/config/config.go @@ -6,10 +6,10 @@ package config import ( "fmt" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + "carvel.dev/kapp/pkg/kapp/version" + "carvel.dev/kapp/pkg/kapp/yttresmod" semver "github.com/hashicorp/go-version" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/version" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/yttresmod" "sigs.k8s.io/yaml" ) diff --git a/pkg/kapp/config/default.go b/pkg/kapp/config/default.go index 9eb8625fa..dc0edca58 100644 --- a/pkg/kapp/config/default.go +++ b/pkg/kapp/config/default.go @@ -4,7 +4,7 @@ package config import ( - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) const defaultConfigYAML = `--- @@ -656,7 +656,7 @@ changeRuleBindings: # Insert roles/ClusterRoles before inserting any roleBinding/ClusterRoleBinding # Sometimes Binding Creation fail as corresponding Role is not created. -# https://github.com/vmware-tanzu/carvel-kapp/issues/145 +# https://github.com/carvel-dev/kapp/issues/145 - rules: - "upsert after upserting change-groups.kapp.k14s.io/rbac-roles" ignoreIfCyclical: true diff --git a/pkg/kapp/config/default_test.go b/pkg/kapp/config/default_test.go index c512fa917..8f7833845 100644 --- a/pkg/kapp/config/default_test.go +++ b/pkg/kapp/config/default_test.go @@ -4,12 +4,13 @@ package config_test import ( - "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" "strings" "testing" + + "carvel.dev/kapp/pkg/kapp/config" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + "github.com/stretchr/testify/require" ) func TestDefaultTemplateRules(t *testing.T) { diff --git a/pkg/kapp/config/resource_matchers.go b/pkg/kapp/config/resource_matchers.go index eff9b4b2f..e893f6677 100644 --- a/pkg/kapp/config/resource_matchers.go +++ b/pkg/kapp/config/resource_matchers.go @@ -6,7 +6,7 @@ package config import ( "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type ResourceMatchers []ResourceMatcher diff --git a/pkg/kapp/crdupgradesafety/change_validator_test.go b/pkg/kapp/crdupgradesafety/change_validator_test.go index 6c4b943c5..d979b0f81 100644 --- a/pkg/kapp/crdupgradesafety/change_validator_test.go +++ b/pkg/kapp/crdupgradesafety/change_validator_test.go @@ -7,8 +7,8 @@ import ( "errors" "testing" + "carvel.dev/kapp/pkg/kapp/crdupgradesafety" "github.com/stretchr/testify/assert" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/crdupgradesafety" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" ) diff --git a/pkg/kapp/crdupgradesafety/preflight.go b/pkg/kapp/crdupgradesafety/preflight.go index 687223899..cd3e661cc 100644 --- a/pkg/kapp/crdupgradesafety/preflight.go +++ b/pkg/kapp/crdupgradesafety/preflight.go @@ -8,9 +8,9 @@ import ( "errors" "fmt" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - ctldgraph "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/preflight" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + ctldgraph "carvel.dev/kapp/pkg/kapp/diffgraph" + "carvel.dev/kapp/pkg/kapp/preflight" v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/kapp/diff/change.go b/pkg/kapp/diff/change.go index 20253168b..3e72bdb7b 100644 --- a/pkg/kapp/diff/change.go +++ b/pkg/kapp/diff/change.go @@ -4,8 +4,8 @@ package diff import ( + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/cppforlife/go-patch/patch" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type ChangeOp string diff --git a/pkg/kapp/diff/change_factory.go b/pkg/kapp/diff/change_factory.go index 81be79b81..fde98e73c 100644 --- a/pkg/kapp/diff/change_factory.go +++ b/pkg/kapp/diff/change_factory.go @@ -4,7 +4,7 @@ package diff import ( - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type ChangeFactory struct { diff --git a/pkg/kapp/diff/change_precalculated.go b/pkg/kapp/diff/change_precalculated.go index 19d04f914..d3860bc76 100644 --- a/pkg/kapp/diff/change_precalculated.go +++ b/pkg/kapp/diff/change_precalculated.go @@ -4,7 +4,7 @@ package diff import ( - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type ChangePrecalculated struct { diff --git a/pkg/kapp/diff/change_set.go b/pkg/kapp/diff/change_set.go index 4b76bd9f9..67630fb20 100644 --- a/pkg/kapp/diff/change_set.go +++ b/pkg/kapp/diff/change_set.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type ChangeSetOpts struct { diff --git a/pkg/kapp/diff/change_set_factory.go b/pkg/kapp/diff/change_set_factory.go index 48830eaca..0f2670bdd 100644 --- a/pkg/kapp/diff/change_set_factory.go +++ b/pkg/kapp/diff/change_set_factory.go @@ -4,7 +4,7 @@ package diff import ( - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type ChangeSetFactory struct { diff --git a/pkg/kapp/diff/change_set_test.go b/pkg/kapp/diff/change_set_test.go index c1ed3e5c9..8d86df61c 100644 --- a/pkg/kapp/diff/change_set_test.go +++ b/pkg/kapp/diff/change_set_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + ctldiff "carvel.dev/kapp/pkg/kapp/diff" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" - ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestChangeSet_RebaseWithoutNew_And_WithUnexpectedChanges(t *testing.T) { diff --git a/pkg/kapp/diff/change_set_with_versioned_rs.go b/pkg/kapp/diff/change_set_with_versioned_rs.go index 8f355bd68..6b6461c74 100644 --- a/pkg/kapp/diff/change_set_with_versioned_rs.go +++ b/pkg/kapp/diff/change_set_with_versioned_rs.go @@ -8,8 +8,8 @@ import ( "sort" "strconv" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) const ( diff --git a/pkg/kapp/diff/change_set_with_versioned_rs_test.go b/pkg/kapp/diff/change_set_with_versioned_rs_test.go index 66db1d906..d75485f28 100644 --- a/pkg/kapp/diff/change_set_with_versioned_rs_test.go +++ b/pkg/kapp/diff/change_set_with_versioned_rs_test.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package diff @@ -6,8 +6,8 @@ package diff import ( "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestChangeSet_ExistingVersioned_NewNonVersioned_Resource(t *testing.T) { diff --git a/pkg/kapp/diff/configurable_text_diff.go b/pkg/kapp/diff/configurable_text_diff.go index fcedd5fb1..4148aba51 100644 --- a/pkg/kapp/diff/configurable_text_diff.go +++ b/pkg/kapp/diff/configurable_text_diff.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type ConfigurableTextDiff struct { diff --git a/pkg/kapp/diff/explicit_versioned_ref.go b/pkg/kapp/diff/explicit_versioned_ref.go index 388e36a30..3bd576136 100644 --- a/pkg/kapp/diff/explicit_versioned_ref.go +++ b/pkg/kapp/diff/explicit_versioned_ref.go @@ -6,7 +6,7 @@ package diff import ( "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "gopkg.in/yaml.v2" ) diff --git a/pkg/kapp/diff/filter.go b/pkg/kapp/diff/filter.go index 8de92ff2f..453e38902 100644 --- a/pkg/kapp/diff/filter.go +++ b/pkg/kapp/diff/filter.go @@ -6,7 +6,7 @@ package diff import ( "encoding/json" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type ChangeSetFilter struct { diff --git a/pkg/kapp/diff/group_resources.go b/pkg/kapp/diff/group_resources.go index 6fc6298ba..cb587c0c7 100644 --- a/pkg/kapp/diff/group_resources.go +++ b/pkg/kapp/diff/group_resources.go @@ -4,7 +4,7 @@ package diff import ( - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type GroupResources struct { diff --git a/pkg/kapp/diff/masked_resource.go b/pkg/kapp/diff/masked_resource.go index c2626c140..fa419864e 100644 --- a/pkg/kapp/diff/masked_resource.go +++ b/pkg/kapp/diff/masked_resource.go @@ -8,8 +8,8 @@ import ( "fmt" "sort" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type MaskedResource struct { diff --git a/pkg/kapp/diff/rebased_resource.go b/pkg/kapp/diff/rebased_resource.go index 25372747b..bb3639b0d 100644 --- a/pkg/kapp/diff/rebased_resource.go +++ b/pkg/kapp/diff/rebased_resource.go @@ -6,7 +6,7 @@ package diff import ( "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type RebasedResource struct { diff --git a/pkg/kapp/diff/renewable_resources.go b/pkg/kapp/diff/renewable_resources.go index 5e1167f0c..60e66b3d3 100644 --- a/pkg/kapp/diff/renewable_resources.go +++ b/pkg/kapp/diff/renewable_resources.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) const ( diff --git a/pkg/kapp/diff/resource_with_history.go b/pkg/kapp/diff/resource_with_history.go index 2b7fc5951..895294314 100644 --- a/pkg/kapp/diff/resource_with_history.go +++ b/pkg/kapp/diff/resource_with_history.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) const ( @@ -71,7 +71,7 @@ func (r ResourceWithHistory) AllowsRecordingLastApplied() bool { func (r ResourceWithHistory) RecordLastAppliedResource(appliedChange Change) (ctlres.Resource, bool, error) { // Use compact representation to take as little space as possible // because annotation value max length is 262144 characters - // (https://github.com/vmware-tanzu/carvel-kapp/issues/48). + // (https://github.com/carvel-dev/kapp/issues/48). appliedResBytes, err := appliedChange.AppliedResource().AsCompactBytes() if err != nil { return nil, true, err @@ -100,7 +100,7 @@ func (r ResourceWithHistory) RecordLastAppliedResource(appliedChange Change) (ct const annValMaxLen = 262144 // kapp deploy should work without adding disable annotation when annotation value max length exceed - // (https://github.com/vmware-tanzu/carvel-kapp/issues/410) + // (https://github.com/carvel-dev/kapp/issues/410) for _, annVal := range annsMod.KVs { if len(annVal) > annValMaxLen { return nil, false, nil diff --git a/pkg/kapp/diff/resource_with_removed_fields.go b/pkg/kapp/diff/resource_with_removed_fields.go index 25b1dd85c..0c4da6254 100644 --- a/pkg/kapp/diff/resource_with_removed_fields.go +++ b/pkg/kapp/diff/resource_with_removed_fields.go @@ -4,7 +4,7 @@ package diff import ( - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type ResourceWithRemovedFields struct { diff --git a/pkg/kapp/diff/text_diff_view.go b/pkg/kapp/diff/text_diff_view.go index adc209429..1c631ae88 100644 --- a/pkg/kapp/diff/text_diff_view.go +++ b/pkg/kapp/diff/text_diff_view.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" + ctlconf "carvel.dev/kapp/pkg/kapp/config" "github.com/cppforlife/color" "github.com/k14s/difflib" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" ) type TextDiffViewOpts struct { diff --git a/pkg/kapp/diff/versioned_resource.go b/pkg/kapp/diff/versioned_resource.go index ae51197c6..eb15616c7 100644 --- a/pkg/kapp/diff/versioned_resource.go +++ b/pkg/kapp/diff/versioned_resource.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctlres "carvel.dev/kapp/pkg/kapp/resources" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/kapp/diffgraph/change.go b/pkg/kapp/diffgraph/change.go index d91699753..47914a277 100644 --- a/pkg/kapp/diffgraph/change.go +++ b/pkg/kapp/diffgraph/change.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) const ( diff --git a/pkg/kapp/diffgraph/change_graph.go b/pkg/kapp/diffgraph/change_graph.go index 2a55eca4a..375437ca1 100644 --- a/pkg/kapp/diffgraph/change_graph.go +++ b/pkg/kapp/diffgraph/change_graph.go @@ -8,8 +8,8 @@ import ( "sort" "strings" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + "carvel.dev/kapp/pkg/kapp/logger" ) type ChangeGraph struct { diff --git a/pkg/kapp/diffgraph/change_graph_cf_for_k8s_test.go b/pkg/kapp/diffgraph/change_graph_cf_for_k8s_test.go index 59e329b1c..5f4c5514d 100644 --- a/pkg/kapp/diffgraph/change_graph_cf_for_k8s_test.go +++ b/pkg/kapp/diffgraph/change_graph_cf_for_k8s_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctldgraph "carvel.dev/kapp/pkg/kapp/diffgraph" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctldgraph "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestChangeGraphCFForK8sUpsert(t *testing.T) { diff --git a/pkg/kapp/diffgraph/change_graph_optional_test.go b/pkg/kapp/diffgraph/change_graph_optional_test.go index e430bbccf..2f8c31531 100644 --- a/pkg/kapp/diffgraph/change_graph_optional_test.go +++ b/pkg/kapp/diffgraph/change_graph_optional_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctldgraph "carvel.dev/kapp/pkg/kapp/diffgraph" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctldgraph "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestChangeGraphWithAdditionalOrderRules(t *testing.T) { diff --git a/pkg/kapp/diffgraph/change_graph_test.go b/pkg/kapp/diffgraph/change_graph_test.go index b1d0c763a..c22b62cba 100644 --- a/pkg/kapp/diffgraph/change_graph_test.go +++ b/pkg/kapp/diffgraph/change_graph_test.go @@ -7,11 +7,11 @@ import ( "strings" "testing" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctldgraph "carvel.dev/kapp/pkg/kapp/diffgraph" + "carvel.dev/kapp/pkg/kapp/logger" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctldgraph "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestChangeGraph(t *testing.T) { diff --git a/pkg/kapp/diffgraph/change_group_name.go b/pkg/kapp/diffgraph/change_group_name.go index 3da1d0144..16bdd716b 100644 --- a/pkg/kapp/diffgraph/change_group_name.go +++ b/pkg/kapp/diffgraph/change_group_name.go @@ -7,8 +7,8 @@ import ( "fmt" "regexp" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - ctlcrd "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + ctlcrd "carvel.dev/kapp/pkg/kapp/resourcesmisc" ) type ChangeGroupName struct { diff --git a/pkg/kapp/diffgraph/change_group_test.go b/pkg/kapp/diffgraph/change_group_test.go index 1f72620da..5f82d5581 100644 --- a/pkg/kapp/diffgraph/change_group_test.go +++ b/pkg/kapp/diffgraph/change_group_test.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package diffgraph_test @@ -7,8 +7,8 @@ import ( "strings" "testing" + ctldgraph "carvel.dev/kapp/pkg/kapp/diffgraph" "github.com/stretchr/testify/require" - ctldgraph "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" ) func TestNewChangeGroupFromAnnString(t *testing.T) { diff --git a/pkg/kapp/diffui/server.go b/pkg/kapp/diffui/server.go index daf359024..13d74de45 100644 --- a/pkg/kapp/diffui/server.go +++ b/pkg/kapp/diffui/server.go @@ -11,9 +11,9 @@ import ( "strings" "time" + ctldgraph "carvel.dev/kapp/pkg/kapp/diffgraph" + "carvel.dev/kapp/pkg/kapp/diffui/assets" "github.com/cppforlife/go-cli-ui/ui" - ctldgraph "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffui/assets" ) type ServerOpts struct { diff --git a/pkg/kapp/logs/pod_log.go b/pkg/kapp/logs/pod_log.go index dc31da922..75a087a09 100644 --- a/pkg/kapp/logs/pod_log.go +++ b/pkg/kapp/logs/pod_log.go @@ -6,8 +6,8 @@ package logs import ( "sync" + "carvel.dev/kapp/pkg/kapp/matcher" "github.com/cppforlife/go-cli-ui/ui" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/matcher" corev1 "k8s.io/api/core/v1" typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1" ) diff --git a/pkg/kapp/matcher/string_test.go b/pkg/kapp/matcher/string_test.go index 2dea04f56..d38732bbc 100644 --- a/pkg/kapp/matcher/string_test.go +++ b/pkg/kapp/matcher/string_test.go @@ -6,8 +6,8 @@ package matcher_test import ( "testing" + "carvel.dev/kapp/pkg/kapp/matcher" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/matcher" ) func TestStringMatcherMatches(t *testing.T) { diff --git a/pkg/kapp/permissions/basic.go b/pkg/kapp/permissions/basic.go index aa20239eb..b3730a5ff 100644 --- a/pkg/kapp/permissions/basic.go +++ b/pkg/kapp/permissions/basic.go @@ -6,7 +6,7 @@ package permissions import ( "context" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" authv1 "k8s.io/api/authorization/v1" "k8s.io/apimachinery/pkg/api/meta" authv1client "k8s.io/client-go/kubernetes/typed/authorization/v1" diff --git a/pkg/kapp/permissions/binding.go b/pkg/kapp/permissions/binding.go index a91eb9604..c0a7870e6 100644 --- a/pkg/kapp/permissions/binding.go +++ b/pkg/kapp/permissions/binding.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" authv1 "k8s.io/api/authorization/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/kapp/permissions/composite.go b/pkg/kapp/permissions/composite.go index 5a68a2598..0d1284ceb 100644 --- a/pkg/kapp/permissions/composite.go +++ b/pkg/kapp/permissions/composite.go @@ -6,7 +6,7 @@ package permissions import ( "context" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/kapp/permissions/preflight.go b/pkg/kapp/permissions/preflight.go index d6a790224..e4733ea41 100644 --- a/pkg/kapp/permissions/preflight.go +++ b/pkg/kapp/permissions/preflight.go @@ -7,9 +7,9 @@ import ( "context" "errors" - cmdcore "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - ctldgraph "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/preflight" + cmdcore "carvel.dev/kapp/pkg/kapp/cmd/core" + ctldgraph "carvel.dev/kapp/pkg/kapp/diffgraph" + "carvel.dev/kapp/pkg/kapp/preflight" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/kapp/permissions/role.go b/pkg/kapp/permissions/role.go index fe67f9f1b..4469c65a3 100644 --- a/pkg/kapp/permissions/role.go +++ b/pkg/kapp/permissions/role.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" authv1 "k8s.io/api/authorization/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/kapp/permissions/validator.go b/pkg/kapp/permissions/validator.go index 47aa1910c..f7880175f 100644 --- a/pkg/kapp/permissions/validator.go +++ b/pkg/kapp/permissions/validator.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" authv1 "k8s.io/api/authorization/v1" rbacv1 "k8s.io/api/rbac/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/kapp/preflight/check.go b/pkg/kapp/preflight/check.go index afe7eb47f..feabe590b 100644 --- a/pkg/kapp/preflight/check.go +++ b/pkg/kapp/preflight/check.go @@ -6,7 +6,7 @@ package preflight import ( "context" - ctldgraph "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" + ctldgraph "carvel.dev/kapp/pkg/kapp/diffgraph" ) type CheckFunc func(context.Context, *ctldgraph.ChangeGraph, CheckConfig) error diff --git a/pkg/kapp/preflight/registry.go b/pkg/kapp/preflight/registry.go index 3e38757a5..1d812800c 100644 --- a/pkg/kapp/preflight/registry.go +++ b/pkg/kapp/preflight/registry.go @@ -8,9 +8,9 @@ import ( "fmt" "strings" + "carvel.dev/kapp/pkg/kapp/config" + ctldgraph "carvel.dev/kapp/pkg/kapp/diffgraph" "github.com/spf13/pflag" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctldgraph "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" ) const preflightFlag = "preflight" diff --git a/pkg/kapp/preflight/registry_test.go b/pkg/kapp/preflight/registry_test.go index 8a83cd45b..2e0ec1647 100644 --- a/pkg/kapp/preflight/registry_test.go +++ b/pkg/kapp/preflight/registry_test.go @@ -7,10 +7,10 @@ import ( "errors" "testing" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + "carvel.dev/kapp/pkg/kapp/diffgraph" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestRegistrySet(t *testing.T) { diff --git a/pkg/kapp/resources/file_sources_test.go b/pkg/kapp/resources/file_sources_test.go index 63c52e5c2..54056845a 100644 --- a/pkg/kapp/resources/file_sources_test.go +++ b/pkg/kapp/resources/file_sources_test.go @@ -10,8 +10,8 @@ import ( "net/http" "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestHTTPFileSources(t *testing.T) { diff --git a/pkg/kapp/resources/identified_resources.go b/pkg/kapp/resources/identified_resources.go index 6861fc9dd..f8c9df350 100644 --- a/pkg/kapp/resources/identified_resources.go +++ b/pkg/kapp/resources/identified_resources.go @@ -6,7 +6,7 @@ package resources import ( "fmt" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" + "carvel.dev/kapp/pkg/kapp/logger" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes" ) diff --git a/pkg/kapp/resources/identified_resources_list.go b/pkg/kapp/resources/identified_resources_list.go index 3d39ee37d..6a1a83c35 100644 --- a/pkg/kapp/resources/identified_resources_list.go +++ b/pkg/kapp/resources/identified_resources_list.go @@ -65,7 +65,7 @@ func (r IdentifiedResources) List(labelSelector labels.Selector, resRefs []Resou // Check returned resources against label selector // in case of Kubernetes APIs returned resources that do not match. // This can happen if custom aggregated APIs did not implement label selector filtering. - // (https://github.com/vmware-tanzu/carvel-kapp/issues/160) + // (https://github.com/carvel-dev/kapp/issues/160) var filteredResources []Resource for _, res := range resources { if labelSelector.Matches(labels.Set(res.Labels())) { diff --git a/pkg/kapp/resources/identified_resources_list_test.go b/pkg/kapp/resources/identified_resources_list_test.go index 71aeb4a13..435c77631 100644 --- a/pkg/kapp/resources/identified_resources_list_test.go +++ b/pkg/kapp/resources/identified_resources_list_test.go @@ -1,14 +1,14 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package resources_test import ( "testing" + "carvel.dev/kapp/pkg/kapp/logger" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/cppforlife/go-cli-ui/ui" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/kapp/resources/labeled_resources.go b/pkg/kapp/resources/labeled_resources.go index 45de84751..026335198 100644 --- a/pkg/kapp/resources/labeled_resources.go +++ b/pkg/kapp/resources/labeled_resources.go @@ -8,8 +8,8 @@ import ( "strings" "sync" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/util" + "carvel.dev/kapp/pkg/kapp/logger" + "carvel.dev/kapp/pkg/kapp/util" "k8s.io/apimachinery/pkg/labels" ) diff --git a/pkg/kapp/resources/mod_field_copy_test.go b/pkg/kapp/resources/mod_field_copy_test.go index f4e0dd87e..0b772f411 100644 --- a/pkg/kapp/resources/mod_field_copy_test.go +++ b/pkg/kapp/resources/mod_field_copy_test.go @@ -6,8 +6,8 @@ package resources_test import ( "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestModFieldCopy(t *testing.T) { diff --git a/pkg/kapp/resources/mod_field_remove_test.go b/pkg/kapp/resources/mod_field_remove_test.go index 311e1c1ec..5f2b0f8a9 100644 --- a/pkg/kapp/resources/mod_field_remove_test.go +++ b/pkg/kapp/resources/mod_field_remove_test.go @@ -6,8 +6,8 @@ package resources_test import ( "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestModFieldRemove(t *testing.T) { diff --git a/pkg/kapp/resources/mod_string_map_append_test.go b/pkg/kapp/resources/mod_string_map_append_test.go index 8ba288865..5718de3ed 100644 --- a/pkg/kapp/resources/mod_string_map_append_test.go +++ b/pkg/kapp/resources/mod_string_map_append_test.go @@ -6,8 +6,8 @@ package resources_test import ( "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestModStringMapAppend(t *testing.T) { diff --git a/pkg/kapp/resources/resource.go b/pkg/kapp/resources/resource.go index 26a9662b3..fd3c83bf2 100644 --- a/pkg/kapp/resources/resource.go +++ b/pkg/kapp/resources/resource.go @@ -255,7 +255,7 @@ func (r *ResourceImpl) AsCompactBytes() ([]byte, error) { // For larger resources (especially very indented ones), // JSON representation seems to be more space effecient. // It's also chosed by kubectl's last-applied-configuration annotation. - // (https://github.com/vmware-tanzu/carvel-kapp/issues/48). + // (https://github.com/carvel-dev/kapp/issues/48). return json.Marshal(r.un.Object) } diff --git a/pkg/kapp/resources/resource_filter.go b/pkg/kapp/resources/resource_filter.go index b636ffb80..f2bd7a0a0 100644 --- a/pkg/kapp/resources/resource_filter.go +++ b/pkg/kapp/resources/resource_filter.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/matcher" // TODO inject + "carvel.dev/kapp/pkg/kapp/matcher" // TODO inject "k8s.io/apimachinery/pkg/labels" ) diff --git a/pkg/kapp/resources/resource_test.go b/pkg/kapp/resources/resource_test.go index 68cd9a4ae..57858371b 100644 --- a/pkg/kapp/resources/resource_test.go +++ b/pkg/kapp/resources/resource_test.go @@ -6,8 +6,8 @@ package resources_test import ( "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestCompactBytesLength(t *testing.T) { diff --git a/pkg/kapp/resources/resource_types.go b/pkg/kapp/resources/resource_types.go index f34189dcc..8009268c5 100644 --- a/pkg/kapp/resources/resource_types.go +++ b/pkg/kapp/resources/resource_types.go @@ -125,7 +125,7 @@ func (g *ResourceTypesImpl) serverResources() ([]*metav1.APIResourceList, error) return serverResources, nil } // Even local services may not be Available immediately, so retry - lastErr = fmt.Errorf("%w (possibly related issue: https://github.com/vmware-tanzu/carvel-kapp/issues/12)", lastErr) + lastErr = fmt.Errorf("%w (possibly related issue: https://github.com/carvel-dev/kapp/issues/12)", lastErr) } time.Sleep(1 * time.Second) } diff --git a/pkg/kapp/resources/resources.go b/pkg/kapp/resources/resources.go index 8c3a01720..8303431cd 100644 --- a/pkg/kapp/resources/resources.go +++ b/pkg/kapp/resources/resources.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/util" + "carvel.dev/kapp/pkg/kapp/logger" + "carvel.dev/kapp/pkg/kapp/util" "golang.org/x/net/http2" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -493,7 +493,7 @@ func (c *ResourcesImpl) isServerRescaleErr(err error) bool { return false } -// Handles case pointed out in : https://github.com/vmware-tanzu/carvel-kapp/issues/258. +// Handles case pointed out in : https://github.com/carvel-dev/kapp/issues/258. // An internal network error which might succeed on retrying. func (c *ResourcesImpl) isInternalFailure(err error) bool { switch err := err.(type) { @@ -594,7 +594,7 @@ func IsResourceChangeBlockedErr(err error) bool { } // Retries retryable errors thrown by etcd server. -// Addresses : https://github.com/vmware-tanzu/carvel-kapp/issues/106 +// Addresses : https://github.com/carvel-dev/kapp/issues/106 func (c *ResourcesImpl) isEtcdRetryableError(err error) bool { return etcdserverRetryableErrCheck.MatchString(err.Error()) } diff --git a/pkg/kapp/resourcesmisc/api_extensions_vx_crd.go b/pkg/kapp/resourcesmisc/api_extensions_vx_crd.go index 9d0cff9cf..d828930e0 100644 --- a/pkg/kapp/resourcesmisc/api_extensions_vx_crd.go +++ b/pkg/kapp/resourcesmisc/api_extensions_vx_crd.go @@ -4,7 +4,7 @@ package resourcesmisc import ( - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "sigs.k8s.io/yaml" ) diff --git a/pkg/kapp/resourcesmisc/api_registration_v1_api_service.go b/pkg/kapp/resourcesmisc/api_registration_v1_api_service.go index 9c5677213..6aa109265 100644 --- a/pkg/kapp/resourcesmisc/api_registration_v1_api_service.go +++ b/pkg/kapp/resourcesmisc/api_registration_v1_api_service.go @@ -6,7 +6,7 @@ package resourcesmisc import ( "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type APIRegistrationV1APIService struct { diff --git a/pkg/kapp/resourcesmisc/api_registration_v1beta1_api_service.go b/pkg/kapp/resourcesmisc/api_registration_v1beta1_api_service.go index d9b407f10..83187ea87 100644 --- a/pkg/kapp/resourcesmisc/api_registration_v1beta1_api_service.go +++ b/pkg/kapp/resourcesmisc/api_registration_v1beta1_api_service.go @@ -6,7 +6,7 @@ package resourcesmisc import ( "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type APIRegistrationV1Beta1APIService struct { diff --git a/pkg/kapp/resourcesmisc/apps_v1_daemon_set.go b/pkg/kapp/resourcesmisc/apps_v1_daemon_set.go index b980cafcd..9fe415c7e 100644 --- a/pkg/kapp/resourcesmisc/apps_v1_daemon_set.go +++ b/pkg/kapp/resourcesmisc/apps_v1_daemon_set.go @@ -6,7 +6,7 @@ package resourcesmisc import ( "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" appsv1 "k8s.io/api/apps/v1" ) diff --git a/pkg/kapp/resourcesmisc/apps_v1_daemon_set_test.go b/pkg/kapp/resourcesmisc/apps_v1_daemon_set_test.go index a5143f5dc..26f3bf49f 100644 --- a/pkg/kapp/resourcesmisc/apps_v1_daemon_set_test.go +++ b/pkg/kapp/resourcesmisc/apps_v1_daemon_set_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + ctlresm "carvel.dev/kapp/pkg/kapp/resourcesmisc" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" ) func TestAppsV1DaemonSetCreation(t *testing.T) { diff --git a/pkg/kapp/resourcesmisc/apps_v1_deployment.go b/pkg/kapp/resourcesmisc/apps_v1_deployment.go index ff7f15683..0910db846 100644 --- a/pkg/kapp/resourcesmisc/apps_v1_deployment.go +++ b/pkg/kapp/resourcesmisc/apps_v1_deployment.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/kapp/resourcesmisc/apps_v1_deployment_test.go b/pkg/kapp/resourcesmisc/apps_v1_deployment_test.go index b459a6d37..8a406c4b8 100644 --- a/pkg/kapp/resourcesmisc/apps_v1_deployment_test.go +++ b/pkg/kapp/resourcesmisc/apps_v1_deployment_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + ctlresm "carvel.dev/kapp/pkg/kapp/resourcesmisc" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" ) func TestAppsV1DeploymentMinRepAvailable(t *testing.T) { diff --git a/pkg/kapp/resourcesmisc/apps_v1_replica_set.go b/pkg/kapp/resourcesmisc/apps_v1_replica_set.go index 482a01ef9..ccd131c9c 100644 --- a/pkg/kapp/resourcesmisc/apps_v1_replica_set.go +++ b/pkg/kapp/resourcesmisc/apps_v1_replica_set.go @@ -6,7 +6,7 @@ package resourcesmisc import ( "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" appsv1 "k8s.io/api/apps/v1" ) diff --git a/pkg/kapp/resourcesmisc/apps_v1_stateful_set.go b/pkg/kapp/resourcesmisc/apps_v1_stateful_set.go index 46b5cdbc7..941c3f5f3 100644 --- a/pkg/kapp/resourcesmisc/apps_v1_stateful_set.go +++ b/pkg/kapp/resourcesmisc/apps_v1_stateful_set.go @@ -5,7 +5,8 @@ package resourcesmisc import ( "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + + ctlres "carvel.dev/kapp/pkg/kapp/resources" appsv1 "k8s.io/api/apps/v1" ) diff --git a/pkg/kapp/resourcesmisc/apps_v1_stateful_set_test.go b/pkg/kapp/resourcesmisc/apps_v1_stateful_set_test.go index 39534068b..897a7f817 100644 --- a/pkg/kapp/resourcesmisc/apps_v1_stateful_set_test.go +++ b/pkg/kapp/resourcesmisc/apps_v1_stateful_set_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + ctlresm "carvel.dev/kapp/pkg/kapp/resourcesmisc" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" ) func TestAppsV1StatefulSetCreation(t *testing.T) { diff --git a/pkg/kapp/resourcesmisc/batch_v1_job.go b/pkg/kapp/resourcesmisc/batch_v1_job.go index 038f48508..93649ef49 100644 --- a/pkg/kapp/resourcesmisc/batch_v1_job.go +++ b/pkg/kapp/resourcesmisc/batch_v1_job.go @@ -6,7 +6,7 @@ package resourcesmisc import ( "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/kapp/resourcesmisc/batch_vx_cron_job.go b/pkg/kapp/resourcesmisc/batch_vx_cron_job.go index 21050696b..e129a03c2 100644 --- a/pkg/kapp/resourcesmisc/batch_vx_cron_job.go +++ b/pkg/kapp/resourcesmisc/batch_vx_cron_job.go @@ -4,7 +4,7 @@ package resourcesmisc import ( - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type BatchVxCronJob struct { diff --git a/pkg/kapp/resourcesmisc/conditions.go b/pkg/kapp/resourcesmisc/conditions.go index 18d611e5a..35fc64721 100644 --- a/pkg/kapp/resourcesmisc/conditions.go +++ b/pkg/kapp/resourcesmisc/conditions.go @@ -6,7 +6,7 @@ package resourcesmisc import ( "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type Conditions struct { diff --git a/pkg/kapp/resourcesmisc/core_v1_pod.go b/pkg/kapp/resourcesmisc/core_v1_pod.go index 6716b4422..49aec170b 100644 --- a/pkg/kapp/resourcesmisc/core_v1_pod.go +++ b/pkg/kapp/resourcesmisc/core_v1_pod.go @@ -6,7 +6,7 @@ package resourcesmisc import ( "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/kapp/resourcesmisc/core_v1_service.go b/pkg/kapp/resourcesmisc/core_v1_service.go index e36704450..fb147b89b 100644 --- a/pkg/kapp/resourcesmisc/core_v1_service.go +++ b/pkg/kapp/resourcesmisc/core_v1_service.go @@ -6,7 +6,7 @@ package resourcesmisc import ( "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/kapp/resourcesmisc/crds.go b/pkg/kapp/resourcesmisc/crds.go index 1d36cedf4..8aee8c18c 100644 --- a/pkg/kapp/resourcesmisc/crds.go +++ b/pkg/kapp/resourcesmisc/crds.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type ResourceTypes struct { diff --git a/pkg/kapp/resourcesmisc/custom_waiting_resource.go b/pkg/kapp/resourcesmisc/custom_waiting_resource.go index c66128466..1fcc3f795 100644 --- a/pkg/kapp/resourcesmisc/custom_waiting_resource.go +++ b/pkg/kapp/resourcesmisc/custom_waiting_resource.go @@ -6,8 +6,8 @@ package resourcesmisc import ( "fmt" - ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlconf "carvel.dev/kapp/pkg/kapp/config" + ctlres "carvel.dev/kapp/pkg/kapp/resources" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/kapp/resourcesmisc/deleting.go b/pkg/kapp/resourcesmisc/deleting.go index b9f11c24a..9ed96efdc 100644 --- a/pkg/kapp/resourcesmisc/deleting.go +++ b/pkg/kapp/resourcesmisc/deleting.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" ) type Deleting struct { diff --git a/pkg/kapp/resourcesmisc/ext_and_apps_vx_replica_set.go b/pkg/kapp/resourcesmisc/ext_and_apps_vx_replica_set.go index cc397142f..761835218 100644 --- a/pkg/kapp/resourcesmisc/ext_and_apps_vx_replica_set.go +++ b/pkg/kapp/resourcesmisc/ext_and_apps_vx_replica_set.go @@ -6,7 +6,7 @@ package resourcesmisc import ( "fmt" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlres "carvel.dev/kapp/pkg/kapp/resources" appsv1 "k8s.io/api/apps/v1" ) diff --git a/pkg/kapp/resourcesmisc/kappctrl_k14s_io_v1alpha1_app.go b/pkg/kapp/resourcesmisc/kappctrl_k14s_io_v1alpha1_app.go index 9a2aa81b8..9042476fd 100644 --- a/pkg/kapp/resourcesmisc/kappctrl_k14s_io_v1alpha1_app.go +++ b/pkg/kapp/resourcesmisc/kappctrl_k14s_io_v1alpha1_app.go @@ -6,8 +6,8 @@ package resourcesmisc import ( "fmt" + ctlres "carvel.dev/kapp/pkg/kapp/resources" kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes/scheme" ) diff --git a/pkg/kapp/resourcesmisc/kappctrl_k14s_io_v1alpha1_app_test.go b/pkg/kapp/resourcesmisc/kappctrl_k14s_io_v1alpha1_app_test.go index 139ce302d..ad98726cd 100644 --- a/pkg/kapp/resourcesmisc/kappctrl_k14s_io_v1alpha1_app_test.go +++ b/pkg/kapp/resourcesmisc/kappctrl_k14s_io_v1alpha1_app_test.go @@ -7,9 +7,9 @@ import ( "fmt" "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + ctlresm "carvel.dev/kapp/pkg/kapp/resourcesmisc" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" ) func TestKappctrlK14sIoV1alpha1AppFailure(t *testing.T) { diff --git a/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packageinstall.go b/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packageinstall.go index 8019f65b3..bf0d1fe2f 100644 --- a/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packageinstall.go +++ b/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packageinstall.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package resourcesmisc @@ -6,9 +6,9 @@ package resourcesmisc import ( "fmt" + ctlres "carvel.dev/kapp/pkg/kapp/resources" appv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" pkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes/scheme" ) diff --git a/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packageinstall_test.go b/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packageinstall_test.go index 591c7bbed..1c459bc24 100644 --- a/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packageinstall_test.go +++ b/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packageinstall_test.go @@ -7,9 +7,9 @@ import ( "fmt" "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + ctlresm "carvel.dev/kapp/pkg/kapp/resourcesmisc" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" ) func TestPackagingCarvelDevV1alpha1PackageInstallFailure(t *testing.T) { diff --git a/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packagerepository.go b/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packagerepository.go index c4e38d1b7..802b1aad3 100644 --- a/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packagerepository.go +++ b/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packagerepository.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package resourcesmisc @@ -6,9 +6,9 @@ package resourcesmisc import ( "fmt" + ctlres "carvel.dev/kapp/pkg/kapp/resources" appv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" pkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes/scheme" ) diff --git a/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packagerepository_test.go b/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packagerepository_test.go index bbbbf9c33..cc89f2dab 100644 --- a/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packagerepository_test.go +++ b/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packagerepository_test.go @@ -7,9 +7,9 @@ import ( "fmt" "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" + ctlresm "carvel.dev/kapp/pkg/kapp/resourcesmisc" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" - ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" ) func TestPackagingCarvelDevV1alpha1PackageRepoFailure(t *testing.T) { diff --git a/pkg/kapp/resourcesmisc/wait_rule_contract_v1.go b/pkg/kapp/resourcesmisc/wait_rule_contract_v1.go index a3e300cbd..e1344d9ac 100644 --- a/pkg/kapp/resourcesmisc/wait_rule_contract_v1.go +++ b/pkg/kapp/resourcesmisc/wait_rule_contract_v1.go @@ -6,10 +6,10 @@ package resourcesmisc import ( "fmt" + ctlres "carvel.dev/kapp/pkg/kapp/resources" cmdtpl "github.com/k14s/ytt/pkg/cmd/template" "github.com/k14s/ytt/pkg/cmd/ui" "github.com/k14s/ytt/pkg/files" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" "sigs.k8s.io/yaml" ) diff --git a/pkg/kapp/version/version.go b/pkg/kapp/version/version.go index efd31f829..353b96e20 100644 --- a/pkg/kapp/version/version.go +++ b/pkg/kapp/version/version.go @@ -7,10 +7,10 @@ import "runtime/debug" var ( // Version can be set via: - // -ldflags="-X 'github.com/vmware-tanzu/carvel-kapp/pkg/kapp/version.Version=$TAG'" + // -ldflags="-X 'carvel.dev/kapp/pkg/kapp/version.Version=$TAG'" defaultVersion = "develop" Version = "" - moduleName = "github.com/vmware-tanzu/carvel-kapp" + moduleName = "carvel.dev/kapp" ) func init() { diff --git a/pkg/kapp/yttresmod/overlay_contract_v1_mod.go b/pkg/kapp/yttresmod/overlay_contract_v1_mod.go index 0940d15d6..091ac58c1 100644 --- a/pkg/kapp/yttresmod/overlay_contract_v1_mod.go +++ b/pkg/kapp/yttresmod/overlay_contract_v1_mod.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package yttresmod @@ -6,10 +6,10 @@ package yttresmod import ( "fmt" + ctlres "carvel.dev/kapp/pkg/kapp/resources" cmdtpl "github.com/k14s/ytt/pkg/cmd/template" "github.com/k14s/ytt/pkg/cmd/ui" "github.com/k14s/ytt/pkg/files" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" "sigs.k8s.io/yaml" ) diff --git a/test/e2e/annotations_test.go b/test/e2e/annotations_test.go index 8a0108d9a..3b8e52cca 100644 --- a/test/e2e/annotations_test.go +++ b/test/e2e/annotations_test.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package e2e diff --git a/test/e2e/app_change_test.go b/test/e2e/app_change_test.go index 52c7cc64b..ce96ac576 100644 --- a/test/e2e/app_change_test.go +++ b/test/e2e/app_change_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" + "carvel.dev/kapp/pkg/kapp/app" uitest "github.com/cppforlife/go-cli-ui/ui/test" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/app" ) func TestAppChange(t *testing.T) { diff --git a/test/e2e/app_group_deploy_test.go b/test/e2e/app_group_deploy_test.go index 6b28b5202..5d562ee4e 100644 --- a/test/e2e/app_group_deploy_test.go +++ b/test/e2e/app_group_deploy_test.go @@ -8,9 +8,9 @@ import ( "path" "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" uitest "github.com/cppforlife/go-cli-ui/ui/test" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestAppGroupCreateUpdateDelete(t *testing.T) { diff --git a/test/e2e/app_suffix_test.go b/test/e2e/app_suffix_test.go index 5d2d6c730..bd2ad9c25 100644 --- a/test/e2e/app_suffix_test.go +++ b/test/e2e/app_suffix_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" + "carvel.dev/kapp/pkg/kapp/app" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/app" ) var yaml1 = ` diff --git a/test/e2e/cluster_resource.go b/test/e2e/cluster_resource.go index b158f44d2..84b7e2ac8 100644 --- a/test/e2e/cluster_resource.go +++ b/test/e2e/cluster_resource.go @@ -9,8 +9,8 @@ import ( "sync" "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) var ( diff --git a/test/e2e/common.go b/test/e2e/common.go index 0c00426af..edefdec0a 100644 --- a/test/e2e/common.go +++ b/test/e2e/common.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package e2e diff --git a/test/e2e/config_test.go b/test/e2e/config_test.go index 20bb6a374..815c73198 100644 --- a/test/e2e/config_test.go +++ b/test/e2e/config_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" uitest "github.com/cppforlife/go-cli-ui/ui/test" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" "sigs.k8s.io/yaml" ) diff --git a/test/e2e/crd_versions_with_gk_scoping_test.go b/test/e2e/crd_versions_with_gk_scoping_test.go index 958a10de7..79c725130 100644 --- a/test/e2e/crd_versions_with_gk_scoping_test.go +++ b/test/e2e/crd_versions_with_gk_scoping_test.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package e2e diff --git a/test/e2e/create_update_delete_test.go b/test/e2e/create_update_delete_test.go index 5ad3010b7..4ae293683 100644 --- a/test/e2e/create_update_delete_test.go +++ b/test/e2e/create_update_delete_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" + "carvel.dev/kapp/pkg/kapp/app" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/app" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestCreateUpdateDelete(t *testing.T) { diff --git a/test/e2e/deploy_filesystem_test.go b/test/e2e/deploy_filesystem_test.go index 79c07652d..e8e631025 100644 --- a/test/e2e/deploy_filesystem_test.go +++ b/test/e2e/deploy_filesystem_test.go @@ -18,10 +18,10 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/app" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/cmd/core" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/preflight" + "carvel.dev/kapp/pkg/kapp/cmd/app" + "carvel.dev/kapp/pkg/kapp/cmd/core" + "carvel.dev/kapp/pkg/kapp/logger" + "carvel.dev/kapp/pkg/kapp/preflight" ) func TestDeployFilesystem(t *testing.T) { diff --git a/test/e2e/diff_filter_test.go b/test/e2e/diff_filter_test.go index 3a73a1257..0ef66a780 100644 --- a/test/e2e/diff_filter_test.go +++ b/test/e2e/diff_filter_test.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package e2e diff --git a/test/e2e/exists_ann_test.go b/test/e2e/exists_ann_test.go index 7c761a984..cb38cba03 100644 --- a/test/e2e/exists_ann_test.go +++ b/test/e2e/exists_ann_test.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package e2e diff --git a/test/e2e/noop_ann_test.go b/test/e2e/noop_ann_test.go index e0ff7a867..40c488c34 100644 --- a/test/e2e/noop_ann_test.go +++ b/test/e2e/noop_ann_test.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package e2e diff --git a/test/e2e/template_test.go b/test/e2e/template_test.go index 334b1b0b0..42175cfb0 100644 --- a/test/e2e/template_test.go +++ b/test/e2e/template_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" + ctlres "carvel.dev/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestTemplate(t *testing.T) { diff --git a/test/e2e/wait_timeout_test.go b/test/e2e/wait_timeout_test.go index c47276223..f77fa4608 100644 --- a/test/e2e/wait_timeout_test.go +++ b/test/e2e/wait_timeout_test.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package e2e diff --git a/test/e2e/warnings_test.go b/test/e2e/warnings_test.go index a2f579c8a..6a14f6db4 100644 --- a/test/e2e/warnings_test.go +++ b/test/e2e/warnings_test.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package e2e