Update vendir package name to carvel.dev/vendir

Signed-off-by: João Pereira <[email protected]>
carvel-dev · Nov 1, 2023 · 709219c · 709219c
1 parent 606e658
commit 709219c
Show file tree

Hide file tree

Showing 137 changed files with 4,221 additions and 4,309 deletions.
diff --git a/go.mod b/go.mod
@@ -3,16 +3,16 @@ module github.com/vmware-tanzu/carvel-kapp-controller
 go 1.21
 
 require (
-	github.com/fatih/color v1.13.0 // indirect
+	carvel.dev/vendir v0.37.0
+	github.com/fatih/color v1.15.0 // indirect
 	github.com/gogo/protobuf v1.3.2
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
 	github.com/prometheus/client_golang v1.14.0
-	github.com/stretchr/testify v1.8.1
-	github.com/vmware-tanzu/carvel-vendir v0.33.1
+	github.com/stretchr/testify v1.8.4
 	golang.org/x/crypto v0.14.0
 	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/tools v0.9.1
+	golang.org/x/tools v0.12.0
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.25.6
 	k8s.io/apimachinery v0.25.6
@@ -31,8 +31,8 @@ require (
 	github.com/cppforlife/go-cli-ui v0.0.0-20220425131040-94f26b16bc14
 	github.com/go-logr/logr v1.2.3
 	github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115
-	github.com/spf13/cobra v1.6.1
-	golang.org/x/sync v0.2.0
+	github.com/spf13/cobra v1.7.0
+	golang.org/x/sync v0.3.0
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/component-base v0.25.6
 	k8s.io/klog/v2 v2.90.1
@@ -63,19 +63,19 @@ require (
 	github.com/go-openapi/swag v0.19.15 // indirect
 	github.com/gobuffalo/flect v0.2.3 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
 	github.com/hashicorp/go-version v1.2.1 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
-	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -104,17 +104,17 @@ require (
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/mod v0.12.0 // indirect
 	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/oauth2 v0.4.0 // 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
 	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
 	google.golang.org/grpc v1.53.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect

diff --git a/go.sum b/go.sum
diff --git a/hack/gen-apiserver.sh b/hack/gen-apiserver.sh
@@ -59,7 +59,7 @@ rm -f $(find pkg/apiserver|grep zz_generated.openapi)
 go run vendor/k8s.io/code-generator/cmd/openapi-gen/main.go \
   --input-dirs "${KC_PKG}/pkg/apiserver/apis/datapackaging/v1alpha1" \
   --input-dirs "${KC_PKG}/pkg/apis/kappctrl/v1alpha1" \
-  --input-dirs "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr" \
+  --input-dirs "carvel.dev/vendir/pkg/vendir/versions/v1alpha1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr" \
   --input-dirs "k8s.io/api/core/v1" \
   --output-package "${KC_PKG}/pkg/apiserver/openapi" \
   -O zz_generated.openapi \
@@ -86,7 +86,7 @@ rm -f $(find pkg|grep '\.proto')
 # TODO It seems this command messes around with protos in vendor directory
 go-to-protobuf \
   --proto-import "${GOPATH}/src/${KC_PKG}/vendor" \
-  --packages "-github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1,${KC_PKG}/pkg/apis/kappctrl/v1alpha1,${KC_PKG}/pkg/apiserver/apis/datapackaging/v1alpha1" \
+  --packages "-carvel.dev/vendir/pkg/vendir/versions/v1alpha1,${KC_PKG}/pkg/apis/kappctrl/v1alpha1,${KC_PKG}/pkg/apiserver/apis/datapackaging/v1alpha1" \
   --vendor-output-base="${GOPATH}/src/${KC_PKG}/vendor" \
   --go-header-file hack/gen-boilerplate.txt
 

diff --git a/pkg/apis/kappctrl/v1alpha1/generated.pb.go b/pkg/apis/kappctrl/v1alpha1/generated.pb.go
diff --git a/pkg/apis/kappctrl/v1alpha1/generated.proto b/pkg/apis/kappctrl/v1alpha1/generated.proto
diff --git a/pkg/apis/kappctrl/v1alpha1/types_fetch.go b/pkg/apis/kappctrl/v1alpha1/types_fetch.go
@@ -4,7 +4,7 @@
 package v1alpha1
 
 import (
-	versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
+	versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
 )
 
 // +k8s:openapi-gen=true

diff --git a/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/packaging/v1alpha1/package_install.go b/pkg/apis/packaging/v1alpha1/package_install.go
@@ -4,8 +4,8 @@
 package v1alpha1
 
 import (
+	versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
 	"github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1"
-	versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

diff --git a/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apiserver/apis/datapackaging/validation/validations.go b/pkg/apiserver/apis/datapackaging/validation/validations.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"strings"
 
+	"carvel.dev/vendir/pkg/vendir/versions"
 	semver "github.com/k14s/semver/v4"
 	"github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging"
-	"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions"
 	"k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )

diff --git a/pkg/apiserver/openapi/zz_generated.openapi.go b/pkg/apiserver/openapi/zz_generated.openapi.go
diff --git a/pkg/app/app_factory.go b/pkg/app/app_factory.go
@@ -6,6 +6,7 @@ package app
 import (
 	"path/filepath"
 
+	vendirconf "carvel.dev/vendir/pkg/vendir/config"
 	"github.com/go-logr/logr"
 	kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1"
 	kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned"
@@ -17,7 +18,6 @@ import (
 	"github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir"
 	"github.com/vmware-tanzu/carvel-kapp-controller/pkg/metrics"
 	"github.com/vmware-tanzu/carvel-kapp-controller/pkg/template"
-	vendirconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
 	"k8s.io/client-go/kubernetes"
 )
 

diff --git a/pkg/fetch/vendir.go b/pkg/fetch/vendir.go
@@ -12,10 +12,11 @@ import (
 	"path/filepath"
 	"strings"
 
+	vendirconf "carvel.dev/vendir/pkg/vendir/config"
 	"github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1"
+
 	// we run vendir by shelling out to it, but we create the vendir configs with help from a vendored copy of vendir.
 	"github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec"
-	vendirconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	kyaml "sigs.k8s.io/yaml"
@@ -217,7 +218,7 @@ func (v *Vendir) localRefConf(ref *v1alpha1.AppFetchLocalRef) *vendirconf.Direct
 
 // ConfigBytes fetches all the referenced Secrets & ConfigMaps and returns the
 // multi-document YAML-encoded config that vendir consumes.
-// https://github.com/vmware-tanzu/carvel-vendir/blob/develop/examples/secrets/vendir.yml
+// https://carvel.dev/vendir/blob/develop/examples/secrets/vendir.yml
 func (v *Vendir) ConfigBytes() ([]byte, error) {
 	var resourcesYaml [][]byte
 	for _, dir := range v.config.Directories {

diff --git a/pkg/packageinstall/packageinstall.go b/pkg/packageinstall/packageinstall.go
@@ -8,6 +8,8 @@ import (
 	"fmt"
 	"time"
 
+	"carvel.dev/vendir/pkg/vendir/versions"
+	verv1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
 	"github.com/go-logr/logr"
 	semver "github.com/k14s/semver/v4"
 	"github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1"
@@ -18,8 +20,6 @@ import (
 	kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned"
 	"github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme"
 	"github.com/vmware-tanzu/carvel-kapp-controller/pkg/reconciler"
-	"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions"
-	verv1alpha1 "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/api/errors"

diff --git a/pkg/packageinstall/packageinstall_deletion_test.go b/pkg/packageinstall/packageinstall_deletion_test.go
@@ -6,13 +6,13 @@ package packageinstall
 import (
 	"testing"
 
+	versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
 	"github.com/k14s/semver/v4"
 	"github.com/stretchr/testify/assert"
 	"github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1"
 	pkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1"
 	fakeapiserver "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/fake"
 	fakekappctrl "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/fake"
-	versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"

diff --git a/pkg/packageinstall/packageinstall_downgrade_test.go b/pkg/packageinstall/packageinstall_downgrade_test.go
@@ -6,6 +6,7 @@ package packageinstall
 import (
 	"testing"
 
+	versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
 	"github.com/k14s/semver/v4"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -14,7 +15,6 @@ import (
 	datapkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1"
 	fakeapiserver "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/fake"
 	fakekappctrl "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/fake"
-	versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/version"

diff --git a/pkg/packageinstall/packageinstall_test.go b/pkg/packageinstall/packageinstall_test.go
@@ -8,6 +8,7 @@ import (
 	"reflect"
 	"testing"
 
+	versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
 	"github.com/k14s/semver/v4"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -16,7 +17,6 @@ import (
 	datapkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1"
 	fakeapiserver "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/fake"
 	fakekappctrl "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/fake"
-	versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"

diff --git a/pkg/packageinstall/packageinstall_version_handler.go b/pkg/packageinstall/packageinstall_version_handler.go
@@ -6,12 +6,12 @@ package packageinstall
 import (
 	"context"
 
+	"carvel.dev/vendir/pkg/vendir/versions"
+	verv1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
 	"github.com/go-logr/logr"
 	pkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1"
 	datapkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1"
 	kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned"
-	"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions"
-	verv1alpha1 "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"

diff --git a/pkg/packageinstall/packageinstall_version_handler_test.go b/pkg/packageinstall/packageinstall_version_handler_test.go
@@ -7,12 +7,12 @@ import (
 	"reflect"
 	"testing"
 
+	"carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
 	"github.com/go-logr/logr/testr"
 	pkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1"
 	datapkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1"
 	"github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/fake"
 	pkginstall "github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall"
-	"github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/util/workqueue"

diff --git a/...ub.com/vmware-tanzu/carvel-vendir/LICENSE → vendor/carvel.dev/vendir/LICENSE b/...ub.com/vmware-tanzu/carvel-vendir/LICENSE → vendor/carvel.dev/vendir/LICENSE
diff --git a/...hub.com/vmware-tanzu/carvel-vendir/NOTICE → vendor/carvel.dev/vendir/NOTICE b/...hub.com/vmware-tanzu/carvel-vendir/NOTICE → vendor/carvel.dev/vendir/NOTICE