diff --git a/.goreleaser.yml b/.goreleaser.yml index b1e53c827..db57a7033 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -21,7 +21,7 @@ builds: ldflags: - -buildid= - - -X github.com/k14s/kapp/pkg/kapp/version.Version={{ .Version }} + - -X github.com/vmware-tanzu/carvel-kapp/pkg/kapp/version.Version={{ .Version }} archives: - format: binary diff --git a/cmd/kapp/kapp.go b/cmd/kapp/kapp.go index 7c8f7173e..b9457b2f1 100644 --- a/cmd/kapp/kapp.go +++ b/cmd/kapp/kapp.go @@ -10,8 +10,8 @@ import ( uierrs "github.com/cppforlife/go-cli-ui/errors" "github.com/cppforlife/go-cli-ui/ui" - "github.com/k14s/kapp/pkg/kapp/cmd" - cmdapp "github.com/k14s/kapp/pkg/kapp/cmd/app" + "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 198a58dc8..960421a11 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/k14s/kapp +module github.com/vmware-tanzu/carvel-kapp go 1.18 diff --git a/hack/build-binaries.sh b/hack/build-binaries.sh index 104094130..5623ceb62 100755 --- a/hack/build-binaries.sh +++ b/hack/build-binaries.sh @@ -12,7 +12,7 @@ VERSION="${1:-`get_latest_git_tag`}" # makes builds reproducible export CGO_ENABLED=0 -LDFLAGS="-X github.com/k14s/kapp/pkg/kapp/version.Version=$VERSION -buildid=" +LDFLAGS="-X github.com/vmware-tanzu/carvel-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 a60d1dea5..41a806e6b 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/k14s/kapp/pkg/kapp/version.Version=$VERSION -buildid=" +LDFLAGS="-X github.com/vmware-tanzu/carvel-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 e9292609b..66869f878 100644 --- a/pkg/kapp/app/apps.go +++ b/pkg/kapp/app/apps.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/k14s/kapp/pkg/kapp/logger" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" + ctlres "github.com/vmware-tanzu/carvel-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 5ca3b354c..ff5128f45 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 19b6dcd02..4589a9691 100644 --- a/pkg/kapp/app/preparation.go +++ b/pkg/kapp/app/preparation.go @@ -8,8 +8,8 @@ import ( "strings" "time" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" - ctlresm "github.com/k14s/kapp/pkg/kapp/resourcesmisc" + 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/app/recorded_app.go b/pkg/kapp/app/recorded_app.go index fe3852aa0..5fad81ace 100644 --- a/pkg/kapp/app/recorded_app.go +++ b/pkg/kapp/app/recorded_app.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/k14s/kapp/pkg/kapp/logger" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" + ctlres "github.com/vmware-tanzu/carvel-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 495aa0cc2..c569b8d29 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/k14s/kapp/pkg/kapp/config" - ctldiff "github.com/k14s/kapp/pkg/kapp/diff" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" - "github.com/k14s/kapp/pkg/kapp/util" + 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" "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/pkg/kapp/clusterapply/applying_changes.go b/pkg/kapp/clusterapply/applying_changes.go index f502aa6fe..25bda01ad 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/k14s/kapp/pkg/kapp/diffgraph" - "github.com/k14s/kapp/pkg/kapp/util" + ctldgraph "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diffgraph" + "github.com/vmware-tanzu/carvel-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 1b0916d5e..82eeebbbc 100644 --- a/pkg/kapp/clusterapply/change_set_view.go +++ b/pkg/kapp/clusterapply/change_set_view.go @@ -8,10 +8,10 @@ import ( "github.com/cppforlife/color" "github.com/cppforlife/go-cli-ui/ui" - ctlconf "github.com/k14s/kapp/pkg/kapp/config" - "github.com/k14s/kapp/pkg/kapp/diff" - ctldiff "github.com/k14s/kapp/pkg/kapp/diff" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + 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 1713eb08f..d8336c26a 100644 --- a/pkg/kapp/clusterapply/changes_view.go +++ b/pkg/kapp/clusterapply/changes_view.go @@ -9,10 +9,10 @@ import ( "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - ctldiff "github.com/k14s/kapp/pkg/kapp/diff" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" "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 3c9ece293..84852677b 100644 --- a/pkg/kapp/clusterapply/cluster_change.go +++ b/pkg/kapp/clusterapply/cluster_change.go @@ -8,10 +8,10 @@ import ( "strings" uierrs "github.com/cppforlife/go-cli-ui/errors" - ctlconf "github.com/k14s/kapp/pkg/kapp/config" - ctldiff "github.com/k14s/kapp/pkg/kapp/diff" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" - ctlresm "github.com/k14s/kapp/pkg/kapp/resourcesmisc" + 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 2f6b5b5f4..572fe867a 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/k14s/kapp/pkg/kapp/config" - ctldiff "github.com/k14s/kapp/pkg/kapp/diff" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + 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" ) type ClusterChangeFactory struct { diff --git a/pkg/kapp/clusterapply/cluster_change_set.go b/pkg/kapp/clusterapply/cluster_change_set.go index 416958aca..48d2c81cd 100644 --- a/pkg/kapp/clusterapply/cluster_change_set.go +++ b/pkg/kapp/clusterapply/cluster_change_set.go @@ -6,10 +6,10 @@ package clusterapply import ( "fmt" - ctlconf "github.com/k14s/kapp/pkg/kapp/config" - ctldiff "github.com/k14s/kapp/pkg/kapp/diff" - ctldgraph "github.com/k14s/kapp/pkg/kapp/diffgraph" - "github.com/k14s/kapp/pkg/kapp/logger" + 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 7a7075864..9c82d5b9c 100644 --- a/pkg/kapp/clusterapply/converged_resource.go +++ b/pkg/kapp/clusterapply/converged_resource.go @@ -9,8 +9,8 @@ import ( "sort" "github.com/cppforlife/color" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" - ctlresm "github.com/k14s/kapp/pkg/kapp/resourcesmisc" + 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 ef17ab4c3..f387a158b 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/k14s/kapp/pkg/kapp/config" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" - ctlresm "github.com/k14s/kapp/pkg/kapp/resourcesmisc" + 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" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/kapp/clusterapply/delete_change.go b/pkg/kapp/clusterapply/delete_change.go index 4e12a23ca..fe3982eba 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/k14s/kapp/pkg/kapp/diff" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" - ctlresm "github.com/k14s/kapp/pkg/kapp/resourcesmisc" + 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" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" ) diff --git a/pkg/kapp/clusterapply/exists_change.go b/pkg/kapp/clusterapply/exists_change.go index 26c22a2f3..9b40ea8ba 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/k14s/kapp/pkg/kapp/diff" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + ctldiff "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/diff" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type ExistsChange struct { diff --git a/pkg/kapp/clusterapply/reconciling_change.go b/pkg/kapp/clusterapply/reconciling_change.go index aa5e1b078..4a5e7abd3 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/k14s/kapp/pkg/kapp/diff" - "github.com/k14s/kapp/pkg/kapp/logger" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" - ctlresm "github.com/k14s/kapp/pkg/kapp/resourcesmisc" + 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" ) type ReconcilingChange struct { diff --git a/pkg/kapp/clusterapply/ui.go b/pkg/kapp/clusterapply/ui.go index 69e8e0447..016fb185a 100644 --- a/pkg/kapp/clusterapply/ui.go +++ b/pkg/kapp/clusterapply/ui.go @@ -4,7 +4,7 @@ package clusterapply import ( - ctlresm "github.com/k14s/kapp/pkg/kapp/resourcesmisc" + ctlresm "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resourcesmisc" ) type UI interface { diff --git a/pkg/kapp/clusterapply/waiting_changes.go b/pkg/kapp/clusterapply/waiting_changes.go index 0c7f3ce6b..3cedd8430 100644 --- a/pkg/kapp/clusterapply/waiting_changes.go +++ b/pkg/kapp/clusterapply/waiting_changes.go @@ -9,9 +9,9 @@ import ( "time" uierrs "github.com/cppforlife/go-cli-ui/errors" - ctldgraph "github.com/k14s/kapp/pkg/kapp/diffgraph" - ctlresm "github.com/k14s/kapp/pkg/kapp/resourcesmisc" - "github.com/k14s/kapp/pkg/kapp/util" + 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 67ce160ea..f374108fb 100644 --- a/pkg/kapp/cmd/app/app_flags.go +++ b/pkg/kapp/cmd/app/app_flags.go @@ -4,8 +4,8 @@ package app import ( - cmdcore "github.com/k14s/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/app/apply_flags.go b/pkg/kapp/cmd/app/apply_flags.go index f88f2fa40..ce4865a35 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 "github.com/k14s/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 c762cf6b3..97613d62e 100644 --- a/pkg/kapp/cmd/app/delete.go +++ b/pkg/kapp/cmd/app/delete.go @@ -5,17 +5,17 @@ package app import ( "github.com/cppforlife/go-cli-ui/ui" - ctlapp "github.com/k14s/kapp/pkg/kapp/app" - ctlcap "github.com/k14s/kapp/pkg/kapp/clusterapply" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - cmdtools "github.com/k14s/kapp/pkg/kapp/cmd/tools" - ctlconf "github.com/k14s/kapp/pkg/kapp/config" - ctldiff "github.com/k14s/kapp/pkg/kapp/diff" - ctldgraph "github.com/k14s/kapp/pkg/kapp/diffgraph" - ctldiffui "github.com/k14s/kapp/pkg/kapp/diffui" - "github.com/k14s/kapp/pkg/kapp/logger" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" "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 { diff --git a/pkg/kapp/cmd/app/deploy.go b/pkg/kapp/cmd/app/deploy.go index 9f9a60f77..191d9f8a8 100644 --- a/pkg/kapp/cmd/app/deploy.go +++ b/pkg/kapp/cmd/app/deploy.go @@ -9,19 +9,19 @@ import ( "strings" "github.com/cppforlife/go-cli-ui/ui" - ctlapp "github.com/k14s/kapp/pkg/kapp/app" - ctlcap "github.com/k14s/kapp/pkg/kapp/clusterapply" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - cmdtools "github.com/k14s/kapp/pkg/kapp/cmd/tools" - ctlconf "github.com/k14s/kapp/pkg/kapp/config" - ctldiff "github.com/k14s/kapp/pkg/kapp/diff" - ctldgraph "github.com/k14s/kapp/pkg/kapp/diffgraph" - ctldiffui "github.com/k14s/kapp/pkg/kapp/diffui" - "github.com/k14s/kapp/pkg/kapp/logger" - ctllogs "github.com/k14s/kapp/pkg/kapp/logs" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" - ctlresm "github.com/k14s/kapp/pkg/kapp/resourcesmisc" "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" + 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" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/kapp/cmd/app/deploy_config.go b/pkg/kapp/cmd/app/deploy_config.go index 0db40af1c..847e2d0c4 100644 --- a/pkg/kapp/cmd/app/deploy_config.go +++ b/pkg/kapp/cmd/app/deploy_config.go @@ -5,9 +5,9 @@ package app import ( "github.com/cppforlife/go-cli-ui/ui" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - ctlconf "github.com/k14s/kapp/pkg/kapp/config" "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 e2ff5992f..bebb0be33 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 "github.com/k14s/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 6b0095d05..474d9ce77 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/k14s/kapp/pkg/kapp/app" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - "github.com/k14s/kapp/pkg/kapp/logger" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + 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" "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 34150b79a..036954ad0 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 ff15595ce..044b36dd9 100644 --- a/pkg/kapp/cmd/app/inspect.go +++ b/pkg/kapp/cmd/app/inspect.go @@ -7,13 +7,13 @@ import ( "fmt" "github.com/cppforlife/go-cli-ui/ui" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - cmdtools "github.com/k14s/kapp/pkg/kapp/cmd/tools" - ctldiff "github.com/k14s/kapp/pkg/kapp/diff" - "github.com/k14s/kapp/pkg/kapp/logger" - "github.com/k14s/kapp/pkg/kapp/resources" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" "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 0a860747c..4ec166c76 100644 --- a/pkg/kapp/cmd/app/inspect_status_view.go +++ b/pkg/kapp/cmd/app/inspect_status_view.go @@ -8,8 +8,8 @@ import ( "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + 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 72246990c..a89ee4cae 100644 --- a/pkg/kapp/cmd/app/label.go +++ b/pkg/kapp/cmd/app/label.go @@ -5,9 +5,9 @@ package app import ( "github.com/cppforlife/go-cli-ui/ui" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - "github.com/k14s/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 LabelOptions struct { diff --git a/pkg/kapp/cmd/app/list.go b/pkg/kapp/cmd/app/list.go index 899c1037f..99801a587 100644 --- a/pkg/kapp/cmd/app/list.go +++ b/pkg/kapp/cmd/app/list.go @@ -9,10 +9,10 @@ import ( "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - cmdtools "github.com/k14s/kapp/pkg/kapp/cmd/tools" - "github.com/k14s/kapp/pkg/kapp/logger" "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 6a3e04c2b..74ea77f41 100644 --- a/pkg/kapp/cmd/app/logs.go +++ b/pkg/kapp/cmd/app/logs.go @@ -5,12 +5,12 @@ package app import ( "github.com/cppforlife/go-cli-ui/ui" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - "github.com/k14s/kapp/pkg/kapp/logger" - ctllogs "github.com/k14s/kapp/pkg/kapp/logs" - "github.com/k14s/kapp/pkg/kapp/matcher" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" "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 547ebf35c..874dd0d49 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 "github.com/k14s/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 974c81418..af6afda19 100644 --- a/pkg/kapp/cmd/app/rename.go +++ b/pkg/kapp/cmd/app/rename.go @@ -7,9 +7,9 @@ import ( "fmt" "github.com/cppforlife/go-cli-ui/ui" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - "github.com/k14s/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 RenameOptions struct { diff --git a/pkg/kapp/cmd/app/used_gks_scope.go b/pkg/kapp/cmd/app/used_gks_scope.go index f8723b85b..f77b628f4 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 37d60593c..80ec73260 100644 --- a/pkg/kapp/cmd/appchange/cmd.go +++ b/pkg/kapp/cmd/appchange/cmd.go @@ -4,8 +4,8 @@ package appchange import ( - cmdcore "github.com/k14s/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 15a32d88d..a0bd165e1 100644 --- a/pkg/kapp/cmd/appchange/gc.go +++ b/pkg/kapp/cmd/appchange/gc.go @@ -5,11 +5,11 @@ package appchange import ( "github.com/cppforlife/go-cli-ui/ui" - ctlapp "github.com/k14s/kapp/pkg/kapp/app" - cmdapp "github.com/k14s/kapp/pkg/kapp/cmd/app" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - "github.com/k14s/kapp/pkg/kapp/logger" "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 678b20856..68e607078 100644 --- a/pkg/kapp/cmd/appchange/list.go +++ b/pkg/kapp/cmd/appchange/list.go @@ -10,11 +10,11 @@ import ( "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" - ctlapp "github.com/k14s/kapp/pkg/kapp/app" - cmdapp "github.com/k14s/kapp/pkg/kapp/cmd/app" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - "github.com/k14s/kapp/pkg/kapp/logger" "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 a4104709d..01630b683 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 "github.com/k14s/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 e8ddf3c93..5954d604d 100644 --- a/pkg/kapp/cmd/appgroup/cmd.go +++ b/pkg/kapp/cmd/appgroup/cmd.go @@ -4,8 +4,8 @@ package appgroup import ( - cmdcore "github.com/k14s/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 5783960a7..c67298699 100644 --- a/pkg/kapp/cmd/appgroup/delete.go +++ b/pkg/kapp/cmd/appgroup/delete.go @@ -7,11 +7,11 @@ import ( "fmt" "github.com/cppforlife/go-cli-ui/ui" - cmdapp "github.com/k14s/kapp/pkg/kapp/cmd/app" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - cmdtools "github.com/k14s/kapp/pkg/kapp/cmd/tools" - "github.com/k14s/kapp/pkg/kapp/logger" "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 31965c8c3..d965f14f2 100644 --- a/pkg/kapp/cmd/appgroup/deploy.go +++ b/pkg/kapp/cmd/appgroup/deploy.go @@ -10,11 +10,11 @@ import ( "path/filepath" "github.com/cppforlife/go-cli-ui/ui" - cmdapp "github.com/k14s/kapp/pkg/kapp/cmd/app" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - cmdtools "github.com/k14s/kapp/pkg/kapp/cmd/tools" - "github.com/k14s/kapp/pkg/kapp/logger" "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 5ed6b214c..18cdb3587 100644 --- a/pkg/kapp/cmd/configmap/cmd.go +++ b/pkg/kapp/cmd/configmap/cmd.go @@ -4,8 +4,8 @@ package configmap import ( - cmdcore "github.com/k14s/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 a70be26ba..f57807500 100644 --- a/pkg/kapp/cmd/configmap/list.go +++ b/pkg/kapp/cmd/configmap/list.go @@ -6,10 +6,10 @@ package configmap import ( "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" - cmdapp "github.com/k14s/kapp/pkg/kapp/cmd/app" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - "github.com/k14s/kapp/pkg/kapp/logger" "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 9ee8acd4b..dfdff7f6c 100644 --- a/pkg/kapp/cmd/kapp.go +++ b/pkg/kapp/cmd/kapp.go @@ -8,16 +8,16 @@ import ( "github.com/cppforlife/cobrautil" "github.com/cppforlife/go-cli-ui/ui" - cmdapp "github.com/k14s/kapp/pkg/kapp/cmd/app" - cmdac "github.com/k14s/kapp/pkg/kapp/cmd/appchange" - cmdag "github.com/k14s/kapp/pkg/kapp/cmd/appgroup" - cmdcm "github.com/k14s/kapp/pkg/kapp/cmd/configmap" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - cmdsa "github.com/k14s/kapp/pkg/kapp/cmd/serviceaccount" - cmdtools "github.com/k14s/kapp/pkg/kapp/cmd/tools" - "github.com/k14s/kapp/pkg/kapp/logger" - "github.com/k14s/kapp/pkg/kapp/version" "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 { diff --git a/pkg/kapp/cmd/logger_flags.go b/pkg/kapp/cmd/logger_flags.go index 121327549..d66e08147 100644 --- a/pkg/kapp/cmd/logger_flags.go +++ b/pkg/kapp/cmd/logger_flags.go @@ -4,9 +4,9 @@ package cmd import ( - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - "github.com/k14s/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/serviceaccount/cmd.go b/pkg/kapp/cmd/serviceaccount/cmd.go index 091db2192..228f6abd4 100644 --- a/pkg/kapp/cmd/serviceaccount/cmd.go +++ b/pkg/kapp/cmd/serviceaccount/cmd.go @@ -4,8 +4,8 @@ package serviceaccount import ( - cmdcore "github.com/k14s/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 18fd89928..f5c008135 100644 --- a/pkg/kapp/cmd/serviceaccount/list.go +++ b/pkg/kapp/cmd/serviceaccount/list.go @@ -6,11 +6,11 @@ package serviceaccount import ( "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" - cmdapp "github.com/k14s/kapp/pkg/kapp/cmd/app" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - "github.com/k14s/kapp/pkg/kapp/logger" - "github.com/k14s/kapp/pkg/kapp/resources" "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 2e426b031..5611900f8 100644 --- a/pkg/kapp/cmd/serviceaccount/rbac.go +++ b/pkg/kapp/cmd/serviceaccount/rbac.go @@ -5,7 +5,7 @@ package serviceaccount import ( "github.com/ghodss/yaml" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type ServiceAccount struct { diff --git a/pkg/kapp/cmd/serviceaccount/rbac_resources.go b/pkg/kapp/cmd/serviceaccount/rbac_resources.go index 2589f96bc..bda3f95c6 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 510d7d1cf..08f70f2b7 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" - "github.com/k14s/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 8131051d1..89fa70fd2 100644 --- a/pkg/kapp/cmd/tools/cmd.go +++ b/pkg/kapp/cmd/tools/cmd.go @@ -4,8 +4,8 @@ package tools import ( - cmdcore "github.com/k14s/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 98ab6267c..e4a60702d 100644 --- a/pkg/kapp/cmd/tools/diff.go +++ b/pkg/kapp/cmd/tools/diff.go @@ -5,11 +5,11 @@ package tools import ( "github.com/cppforlife/go-cli-ui/ui" - ctlcap "github.com/k14s/kapp/pkg/kapp/clusterapply" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - ctldiff "github.com/k14s/kapp/pkg/kapp/diff" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" "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" ) type DiffOptions struct { diff --git a/pkg/kapp/cmd/tools/diff_flags.go b/pkg/kapp/cmd/tools/diff_flags.go index ce9146650..5ea8424a7 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 "github.com/k14s/kapp/pkg/kapp/clusterapply" - ctldiff "github.com/k14s/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 13afa5f38..69df5789a 100644 --- a/pkg/kapp/cmd/tools/inspect.go +++ b/pkg/kapp/cmd/tools/inspect.go @@ -5,9 +5,9 @@ package tools import ( "github.com/cppforlife/go-cli-ui/ui" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" "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" ) type InspectOptions struct { diff --git a/pkg/kapp/cmd/tools/inspect_tree_view.go b/pkg/kapp/cmd/tools/inspect_tree_view.go index d6c0a3cc7..44519b4be 100644 --- a/pkg/kapp/cmd/tools/inspect_tree_view.go +++ b/pkg/kapp/cmd/tools/inspect_tree_view.go @@ -11,9 +11,9 @@ import ( "github.com/cppforlife/color" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" - ctlcap "github.com/k14s/kapp/pkg/kapp/clusterapply" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + 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 82d1b86be..5abc5f92c 100644 --- a/pkg/kapp/cmd/tools/inspect_view.go +++ b/pkg/kapp/cmd/tools/inspect_view.go @@ -8,9 +8,9 @@ import ( "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" - ctlcap "github.com/k14s/kapp/pkg/kapp/clusterapply" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + 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 0d11dcf20..3ce671bdb 100644 --- a/pkg/kapp/cmd/tools/list_labels.go +++ b/pkg/kapp/cmd/tools/list_labels.go @@ -8,10 +8,10 @@ import ( "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - "github.com/k14s/kapp/pkg/kapp/logger" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" "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 9305559e5..eec84ab8a 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 "github.com/k14s/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 baef0644b..ab3d8d9ee 100644 --- a/pkg/kapp/cmd/ui_flags.go +++ b/pkg/kapp/cmd/ui_flags.go @@ -6,8 +6,8 @@ package cmd import ( "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" "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 45b751529..3c1dd0f34 100644 --- a/pkg/kapp/cmd/version.go +++ b/pkg/kapp/cmd/version.go @@ -7,9 +7,9 @@ import ( "fmt" "github.com/cppforlife/go-cli-ui/ui" - cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" - "github.com/k14s/kapp/pkg/kapp/version" "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 73d9745ca..0de54353e 100644 --- a/pkg/kapp/cmd/warning_flags.go +++ b/pkg/kapp/cmd/warning_flags.go @@ -4,8 +4,8 @@ package cmd import ( - cmdcore "github.com/k14s/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 a6c81ba32..619e24e64 100644 --- a/pkg/kapp/config/conf.go +++ b/pkg/kapp/config/conf.go @@ -6,7 +6,7 @@ package config import ( "fmt" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 56857bc59..a1a1cf4f4 100644 --- a/pkg/kapp/config/config.go +++ b/pkg/kapp/config/config.go @@ -8,9 +8,9 @@ import ( "github.com/ghodss/yaml" semver "github.com/hashicorp/go-version" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" - "github.com/k14s/kapp/pkg/kapp/version" - "github.com/k14s/kapp/pkg/kapp/yttresmod" + 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" ) const ( diff --git a/pkg/kapp/config/default.go b/pkg/kapp/config/default.go index 5fdab8b05..daee00dcb 100644 --- a/pkg/kapp/config/default.go +++ b/pkg/kapp/config/default.go @@ -4,7 +4,7 @@ package config import ( - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) const defaultConfigYAML = `--- diff --git a/pkg/kapp/config/resource_matchers.go b/pkg/kapp/config/resource_matchers.go index 7f2a4b112..642c19b3d 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type ResourceMatchers []ResourceMatcher diff --git a/pkg/kapp/diff/change.go b/pkg/kapp/diff/change.go index 1fc9d8292..cbabfd83b 100644 --- a/pkg/kapp/diff/change.go +++ b/pkg/kapp/diff/change.go @@ -5,7 +5,7 @@ package diff import ( "github.com/cppforlife/go-patch/patch" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + 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 88ea72efd..9485929e6 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type ChangeFactory struct { diff --git a/pkg/kapp/diff/change_precalculated.go b/pkg/kapp/diff/change_precalculated.go index 69df296c0..201cdae1c 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type ChangePrecalculated struct { diff --git a/pkg/kapp/diff/change_set.go b/pkg/kapp/diff/change_set.go index b2c079e57..86026da73 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 50df2f04c..2aed27a24 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 760292b55..5859a7efa 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 "github.com/k14s/kapp/pkg/kapp/diff" - ctlres "github.com/k14s/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 804d49946..4e12315de 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/k14s/kapp/pkg/kapp/config" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" + ctlres "github.com/vmware-tanzu/carvel-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 12774d3db..66db1d906 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 "github.com/k14s/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 e5e4fe3ce..575e99a72 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/k14s/kapp/pkg/kapp/config" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" + ctlres "github.com/vmware-tanzu/carvel-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 8908791ac..7c706f8e5 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" "gopkg.in/yaml.v2" ) diff --git a/pkg/kapp/diff/filter.go b/pkg/kapp/diff/filter.go index 24aa249e7..82ef7c248 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type ChangeSetFilter struct { diff --git a/pkg/kapp/diff/group_resources.go b/pkg/kapp/diff/group_resources.go index 1dbcb5f94..8d54d256b 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type GroupResources struct { diff --git a/pkg/kapp/diff/masked_resource.go b/pkg/kapp/diff/masked_resource.go index 3a14112b7..66415d16f 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/k14s/kapp/pkg/kapp/config" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type MaskedResource struct { diff --git a/pkg/kapp/diff/rebased_resource.go b/pkg/kapp/diff/rebased_resource.go index 6211fa0a0..bd1ed2298 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type RebasedResource struct { diff --git a/pkg/kapp/diff/resource_with_history.go b/pkg/kapp/diff/resource_with_history.go index aecad018d..0fb1f1997 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) const ( diff --git a/pkg/kapp/diff/resource_with_removed_fields.go b/pkg/kapp/diff/resource_with_removed_fields.go index badad67b6..4fef24b40 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 7e00c7ec1..ed59b07a7 100644 --- a/pkg/kapp/diff/text_diff_view.go +++ b/pkg/kapp/diff/text_diff_view.go @@ -9,7 +9,7 @@ import ( "github.com/cppforlife/color" "github.com/k14s/difflib" - ctlconf "github.com/k14s/kapp/pkg/kapp/config" + 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 85c48ba50..1240907f1 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/k14s/kapp/pkg/kapp/config" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" + ctlres "github.com/vmware-tanzu/carvel-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 3d264101e..21d78a626 100644 --- a/pkg/kapp/diffgraph/change.go +++ b/pkg/kapp/diffgraph/change.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - ctlconf "github.com/k14s/kapp/pkg/kapp/config" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) const ( diff --git a/pkg/kapp/diffgraph/change_graph.go b/pkg/kapp/diffgraph/change_graph.go index ca5a6854a..6ed1778c2 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/k14s/kapp/pkg/kapp/config" - "github.com/k14s/kapp/pkg/kapp/logger" + ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" + "github.com/vmware-tanzu/carvel-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 b94df8ddb..074945f62 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 "github.com/k14s/kapp/pkg/kapp/config" - ctldgraph "github.com/k14s/kapp/pkg/kapp/diffgraph" - ctlres "github.com/k14s/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 912b9a296..1b8aa3941 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 "github.com/k14s/kapp/pkg/kapp/config" - ctldgraph "github.com/k14s/kapp/pkg/kapp/diffgraph" - ctlres "github.com/k14s/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 8535a96af..b77777835 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 "github.com/k14s/kapp/pkg/kapp/config" - ctldgraph "github.com/k14s/kapp/pkg/kapp/diffgraph" - "github.com/k14s/kapp/pkg/kapp/logger" - ctlres "github.com/k14s/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 9a19e5f8e..912ee9af9 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/k14s/kapp/pkg/kapp/resources" - ctlcrd "github.com/k14s/kapp/pkg/kapp/resourcesmisc" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" + ctlcrd "github.com/vmware-tanzu/carvel-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 fd543dfd1..1f72620da 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 "github.com/k14s/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 01e1327c2..fed59dcc6 100644 --- a/pkg/kapp/diffui/server.go +++ b/pkg/kapp/diffui/server.go @@ -12,8 +12,8 @@ import ( "time" "github.com/cppforlife/go-cli-ui/ui" - ctldgraph "github.com/k14s/kapp/pkg/kapp/diffgraph" - "github.com/k14s/kapp/pkg/kapp/diffui/assets" + 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 7ad86ca05..a9f426b46 100644 --- a/pkg/kapp/logs/pod_log.go +++ b/pkg/kapp/logs/pod_log.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/cppforlife/go-cli-ui/ui" - "github.com/k14s/kapp/pkg/kapp/matcher" + "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 10cadd8a6..87b4f8e90 100644 --- a/pkg/kapp/matcher/string_test.go +++ b/pkg/kapp/matcher/string_test.go @@ -6,8 +6,8 @@ package matcher_test import ( "testing" - "github.com/k14s/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 fcd423377..5c3c21cd5 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 "github.com/k14s/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 e2a94c9e1..409ddf3ea 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/k14s/kapp/pkg/kapp/logger" + "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes" ) diff --git a/pkg/kapp/resources/identified_resources_list_test.go b/pkg/kapp/resources/identified_resources_list_test.go index 4aed638c1..36ab978a6 100644 --- a/pkg/kapp/resources/identified_resources_list_test.go +++ b/pkg/kapp/resources/identified_resources_list_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/cppforlife/go-cli-ui/ui" - "github.com/k14s/kapp/pkg/kapp/logger" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" "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 1b43c0e28..bf3f26620 100644 --- a/pkg/kapp/resources/labeled_resources.go +++ b/pkg/kapp/resources/labeled_resources.go @@ -8,8 +8,8 @@ import ( "strings" "sync" - "github.com/k14s/kapp/pkg/kapp/logger" - "github.com/k14s/kapp/pkg/kapp/util" + "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" + "github.com/vmware-tanzu/carvel-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 0864cff21..dd4bccd84 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 "github.com/k14s/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 3661189a8..28d120231 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 "github.com/k14s/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 df0f49457..d8e5ff8a3 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 "github.com/k14s/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_filter.go b/pkg/kapp/resources/resource_filter.go index c48b74513..00a698274 100644 --- a/pkg/kapp/resources/resource_filter.go +++ b/pkg/kapp/resources/resource_filter.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "github.com/k14s/kapp/pkg/kapp/matcher" // TODO inject + "github.com/vmware-tanzu/carvel-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 936c8ceda..bc0f74f8e 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 "github.com/k14s/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/resources.go b/pkg/kapp/resources/resources.go index 875f7bf48..9006a9171 100644 --- a/pkg/kapp/resources/resources.go +++ b/pkg/kapp/resources/resources.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/k14s/kapp/pkg/kapp/logger" - "github.com/k14s/kapp/pkg/kapp/util" + "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/logger" + "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/util" "golang.org/x/net/http2" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/kapp/resourcesmisc/api_extensions_vx_crd.go b/pkg/kapp/resourcesmisc/api_extensions_vx_crd.go index bd63f5a83..29cc9c5a7 100644 --- a/pkg/kapp/resourcesmisc/api_extensions_vx_crd.go +++ b/pkg/kapp/resourcesmisc/api_extensions_vx_crd.go @@ -5,7 +5,7 @@ package resourcesmisc import ( "github.com/ghodss/yaml" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type APIExtensionsVxCRD struct { diff --git a/pkg/kapp/resourcesmisc/api_registration_v1_api_service.go b/pkg/kapp/resourcesmisc/api_registration_v1_api_service.go index 5e9a3a1bf..b0299390b 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 81ba080fe..a8984597f 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 a69557367..ec2dec321 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 682b88af4..0692c249d 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 "github.com/k14s/kapp/pkg/kapp/resources" - ctlresm "github.com/k14s/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 2f94dab23..294fd66d7 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 9c226bffd..86cdc78c3 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 "github.com/k14s/kapp/pkg/kapp/resources" - ctlresm "github.com/k14s/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 a80e6c2c8..a031b871d 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 fb3793403..cd7729fce 100644 --- a/pkg/kapp/resourcesmisc/apps_v1_stateful_set.go +++ b/pkg/kapp/resourcesmisc/apps_v1_stateful_set.go @@ -5,7 +5,7 @@ package resourcesmisc import ( "fmt" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 37155eb1b..5e975922f 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 "github.com/k14s/kapp/pkg/kapp/resources" - ctlresm "github.com/k14s/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 0b9af26e5..476c90d6d 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 6212f48a6..6e088dc39 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) type BatchVxCronJob struct { diff --git a/pkg/kapp/resourcesmisc/conditions.go b/pkg/kapp/resourcesmisc/conditions.go index 1ccb89eb1..c25bdcecc 100644 --- a/pkg/kapp/resourcesmisc/conditions.go +++ b/pkg/kapp/resourcesmisc/conditions.go @@ -6,7 +6,7 @@ package resourcesmisc import ( "fmt" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 602f916cd..9f4777865 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 6ed40f4dd..de857c0c5 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 a90363854..0ad9fee9c 100644 --- a/pkg/kapp/resourcesmisc/crds.go +++ b/pkg/kapp/resourcesmisc/crds.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 1a0ea4955..3e67691d1 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/k14s/kapp/pkg/kapp/config" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + ctlconf "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/config" + ctlres "github.com/vmware-tanzu/carvel-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 4162dd11d..636a1b921 100644 --- a/pkg/kapp/resourcesmisc/deleting.go +++ b/pkg/kapp/resourcesmisc/deleting.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 a6155924f..eb3c1a642 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/k14s/kapp/pkg/kapp/resources" + ctlres "github.com/vmware-tanzu/carvel-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 ac13f92bb..9240d1c08 100644 --- a/pkg/kapp/resourcesmisc/kappctrl_k14s_io_v1alpha1_app.go +++ b/pkg/kapp/resourcesmisc/kappctrl_k14s_io_v1alpha1_app.go @@ -6,8 +6,8 @@ package resourcesmisc import ( "fmt" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes/scheme" ) diff --git a/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packageinstall.go b/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packageinstall.go index 6689b8497..4920b43df 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" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" appv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" pkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes/scheme" ) diff --git a/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packagerepository.go b/pkg/kapp/resourcesmisc/packaging_carvel_dev_v1alpha1_packagerepository.go index 9367fc208..4e1e256b8 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" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" appv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" pkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes/scheme" ) diff --git a/pkg/kapp/resourcesmisc/wait_rule_contract_v1.go b/pkg/kapp/resourcesmisc/wait_rule_contract_v1.go index 17f43e5b4..af5f0ded5 100644 --- a/pkg/kapp/resourcesmisc/wait_rule_contract_v1.go +++ b/pkg/kapp/resourcesmisc/wait_rule_contract_v1.go @@ -7,10 +7,10 @@ import ( "fmt" "github.com/ghodss/yaml" - ctlres "github.com/k14s/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" ) type WaitRuleContractV1 struct { diff --git a/pkg/kapp/yttresmod/overlay_contract_v1_mod.go b/pkg/kapp/yttresmod/overlay_contract_v1_mod.go index f36add47c..56ba66dd7 100644 --- a/pkg/kapp/yttresmod/overlay_contract_v1_mod.go +++ b/pkg/kapp/yttresmod/overlay_contract_v1_mod.go @@ -7,10 +7,10 @@ import ( "fmt" "github.com/ghodss/yaml" - ctlres "github.com/k14s/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" ) type OverlayContractV1Mod struct { diff --git a/test/e2e/app_suffix_test.go b/test/e2e/app_suffix_test.go index a7ddd9c92..3b5f67ece 100644 --- a/test/e2e/app_suffix_test.go +++ b/test/e2e/app_suffix_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/k14s/kapp/pkg/kapp/app" "github.com/stretchr/testify/require" + "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/app" ) var yaml1 string = ` diff --git a/test/e2e/cluster_resource.go b/test/e2e/cluster_resource.go index 75a59e272..063304636 100644 --- a/test/e2e/cluster_resource.go +++ b/test/e2e/cluster_resource.go @@ -9,8 +9,8 @@ import ( "sync" "testing" - ctlres "github.com/k14s/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 ed35c3452..5333e6a81 100644 --- a/test/e2e/config_test.go +++ b/test/e2e/config_test.go @@ -10,8 +10,8 @@ import ( uitest "github.com/cppforlife/go-cli-ui/ui/test" "github.com/ghodss/yaml" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestConfig(t *testing.T) { diff --git a/test/e2e/create_update_delete_test.go b/test/e2e/create_update_delete_test.go index 09e3ddf0a..91644bf7b 100644 --- a/test/e2e/create_update_delete_test.go +++ b/test/e2e/create_update_delete_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "github.com/k14s/kapp/pkg/kapp/app" - ctlres "github.com/k14s/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/template_test.go b/test/e2e/template_test.go index 1ab04d6ec..784505507 100644 --- a/test/e2e/template_test.go +++ b/test/e2e/template_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - ctlres "github.com/k14s/kapp/pkg/kapp/resources" "github.com/stretchr/testify/require" + ctlres "github.com/vmware-tanzu/carvel-kapp/pkg/kapp/resources" ) func TestTemplate(t *testing.T) {