Skip to content

Commit

Permalink
Update module name
Browse files Browse the repository at this point in the history
Signed-off-by: Praveen Rewar <[email protected]>
  • Loading branch information
praveenrewar committed Apr 16, 2024
1 parent 6e71814 commit 1dfead4
Show file tree
Hide file tree
Showing 161 changed files with 335 additions and 333 deletions.
18 changes: 9 additions & 9 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -32,20 +32,20 @@ archives:
windows: Windows
amd64: x86_64
checksum:
name_template: 'checksums.txt'
name_template: "checksums.txt"
algorithm: sha256
disable: false
signs:
- artifacts: checksum
certificate: '${artifact}.pem'
certificate: "${artifact}.pem"
cmd: cosign
args:
- sign-blob
- "--yes"
- '--output-certificate=${certificate}'
- '--output-signature=${signature}'
- '${artifact}'
output: true
- "--output-certificate=${certificate}"
- "--output-signature=${signature}"
- "${artifact}"
output: true
snapshot:
name_template: "{{ .Tag }}-next"
release:
Expand Down Expand Up @@ -76,7 +76,7 @@ release:
<summary><h2>Installation and signature verification</h2></summary>
### Installation
#### By downloading binary from the release
For instance, if you are using Linux on an AMD64 architecture:
Expand Down Expand Up @@ -140,5 +140,5 @@ changelog:
# the changelog
# Default is empty
exclude:
- '^docs:'
- "^docs:"
- typo
4 changes: 2 additions & 2 deletions cmd/kapp/kapp.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
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.22

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

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

Expand Down
8 changes: 4 additions & 4 deletions pkg/kapp/clusterapply/delete_change.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -93,7 +93,7 @@ func (c DeleteChange) IsDoneApplying() (ctlresm.DoneApplyState, []string, error)
// it should not matter if change is ignored or not
// because it should be deleted eventually anyway (thru GC)
// We should check for the UID check because of the following bug:
// https://github.com/vmware-tanzu/carvel-kapp/issues/229
// https://github.com/carvel-dev/kapp/issues/229
existingRes, exists, err := c.identifiedResources.Exists(res, ctlres.ExistsOpts{SameUID: true})
if err != nil {
return ctlresm.DoneApplyState{}, nil, err
Expand Down
4 changes: 2 additions & 2 deletions pkg/kapp/clusterapply/exists_change.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions pkg/kapp/clusterapply/reconciling_change.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/kapp/clusterapply/ui.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions pkg/kapp/clusterapply/waiting_changes.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/kapp/cmd/app/app_flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/kapp/cmd/app/apply_flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
22 changes: 11 additions & 11 deletions pkg/kapp/cmd/app/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -292,7 +292,7 @@ const (
func (o *DeleteOptions) changeIgnored(resources []ctlres.Resource) {
// Good example for use of this annotation is PVCs created by StatefulSet
// (PVCs do not get deleted when StatefulSet is deleted:
// https://github.com/vmware-tanzu/carvel-kapp/issues/36)
// https://github.com/carvel-dev/kapp/issues/36)
for _, res := range resources {
if _, found := res.Annotations()[ownedForDeletionAnnKey]; found {
res.MarkTransient(false)
Expand Down
Loading

0 comments on commit 1dfead4

Please sign in to comment.