Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change module name #869

Closed
wants to merge 1 commit into from
+330 −328
Closed

Change module name #869

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .goreleaser.yml
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions cmd/kapp/kapp.go
View file
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@YashPimple can you please check this path is not correct.

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
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -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=
2 changes: 1 addition & 1 deletion hack/build-binaries.sh
View file
Original file line number Diff line number Diff line change
@@ -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/...
2 changes: 1 addition & 1 deletion hack/build.sh
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions pkg/kapp/app/apps.go
View file
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion pkg/kapp/app/labeled_app.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)
4 changes: 2 additions & 2 deletions pkg/kapp/app/preparation.go
View file
Original file line number Diff line number Diff line change
@@ -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 (
4 changes: 2 additions & 2 deletions pkg/kapp/app/recorded_app.go
View file
Original file line number Diff line number Diff line change
@@ -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"
8 changes: 4 additions & 4 deletions pkg/kapp/clusterapply/add_or_update_change.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)

4 changes: 2 additions & 2 deletions pkg/kapp/clusterapply/applying_changes.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
8 changes: 4 additions & 4 deletions pkg/kapp/clusterapply/change_set_view.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
6 changes: 3 additions & 3 deletions pkg/kapp/clusterapply/changes_view.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
8 changes: 4 additions & 4 deletions pkg/kapp/clusterapply/cluster_change.go
View file
Original file line number Diff line number Diff line change
@@ -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 (
6 changes: 3 additions & 3 deletions pkg/kapp/clusterapply/cluster_change_factory.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
8 changes: 4 additions & 4 deletions pkg/kapp/clusterapply/cluster_change_set.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
4 changes: 2 additions & 2 deletions pkg/kapp/clusterapply/converged_resource.go
View file
Original file line number Diff line number Diff line change
@@ -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 (
6 changes: 3 additions & 3 deletions pkg/kapp/clusterapply/converged_resource_factory.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)

8 changes: 4 additions & 4 deletions pkg/kapp/clusterapply/delete_change.go
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions pkg/kapp/clusterapply/exists_change.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
8 changes: 4 additions & 4 deletions pkg/kapp/clusterapply/reconciling_change.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
2 changes: 1 addition & 1 deletion pkg/kapp/clusterapply/ui.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
6 changes: 3 additions & 3 deletions pkg/kapp/clusterapply/waiting_changes.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
2 changes: 1 addition & 1 deletion pkg/kapp/cmd/app/app_flags.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
2 changes: 1 addition & 1 deletion pkg/kapp/cmd/app/apply_flags.go
View file
Original file line number Diff line number Diff line change
@@ -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 (
22 changes: 11 additions & 11 deletions pkg/kapp/cmd/app/delete.go
View file
Original file line number Diff line number Diff line change
@@ -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)
Loading