From 92f839ecb3e11deb2e7fe270ace581e279e36568 Mon Sep 17 00:00:00 2001 From: Yash Pimple Date: Sat, 2 Dec 2023 16:36:47 +0530 Subject: [PATCH] Change module name Signed-off-by: Yash Pimple --- .goreleaser.yml | 2 +- cmd/kapp/kapp.go | 4 ++-- go.mod | 6 ++--- go.sum | 8 +++---- hack/build-binaries.sh | 2 +- hack/build.sh | 2 +- pkg/kapp/app/apps.go | 4 ++-- pkg/kapp/app/labeled_app.go | 2 +- pkg/kapp/app/preparation.go | 4 ++-- pkg/kapp/app/recorded_app.go | 4 ++-- pkg/kapp/clusterapply/add_or_update_change.go | 8 +++---- pkg/kapp/clusterapply/applying_changes.go | 4 ++-- pkg/kapp/clusterapply/change_set_view.go | 8 +++---- pkg/kapp/clusterapply/changes_view.go | 6 ++--- pkg/kapp/clusterapply/cluster_change.go | 8 +++---- .../clusterapply/cluster_change_factory.go | 6 ++--- pkg/kapp/clusterapply/cluster_change_set.go | 8 +++---- pkg/kapp/clusterapply/converged_resource.go | 4 ++-- .../converged_resource_factory.go | 6 ++--- pkg/kapp/clusterapply/delete_change.go | 8 +++---- pkg/kapp/clusterapply/exists_change.go | 4 ++-- pkg/kapp/clusterapply/reconciling_change.go | 8 +++---- pkg/kapp/clusterapply/ui.go | 2 +- pkg/kapp/clusterapply/waiting_changes.go | 6 ++--- pkg/kapp/cmd/app/app_flags.go | 2 +- pkg/kapp/cmd/app/apply_flags.go | 2 +- pkg/kapp/cmd/app/delete.go | 22 ++++++++--------- pkg/kapp/cmd/app/deploy.go | 24 +++++++++---------- pkg/kapp/cmd/app/deploy_config.go | 4 ++-- pkg/kapp/cmd/app/deploy_flags.go | 2 +- pkg/kapp/cmd/app/factory.go | 8 +++---- .../cmd/app/failing_api_services_policy.go | 2 +- pkg/kapp/cmd/app/inspect.go | 12 +++++----- pkg/kapp/cmd/app/inspect_status_view.go | 4 ++-- pkg/kapp/cmd/app/label.go | 4 ++-- pkg/kapp/cmd/app/list.go | 6 ++--- pkg/kapp/cmd/app/logs.go | 10 ++++---- pkg/kapp/cmd/app/logs_flags.go | 2 +- pkg/kapp/cmd/app/rename.go | 4 ++-- pkg/kapp/cmd/app/used_gks_scope.go | 2 +- pkg/kapp/cmd/appchange/cmd.go | 2 +- pkg/kapp/cmd/appchange/gc.go | 8 +++---- pkg/kapp/cmd/appchange/list.go | 8 +++---- pkg/kapp/cmd/appgroup/app_group_flags.go | 2 +- pkg/kapp/cmd/appgroup/cmd.go | 2 +- pkg/kapp/cmd/appgroup/delete.go | 8 +++---- pkg/kapp/cmd/appgroup/deploy.go | 8 +++---- pkg/kapp/cmd/configmap/cmd.go | 2 +- pkg/kapp/cmd/configmap/list.go | 6 ++--- pkg/kapp/cmd/kapp.go | 20 ++++++++-------- pkg/kapp/cmd/logger_flags.go | 4 ++-- pkg/kapp/cmd/profiling.go | 2 +- pkg/kapp/cmd/serviceaccount/cmd.go | 2 +- pkg/kapp/cmd/serviceaccount/list.go | 8 +++---- pkg/kapp/cmd/serviceaccount/rbac.go | 2 +- pkg/kapp/cmd/serviceaccount/rbac_resources.go | 2 +- pkg/kapp/cmd/tools/app_filter_flags.go | 2 +- pkg/kapp/cmd/tools/cmd.go | 2 +- pkg/kapp/cmd/tools/diff.go | 8 +++---- pkg/kapp/cmd/tools/diff_flags.go | 4 ++-- pkg/kapp/cmd/tools/inspect.go | 4 ++-- pkg/kapp/cmd/tools/inspect_tree_view.go | 6 ++--- pkg/kapp/cmd/tools/inspect_view.go | 6 ++--- pkg/kapp/cmd/tools/list_labels.go | 6 ++--- pkg/kapp/cmd/tools/resource_filter_flags.go | 2 +- pkg/kapp/cmd/ui_flags.go | 2 +- pkg/kapp/cmd/version.go | 4 ++-- pkg/kapp/cmd/warning_flags.go | 2 +- pkg/kapp/config/conf.go | 2 +- pkg/kapp/config/config.go | 6 ++--- pkg/kapp/config/default.go | 4 ++-- pkg/kapp/config/default_test.go | 9 +++---- pkg/kapp/config/resource_matchers.go | 2 +- pkg/kapp/diff/change.go | 2 +- pkg/kapp/diff/change_factory.go | 2 +- pkg/kapp/diff/change_precalculated.go | 2 +- pkg/kapp/diff/change_set.go | 2 +- pkg/kapp/diff/change_set_factory.go | 2 +- pkg/kapp/diff/change_set_test.go | 4 ++-- pkg/kapp/diff/change_set_with_versioned_rs.go | 4 ++-- .../diff/change_set_with_versioned_rs_test.go | 2 +- pkg/kapp/diff/configurable_text_diff.go | 4 ++-- pkg/kapp/diff/explicit_versioned_ref.go | 2 +- pkg/kapp/diff/filter.go | 2 +- pkg/kapp/diff/group_resources.go | 2 +- pkg/kapp/diff/masked_resource.go | 4 ++-- pkg/kapp/diff/rebased_resource.go | 2 +- pkg/kapp/diff/renewable_resources.go | 2 +- pkg/kapp/diff/resource_with_history.go | 6 ++--- pkg/kapp/diff/resource_with_removed_fields.go | 2 +- pkg/kapp/diff/text_diff_view.go | 2 +- pkg/kapp/diff/versioned_resource.go | 4 ++-- pkg/kapp/diffgraph/change.go | 4 ++-- pkg/kapp/diffgraph/change_graph.go | 4 ++-- .../diffgraph/change_graph_cf_for_k8s_test.go | 6 ++--- .../diffgraph/change_graph_optional_test.go | 6 ++--- pkg/kapp/diffgraph/change_graph_test.go | 8 +++---- pkg/kapp/diffgraph/change_group_name.go | 4 ++-- pkg/kapp/diffgraph/change_group_test.go | 2 +- pkg/kapp/diffui/server.go | 4 ++-- pkg/kapp/logs/pod_log.go | 2 +- pkg/kapp/matcher/string_test.go | 2 +- pkg/kapp/resources/file_sources_test.go | 2 +- pkg/kapp/resources/identified_resources.go | 2 +- .../resources/identified_resources_list.go | 2 +- .../identified_resources_list_test.go | 4 ++-- pkg/kapp/resources/labeled_resources.go | 4 ++-- pkg/kapp/resources/mod_field_copy_test.go | 2 +- pkg/kapp/resources/mod_field_remove_test.go | 2 +- .../resources/mod_string_map_append_test.go | 2 +- pkg/kapp/resources/resource.go | 2 +- pkg/kapp/resources/resource_filter.go | 2 +- pkg/kapp/resources/resource_test.go | 2 +- pkg/kapp/resources/resource_types.go | 2 +- pkg/kapp/resources/resources.go | 8 +++---- .../resourcesmisc/api_extensions_vx_crd.go | 2 +- .../api_registration_v1_api_service.go | 2 +- .../api_registration_v1beta1_api_service.go | 2 +- pkg/kapp/resourcesmisc/apps_v1_daemon_set.go | 2 +- .../resourcesmisc/apps_v1_daemon_set_test.go | 4 ++-- pkg/kapp/resourcesmisc/apps_v1_deployment.go | 2 +- .../resourcesmisc/apps_v1_deployment_test.go | 4 ++-- pkg/kapp/resourcesmisc/apps_v1_replica_set.go | 2 +- .../resourcesmisc/apps_v1_stateful_set.go | 3 ++- .../apps_v1_stateful_set_test.go | 4 ++-- pkg/kapp/resourcesmisc/batch_v1_job.go | 2 +- pkg/kapp/resourcesmisc/batch_vx_cron_job.go | 2 +- pkg/kapp/resourcesmisc/conditions.go | 2 +- pkg/kapp/resourcesmisc/core_v1_pod.go | 2 +- pkg/kapp/resourcesmisc/core_v1_service.go | 2 +- pkg/kapp/resourcesmisc/crds.go | 2 +- .../resourcesmisc/custom_waiting_resource.go | 4 ++-- pkg/kapp/resourcesmisc/deleting.go | 2 +- .../ext_and_apps_vx_replica_set.go | 2 +- .../kappctrl_k14s_io_v1alpha1_app.go | 4 ++-- .../kappctrl_k14s_io_v1alpha1_app_test.go | 4 ++-- ...ging_carvel_dev_v1alpha1_packageinstall.go | 6 ++--- ...carvel_dev_v1alpha1_packageinstall_test.go | 4 ++-- ...g_carvel_dev_v1alpha1_packagerepository.go | 6 ++--- ...vel_dev_v1alpha1_packagerepository_test.go | 4 ++-- .../resourcesmisc/wait_rule_contract_v1.go | 2 +- pkg/kapp/yttresmod/overlay_contract_v1_mod.go | 2 +- test/e2e/app_change_test.go | 2 +- test/e2e/app_suffix_test.go | 2 +- test/e2e/cluster_resource.go | 2 +- test/e2e/config_test.go | 2 +- test/e2e/create_update_delete_test.go | 4 ++-- test/e2e/deploy_filesystem_test.go | 6 ++--- test/e2e/template_test.go | 2 +- .../apis/kappctrl/v1alpha1/generated.pb.go | 6 ++--- .../apis/kappctrl/v1alpha1/generated.proto | 4 ++-- .../pkg/apis/kappctrl/v1alpha1/types_fetch.go | 2 +- .../v1alpha1/zz_generated.deepcopy.go | 2 +- .../packaging/v1alpha1/package_install.go | 4 ++-- .../packaging/v1alpha1/package_repository.go | 2 +- .../v1alpha1/zz_generated.deepcopy.go | 4 ++-- .../vendir/versions/v1alpha1/generated.pb.go | 4 ++-- vendor/modules.txt | 10 ++++---- 158 files changed, 330 insertions(+), 328 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index e83e10aee..63219227c 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 diff --git a/cmd/kapp/kapp.go b/cmd/kapp/kapp.go index 25ab321d9..d1cb8257c 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 5611513f3..cf441db49 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/vmware-tanzu/carvel-kapp +module carvel.dev/kapp go 1.21 @@ -15,7 +15,7 @@ require ( github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 - github.com/vmware-tanzu/carvel-kapp-controller v0.46.2 + carvel.dev/kapp/kapp-controller v0.46.2 golang.org/x/net v0.17.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.28.3 @@ -50,7 +50,7 @@ require ( github.com/nxadm/tail v1.4.8 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/vito/go-interact v1.0.1 // indirect - github.com/vmware-tanzu/carvel-vendir v0.33.1 // indirect + carvel.dev/vendir v0.33.1 // indirect golang.org/x/oauth2 v0.8.0 // indirect golang.org/x/sys v0.13.0 // indirect golang.org/x/term v0.13.0 // indirect diff --git a/go.sum b/go.sum index 996d24dc3..3435439b9 100644 --- a/go.sum +++ b/go.sum @@ -300,10 +300,10 @@ github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2 github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec/go.mod h1:wPlfmglZmRWMYv/qJy3P+fK/UnoQB5ISk4txfNd9tDo= github.com/vito/go-interact v1.0.1 h1:O8xi8c93bRUv2Tb/v6HdiuGc+WnWt+AQzF74MOOdlBs= github.com/vito/go-interact v1.0.1/go.mod h1:HrdHSJXD2yn1MhlTwSIMeFgQ5WftiIorszVGd3S/DAA= -github.com/vmware-tanzu/carvel-kapp-controller v0.46.2 h1:TQRXFnZ6PryhQxx+4X1w2NSpEXyT6qg1/r3/4RkR6UE= -github.com/vmware-tanzu/carvel-kapp-controller v0.46.2/go.mod h1:LJf4oaNfKW8kk6ddD8uRaayaUecGiqrz278oe4AEBSc= -github.com/vmware-tanzu/carvel-vendir v0.33.1 h1:5wzx0aRyEiorkWwrpGvACJOpFcgvmCeVqhIY9TPuLvk= -github.com/vmware-tanzu/carvel-vendir v0.33.1/go.mod h1:cZEa46rwzPt/ROdAuIgrCXLDJ+LqxNZaNxbz8MLtwWc= +carvel.dev/kapp/kapp-controller v0.46.2 h1:TQRXFnZ6PryhQxx+4X1w2NSpEXyT6qg1/r3/4RkR6UE= +carvel.dev/kapp/kapp-controller v0.46.2/go.mod h1:LJf4oaNfKW8kk6ddD8uRaayaUecGiqrz278oe4AEBSc= +carvel.dev/vendir v0.33.1 h1:5wzx0aRyEiorkWwrpGvACJOpFcgvmCeVqhIY9TPuLvk= +carvel.dev/vendir v0.33.1/go.mod h1:cZEa46rwzPt/ROdAuIgrCXLDJ+LqxNZaNxbz8MLtwWc= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 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 66869f878..3c9c38ddc 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 ec985d43e..75a592bbe 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 4589a9691..9d870131b 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 b9a3fd828..4e017b32a 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 c569b8d29..30b1e8bdf 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 18e9bb1e6..90ab16491 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 82eeebbbc..119026f1d 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 7f80e602d..342a8a046 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 7d6b1a5cd..a2d3f79d9 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 572fe867a..68baa49e9 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 f60261253..7b22615d6 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 b4310ee27..6b958d040 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 f387a158b..d23abeecd 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 fe3982eba..d05db8ac3 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://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..8e44e6907 100644 --- a/pkg/kapp/clusterapply/exists_change.go +++ b/pkg/kapp/clusterapply/exists_change.go @@ -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 4a5e7abd3..3fc863bca 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 016fb185a..53d7442bf 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 18695caac..c239505b9 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 3b4d6e4ed..11c7b8898 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 b09ceaa5d..bd5601d06 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 344b5a7fa..a2306e298 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://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 e0141fd79..c8cc6d18a 100644 --- a/pkg/kapp/cmd/app/deploy.go +++ b/pkg/kapp/cmd/app/deploy.go @@ -17,18 +17,18 @@ 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" - 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" + 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 1a518df4d..df2f1a839 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 ba9a2ed9f..2b30df0f3 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 2308fd1b2..6444fd4b6 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 036954ad0..353577a82 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 64d866fa9..ffa6cbf64 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 4ec166c76..3fb20d589 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 a89ee4cae..3b2f5f755 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 31654e024..15b358650 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 69f63876c..8634db0d3 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 874dd0d49..85f863d90 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 af6afda19..7fa4f4caa 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 f77b628f4..6dba13dba 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 80ec73260..5dc7eab20 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 a0bd165e1..0f7e951c4 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 68e607078..22dd3aee9 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 f8c430657..9f0c9121e 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 5954d604d..22d09407a 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 651d78b6d..503e93581 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 107b8bf45..45b536da6 100644 --- a/pkg/kapp/cmd/appgroup/deploy.go +++ b/pkg/kapp/cmd/appgroup/deploy.go @@ -9,12 +9,12 @@ 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" "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" ) type DeployOptions struct { diff --git a/pkg/kapp/cmd/configmap/cmd.go b/pkg/kapp/cmd/configmap/cmd.go index 18cdb3587..1348abc19 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 f57807500..0f7b11735 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 ced445651..e0f2b9132 100644 --- a/pkg/kapp/cmd/kapp.go +++ b/pkg/kapp/cmd/kapp.go @@ -6,18 +6,18 @@ 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/logger" + "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/logger" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/version" ) type KappOptions struct { @@ -147,7 +147,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://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 f5d7d1022..57720b920 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 1b14da1f3..6bdf41225 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 228f6abd4..ed1619fc8 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 f5c008135..f573efb13 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 57c882fcf..432e9003d 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 bda3f95c6..382f1f5c0 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 08f70f2b7..68d98a835 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 89fa70fd2..1b9034f50 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 7e7e74e8f..7eea8be2e 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 5ea8424a7..39cb7e1de 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 9efdb790e..6b5781009 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 a4b86d3bd..55fd6256d 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 5abc5f92c..fa84bf7b6 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 1d75cd867..d0fbb5f44 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 eec84ab8a..0f14dcea6 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 6d9e806c6..3b23f6db1 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 58c169e6b..5879ac198 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..439d2fa9c 100644 --- a/pkg/kapp/cmd/warning_flags.go +++ b/pkg/kapp/cmd/warning_flags.go @@ -4,8 +4,8 @@ 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 d8daf2ccc..ce9513f7b 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 eb28929ef..a52b6b745 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 081fe06f5..cb821aa9e 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 = `--- @@ -642,7 +642,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://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 e8ace3f56..cb370d42a 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 642c19b3d..5941824af 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/diff/change.go b/pkg/kapp/diff/change.go index 528477798..e54ba601c 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" "gopkg.in/yaml.v2" ) diff --git a/pkg/kapp/diff/change_factory.go b/pkg/kapp/diff/change_factory.go index f4e4f2f90..0bfe1d539 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 a8efd085a..baee1946b 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 86026da73..8ad8fd193 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 2aed27a24..5541f971b 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 f42340222..4eaef14ec 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 c6587d0ba..6bcb2061b 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..ee7715ace 100644 --- a/pkg/kapp/diff/change_set_with_versioned_rs_test.go +++ b/pkg/kapp/diff/change_set_with_versioned_rs_test.go @@ -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 575e99a72..ba754299a 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 7c706f8e5..9f4688cf1 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 82ef7c248..bfcee04fe 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 8d54d256b..3d71885e9 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 66415d16f..97bff9a40 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 7833a68d8..86ea86452 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 cf0744d7c..b29c7ea13 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 34115aa7f..ec41865ac 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://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://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 4fef24b40..faa4b1d10 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 ed59b07a7..33370857e 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 1240907f1..968d47ec3 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 0a66392f6..303a5eed0 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 6ed1778c2..152f45b86 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 2ab379052..6e63bbce3 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 1b8aa3941..f21256ed9 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 80cfe6572..16e0f1f61 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 912ee9af9..eeebb48e1 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..57a98079e 100644 --- a/pkg/kapp/diffgraph/change_group_test.go +++ b/pkg/kapp/diffgraph/change_group_test.go @@ -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 d279d20c0..6ba3494de 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 a9f426b46..6ce2a1e89 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 87b4f8e90..22de4675e 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/resources/file_sources_test.go b/pkg/kapp/resources/file_sources_test.go index a3eca16d8..e6811df16 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 409ddf3ea..e53d975e0 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 e7f83d0de..08d139856 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://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..d16c94682 100644 --- a/pkg/kapp/resources/identified_resources_list_test.go +++ b/pkg/kapp/resources/identified_resources_list_test.go @@ -5,10 +5,10 @@ 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 8c556f638..6a5a5520b 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 dd4bccd84..4d921ed8b 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 28d120231..29b4abb90 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 d8e5ff8a3..fb9f3eb2b 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 94ad74417..8a99fbadf 100644 --- a/pkg/kapp/resources/resource.go +++ b/pkg/kapp/resources/resource.go @@ -253,7 +253,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://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 00a698274..6c650e3dc 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 bc0f74f8e..152462043 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 8ba7ba0c1..ddb146d73 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://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 39a42c9c1..f8b4b8912 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://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://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 602b58e64..76ba83a83 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 b0299390b..07a4b9fb9 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 a8984597f..6ff7d4339 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 ec2dec321..8ecf11a1e 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 0692c249d..df782e31d 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 294fd66d7..86c2bf458 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 86cdc78c3..73544e8ab 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 a031b871d..8edab5b98 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 d52832cb8..30f303ed5 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 5e975922f..9388b2c68 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 476c90d6d..f511b9005 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 6e088dc39..772370b8d 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 c25bdcecc..2d7856abc 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 9f4777865..bd8901736 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 de857c0c5..7d8fc0acf 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 0ad9fee9c..2f6f8f2ae 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 3e67691d1..33cffad97 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 636a1b921..33fa0800c 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 eb3c1a642..c307fd79d 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 657b70109..dcd8fe537 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" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + ctlres "carvel.dev/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 1fdec7594..ec7a74adb 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..9d8a398e5 100644 --- a/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packageinstall.go +++ b/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packageinstall.go @@ -6,9 +6,9 @@ package resourcesmisc import ( "fmt" - 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" + appv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + pkgv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + ctlres "carvel.dev/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 78149dd80..fae941d17 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..fb9efaf66 100644 --- a/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packagerepository.go +++ b/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packagerepository.go @@ -6,9 +6,9 @@ package resourcesmisc import ( "fmt" - 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" + appv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + pkgv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + ctlres "carvel.dev/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 e31c3a82c..18f7432e4 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 b86defe5f..660a373f5 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/yttresmod/overlay_contract_v1_mod.go b/pkg/kapp/yttresmod/overlay_contract_v1_mod.go index 0940d15d6..916c456f7 100644 --- a/pkg/kapp/yttresmod/overlay_contract_v1_mod.go +++ b/pkg/kapp/yttresmod/overlay_contract_v1_mod.go @@ -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/app_change_test.go b/test/e2e/app_change_test.go index 4abfb3e3e..1755f0db2 100644 --- a/test/e2e/app_change_test.go +++ b/test/e2e/app_change_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" + "carvel.dev/kapp/pkg/kapp/app" uitest "github.com/cppforlife/go-cli-ui/ui/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/app" "gopkg.in/yaml.v2" ) diff --git a/test/e2e/app_suffix_test.go b/test/e2e/app_suffix_test.go index dd6ef2e09..409982c46 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 15cac63a0..fffdf88e8 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/config_test.go b/test/e2e/config_test.go index 430fa2522..c635d3818 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/create_update_delete_test.go b/test/e2e/create_update_delete_test.go index 533e049b6..1f5498b72 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 703e4e703..527a5b5ed 100644 --- a/test/e2e/deploy_filesystem_test.go +++ b/test/e2e/deploy_filesystem_test.go @@ -18,9 +18,9 @@ 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" + "carvel.dev/kapp/pkg/kapp/cmd/app" + "carvel.dev/kapp/pkg/kapp/cmd/core" + "carvel.dev/kapp/pkg/kapp/logger" ) func TestDeployFilesystem(t *testing.T) { diff --git a/test/e2e/template_test.go b/test/e2e/template_test.go index 57d94c79e..7b6f8b3e2 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/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go index cfac16db2..1d8888c7e 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto +// source: carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto package v1alpha1 @@ -10,7 +10,7 @@ import ( proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" - v1alpha1 "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + v1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" k8s_io_api_core_v1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -1109,7 +1109,7 @@ func init() { } func init() { - proto.RegisterFile("github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto", fileDescriptor_e972ccf085273df7) + proto.RegisterFile("carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto", fileDescriptor_e972ccf085273df7) } var fileDescriptor_e972ccf085273df7 = []byte{ diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto index 751896e47..669b7e948 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto @@ -5,13 +5,13 @@ syntax = "proto2"; package github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1; -import "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto"; +import "carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; // Package-wide variables from generator "generated". -option go_package = "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1"; +option go_package = "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1"; // +k8s:openapi-gen=true message AppCluster { diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_fetch.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_fetch.go index 2a598a09b..031dbf392 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_fetch.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_fetch.go @@ -4,7 +4,7 @@ package v1alpha1 import ( - versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" ) // +k8s:openapi-gen=true diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go index b51afa929..478450469 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go @@ -6,7 +6,7 @@ package v1alpha1 import ( - versionsv1alpha1 "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + versionsv1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_install.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_install.go index 5fa083aa9..1f4c7b720 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_install.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_install.go @@ -4,8 +4,8 @@ package v1alpha1 import ( - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_repository.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_repository.go index c622b1491..c796831ee 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_repository.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_repository.go @@ -4,7 +4,7 @@ package v1alpha1 import ( - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go index a92b8c534..ee21032b1 100644 --- a/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go @@ -6,8 +6,8 @@ package v1alpha1 import ( - kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - versionsv1alpha1 "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + kappctrlv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + versionsv1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.pb.go b/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.pb.go index c67facc7c..53865db42 100644 --- a/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.pb.go +++ b/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto +// source: carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto package v1alpha1 @@ -117,7 +117,7 @@ func init() { } func init() { - proto.RegisterFile("github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto", fileDescriptor_8d3ef80c738fc456) + proto.RegisterFile("carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto", fileDescriptor_8d3ef80c738fc456) } var fileDescriptor_8d3ef80c738fc456 = []byte{ diff --git a/vendor/modules.txt b/vendor/modules.txt index a8bc1aaea..be15b5d03 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -151,13 +151,13 @@ github.com/stretchr/testify/require # github.com/vito/go-interact v1.0.1 ## explicit; go 1.12 github.com/vito/go-interact/interact -# github.com/vmware-tanzu/carvel-kapp-controller v0.46.2 +# carvel.dev/kapp-controller v0.46.2 ## explicit; go 1.20 -github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1 -github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1 -# github.com/vmware-tanzu/carvel-vendir v0.33.1 +carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1 +carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1 +# carvel.dev v0.33.1 ## explicit; go 1.19 -github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1 +carvel.dev/vendir/pkg/vendir/versions/v1alpha1 # golang.org/x/net v0.17.0 ## explicit; go 1.17 golang.org/x/net/context