Bump imgpkg to version 0.22.0 (carvel-dev#183)

seemiller · Oct 28, 2021 · 8860b56 · 8860b56
1 parent 31d3d56
commit 8860b56
Show file tree

Hide file tree

Showing 17 changed files with 94 additions and 72 deletions.
diff --git a/go.mod b/go.mod
@@ -7,14 +7,11 @@ require (
 	github.com/cppforlife/go-cli-ui v0.0.0-20200716203538-1e47f820817f
 	github.com/google/go-containerregistry v0.6.0
 	github.com/hashicorp/go-version v1.3.0
-	github.com/joefitzgerald/rainbow-reporter v0.1.0 // indirect
-	github.com/k14s/imgpkg v0.20.0
 	github.com/kisielk/errcheck v1.6.0
 	github.com/spf13/cobra v1.2.1
+	github.com/vmware-tanzu/carvel-imgpkg v0.22.0
 	github.com/vmware-tanzu/carvel-vendir v0.22.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	k8s.io/apimachinery v0.22.2
-	k8s.io/code-generator v0.19.7 // indirect
-	k8s.io/gengo v0.0.0-20201113003025-83324d819ded // indirect
 	sigs.k8s.io/yaml v1.3.0
 )
diff --git a/go.sum b/go.sum
diff --git a/pkg/kbld/cmd/resolve.go b/pkg/kbld/cmd/resolve.go
@@ -11,7 +11,6 @@ import (
 	"strings"
 
 	"github.com/cppforlife/go-cli-ui/ui"
-	"github.com/k14s/imgpkg/pkg/imgpkg/lockconfig"
 	ctlconf "github.com/k14s/kbld/pkg/kbld/config"
 	ctlimg "github.com/k14s/kbld/pkg/kbld/image"
 	ctllog "github.com/k14s/kbld/pkg/kbld/logger"
@@ -20,6 +19,7 @@ import (
 	ctlser "github.com/k14s/kbld/pkg/kbld/search"
 	"github.com/k14s/kbld/pkg/kbld/version"
 	"github.com/spf13/cobra"
+	"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig"
 	"sigs.k8s.io/yaml"
 )
 

diff --git a/pkg/kbld/config/conf.go b/pkg/kbld/config/conf.go
@@ -6,8 +6,8 @@ package config
 import (
 	"reflect"
 
-	"github.com/k14s/imgpkg/pkg/imgpkg/lockconfig"
 	ctlres "github.com/k14s/kbld/pkg/kbld/resources"
+	"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig"
 )
 
 type Conf struct {

diff --git a/pkg/kbld/config/config.go b/pkg/kbld/config/config.go
@@ -8,9 +8,9 @@ import (
 	"io/ioutil"
 
 	semver "github.com/hashicorp/go-version"
-	"github.com/k14s/imgpkg/pkg/imgpkg/lockconfig"
 	ctlres "github.com/k14s/kbld/pkg/kbld/resources"
 	"github.com/k14s/kbld/pkg/kbld/version"
+	"github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig"
 	versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1"
 	"sigs.k8s.io/yaml"
 )

diff --git a/vendor/github.com/go-logr/logr/.golangci.yaml b/vendor/github.com/go-logr/logr/.golangci.yaml
diff --git a/vendor/github.com/go-logr/logr/README.md b/vendor/github.com/go-logr/logr/README.md
diff --git a/vendor/github.com/go-logr/logr/logr.go b/vendor/github.com/go-logr/logr/logr.go
diff --git a/vendor/github.com/k14s/imgpkg/LICENSE → ...ub.com/vmware-tanzu/carvel-imgpkg/LICENSE b/vendor/github.com/k14s/imgpkg/LICENSE → ...ub.com/vmware-tanzu/carvel-imgpkg/LICENSE
diff --git a/vendor/github.com/k14s/imgpkg/NOTICE → ...hub.com/vmware-tanzu/carvel-imgpkg/NOTICE b/vendor/github.com/k14s/imgpkg/NOTICE → ...hub.com/vmware-tanzu/carvel-imgpkg/NOTICE
diff --git a/...gpkg/pkg/imgpkg/lockconfig/bundle_lock.go → ...gpkg/pkg/imgpkg/lockconfig/bundle_lock.go b/...gpkg/pkg/imgpkg/lockconfig/bundle_lock.go → ...gpkg/pkg/imgpkg/lockconfig/bundle_lock.go
diff --git a/...s/imgpkg/pkg/imgpkg/lockconfig/generic.go → ...l-imgpkg/pkg/imgpkg/lockconfig/generic.go b/...s/imgpkg/pkg/imgpkg/lockconfig/generic.go → ...l-imgpkg/pkg/imgpkg/lockconfig/generic.go
diff --git a/...gpkg/pkg/imgpkg/lockconfig/images_lock.go → ...gpkg/pkg/imgpkg/lockconfig/images_lock.go b/...gpkg/pkg/imgpkg/lockconfig/images_lock.go → ...gpkg/pkg/imgpkg/lockconfig/images_lock.go
diff --git a/vendor/k8s.io/klog/v2/go.mod b/vendor/k8s.io/klog/v2/go.mod
diff --git a/vendor/k8s.io/klog/v2/go.sum b/vendor/k8s.io/klog/v2/go.sum
diff --git a/vendor/k8s.io/klog/v2/klog.go b/vendor/k8s.io/klog/v2/klog.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -20,7 +20,7 @@ github.com/docker/docker/pkg/homedir
 # github.com/docker/docker-credential-helpers v0.6.3
 github.com/docker/docker-credential-helpers/client
 github.com/docker/docker-credential-helpers/credentials
-# github.com/go-logr/logr v1.1.0
+# github.com/go-logr/logr v1.2.0
 github.com/go-logr/logr
 # github.com/gogo/protobuf v1.3.2
 github.com/gogo/protobuf/proto
@@ -60,9 +60,6 @@ github.com/inconshreveable/mousetrap
 ## explicit
 # github.com/json-iterator/go v1.1.11
 github.com/json-iterator/go
-# github.com/k14s/imgpkg v0.20.0
-## explicit
-github.com/k14s/imgpkg/pkg/imgpkg/lockconfig
 # github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115
 github.com/k14s/semver/v4
 # github.com/kisielk/errcheck v1.6.0
@@ -94,6 +91,9 @@ github.com/spf13/pflag
 # github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec
 github.com/vito/go-interact/interact
 github.com/vito/go-interact/interact/terminal
+# github.com/vmware-tanzu/carvel-imgpkg v0.22.0
+## explicit
+github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig
 # github.com/vmware-tanzu/carvel-vendir v0.22.0
 ## explicit
 github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1
@@ -170,7 +170,7 @@ k8s.io/apimachinery/third_party/forked/golang/reflect
 ## explicit
 # k8s.io/gengo v0.0.0-20201113003025-83324d819ded
 ## explicit
-# k8s.io/klog/v2 v2.20.0
+# k8s.io/klog/v2 v2.30.0
 k8s.io/klog/v2
 # sigs.k8s.io/structured-merge-diff/v4 v4.1.2
 sigs.k8s.io/structured-merge-diff/v4/value