import vmware-tanzu/carvel-kapp-controller & update k8s dependencies …

…to 0.19.2

go.mod

@@ -3,32 +3,24 @@ module github.com/k14s/kapp
 go 1.16
 
 require (
-	github.com/Azure/go-autorest v10.15.0+incompatible // indirect
 	github.com/cppforlife/cobrautil v0.0.0-20200514214827-bb86e6965d72
 	github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835
 	github.com/cppforlife/go-cli-ui v0.0.0-20200716203538-1e47f820817f
 	github.com/cppforlife/go-patch v0.2.0
 	github.com/ghodss/yaml v1.0.0
-	github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
-	github.com/googleapis/gnostic v0.2.0 // indirect
-	github.com/gophercloud/gophercloud v0.0.0-20180727150635-f8826f28e31a // indirect
-	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
 	github.com/hashicorp/go-version v1.3.0
-	github.com/imdario/mergo v0.3.5 // indirect
 	github.com/k14s/difflib v0.0.0-20200108171459-b101e55e0592
-	github.com/k14s/kapp-controller v0.1.0
 	github.com/mitchellh/go-wordwrap v1.0.1
-	github.com/onsi/ginkgo v1.11.0 // indirect
-	github.com/onsi/gomega v1.7.0 // indirect
-	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
-	github.com/spf13/cobra v1.1.1
+	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
+	github.com/vmware-tanzu/carvel-kapp-controller v0.20.0
 	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect
 	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.2.8
-	k8s.io/api v0.0.0-20180628040859-072894a440bd // kubernetes-1.11.0
-	k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d // kubernetes-1.11.0
-	k8s.io/client-go v8.0.0+incompatible // kubernetes-1.11.0
+	gopkg.in/yaml.v2 v2.4.0
+	k8s.io/api v0.19.2 // kubernetes-1.11.0
+	k8s.io/apimachinery v0.19.2 // kubernetes-1.11.0
+	k8s.io/client-go v0.19.2 // kubernetes-1.11.0
 )
+
+replace github.com/spf13/cobra => github.com/spf13/cobra v1.1.1

pkg/kapp/resourcesmisc/kappctrl_k14s_io_v1alpha1_app.go

@@ -6,8 +6,8 @@ package resourcesmisc
 import (
 	"fmt"
 
-	kcv1alpha1 "github.com/k14s/kapp-controller/pkg/apis/kappctrl/v1alpha1"
 	ctlres "github.com/k14s/kapp/pkg/kapp/resources"
+	kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes/scheme"
 )