address comments

kptdev · Nov 16, 2020 · 3c89489 · 3c89489
1 parent c8fc3d2
commit 3c89489
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -19,12 +19,8 @@ require (
 	k8s.io/cli-runtime v0.18.10
 	k8s.io/client-go v0.18.10
 	k8s.io/klog v1.0.0
-	// Currently, we have to import the latest version of kubectl.
-	// Once there is a 0.18 release, we can import a semver release.
 	k8s.io/kubectl v0.18.10
-	sigs.k8s.io/cli-utils v0.21.1
+	sigs.k8s.io/cli-utils v0.22.0
 	sigs.k8s.io/kustomize/cmd/config v0.8.5
 	sigs.k8s.io/kustomize/kyaml v0.9.4
 )
-
-replace sigs.k8s.io/cli-utils => ../../sigs.k8s.io/cli-utils
diff --git a/go.sum b/go.sum
@@ -683,6 +683,8 @@ k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTU
 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
+sigs.k8s.io/cli-utils v0.22.0 h1:IlobQOJxDvPAB2O1AO93Ve6prnTkQ29Z6NZuEao/Vj0=
+sigs.k8s.io/cli-utils v0.22.0/go.mod h1:Mt1gLc/Nfa7Z3Lhbfk72uT2Kc4GNyuX4oMqEN9FbPMs=
 sigs.k8s.io/controller-runtime v0.6.0 h1:Fzna3DY7c4BIP6KwfSlrfnj20DJ+SeMBK8HSFvOk9NM=
 sigs.k8s.io/controller-runtime v0.6.0/go.mod h1:CpYf5pdNY/B352A1TFLAS2JVSlnGQ5O2cftPHndTroo=
 sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=

diff --git a/pkg/live/dual-delegating-loader.go b/pkg/live/dual-delegating-loader.go
@@ -112,7 +112,6 @@ func (cp *DualDelegatingManifestReader) InventoryInfo(objs []*unstructured.Unstr
 	if cmInv != nil {
 		inv = inventory.WrapInventoryInfoObj(cmInv)
 	}
-	//cp.calcInventory = true
 	return inv, objs, nil
 }
 

diff --git a/pkg/live/dual-delegating-provider.go b/pkg/live/dual-delegating-provider.go
@@ -40,11 +40,11 @@ func (cp *DualDelegatingProvider) Factory() util.Factory {
 // after ManifestReader().
 func (cp *DualDelegatingProvider) InventoryClient() (inventory.InventoryClient, error) {
 	return inventory.NewInventoryClient(cp.Factory(),
-		inventroyWrapperFunc,
+		inventoryWrapperFunc,
 		invToUnstructuredFunc)
 }
 
-func inventroyWrapperFunc(obj *unstructured.Unstructured) inventory.Inventory {
+func inventoryWrapperFunc(obj *unstructured.Unstructured) inventory.Inventory {
 	switch obj.GetKind() {
 	case "ResourceGroup":
 		return &InventoryResourceGroup{inv: obj}