Update cmd/config, kyaml and cli-utils dependencies

kptdev · Sep 24, 2020 · d54fa9f · d54fa9f
1 parent 790e7fb
commit d54fa9f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/commands/livecmd.go b/commands/livecmd.go
@@ -64,7 +64,7 @@ func GetLiveCommand(name string, f util.Factory) *cobra.Command {
 	applyCmd.Long = livedocs.ApplyShort + "\n" + livedocs.ApplyLong
 	applyCmd.Example = livedocs.ApplyExamples
 
-	previewCmd := preview.GetPreviewRunner(f, ioStreams).Command
+	previewCmd := preview.PreviewCommand(f, ioStreams)
 	previewCmd.Short = livedocs.PreviewShort
 	previewCmd.Long = livedocs.PreviewShort + "\n" + livedocs.PreviewLong
 	previewCmd.Example = livedocs.PreviewExamples
@@ -74,7 +74,7 @@ func GetLiveCommand(name string, f util.Factory) *cobra.Command {
 	diffCmd.Long = livedocs.DiffShort + "\n" + livedocs.DiffLong
 	diffCmd.Example = livedocs.DiffExamples
 
-	destroyCmd := destroy.GetDestroyRunner(f, ioStreams).Command
+	destroyCmd := destroy.DestroyCommand(f, ioStreams)
 	destroyCmd.Short = livedocs.DestroyShort
 	destroyCmd.Long = livedocs.DestroyShort + "\n" + livedocs.DestroyLong
 	destroyCmd.Example = livedocs.DestroyExamples

diff --git a/go.mod b/go.mod
@@ -25,7 +25,7 @@ require (
 	// 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.0.0-20191219154910-1528d4eea6dd
-	sigs.k8s.io/cli-utils v0.20.2
-	sigs.k8s.io/kustomize/cmd/config v0.8.2-0.20200922204209-cf38166bd62c
-	sigs.k8s.io/kustomize/kyaml v0.8.2-0.20200922204209-cf38166bd62c
+	sigs.k8s.io/cli-utils v0.20.3-0.20200922200010-e382589cbb02
+	sigs.k8s.io/kustomize/cmd/config v0.8.2-0.20200924195921-3a5951563dec
+	sigs.k8s.io/kustomize/kyaml v0.8.2-0.20200924195921-3a5951563dec
 )
diff --git a/go.sum b/go.sum
@@ -638,6 +638,8 @@ sigs.k8s.io/kustomize/cmd/config v0.8.0 h1:zrLcS03Wk8+azb3cmKuPTkIFBFg9BP0aZ1GYz
 sigs.k8s.io/kustomize/cmd/config v0.8.0/go.mod h1:3vnx3SFRfYrPJfzG8q/fHpCvjjF7ksZSt7t6nNe5qkk=
 sigs.k8s.io/kustomize/cmd/config v0.8.2-0.20200922204209-cf38166bd62c h1:TYKkSYTSPSum0iB/nGf7H9uHWn8sSkJIlRUd7ZllqXc=
 sigs.k8s.io/kustomize/cmd/config v0.8.2-0.20200922204209-cf38166bd62c/go.mod h1:UZ6TTvgftENXmRS3YWgxLkLakI9ilzTdIFyK/usXUyo=
+sigs.k8s.io/kustomize/cmd/config v0.8.2-0.20200924195921-3a5951563dec h1://OdIqwosbLerHd6Zk4/Y+BWSuFjlXmaEUmJU8gxyyM=
+sigs.k8s.io/kustomize/cmd/config v0.8.2-0.20200924195921-3a5951563dec/go.mod h1:PlMvypgZFfP2rQKS5tOpYHnRb35tR1wJo7C+frqudWU=
 sigs.k8s.io/kustomize/kyaml v0.7.1/go.mod h1:ne3F9JPhW2wrVaLslxBsEe6MQJQ9YK5rUutrdhBWXwI=
 sigs.k8s.io/kustomize/kyaml v0.7.2-0.20200903155941-0f49fef5ed58 h1:5Yjha1M1CQfaCl4SlUC/9lPJyQfy9ljgLaY19Ja+wus=
 sigs.k8s.io/kustomize/kyaml v0.7.2-0.20200903155941-0f49fef5ed58/go.mod h1:UTm64bSWVdBUA8EQoYCxVOaBQxUdIOr5LKWxA4GNbkw=
@@ -654,6 +656,8 @@ sigs.k8s.io/kustomize/kyaml v0.8.0/go.mod h1:UTm64bSWVdBUA8EQoYCxVOaBQxUdIOr5LKW
 sigs.k8s.io/kustomize/kyaml v0.8.1/go.mod h1:UTm64bSWVdBUA8EQoYCxVOaBQxUdIOr5LKWxA4GNbkw=
 sigs.k8s.io/kustomize/kyaml v0.8.2-0.20200922204209-cf38166bd62c h1:jvC8RRmfCZ3RzJ71tySDQJYldpPMioCyxw0IYOzd3Xg=
 sigs.k8s.io/kustomize/kyaml v0.8.2-0.20200922204209-cf38166bd62c/go.mod h1:UTm64bSWVdBUA8EQoYCxVOaBQxUdIOr5LKWxA4GNbkw=
+sigs.k8s.io/kustomize/kyaml v0.8.2-0.20200924195921-3a5951563dec h1:Nz39T2Tnj6mRG0Rhfz8YJHxrtMtPTQ1F9roBPUPMles=
+sigs.k8s.io/kustomize/kyaml v0.8.2-0.20200924195921-3a5951563dec/go.mod h1:UTm64bSWVdBUA8EQoYCxVOaBQxUdIOr5LKWxA4GNbkw=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
 sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18=

diff --git a/internal/util/update/resource-merge.go b/internal/util/update/resource-merge.go
@@ -68,6 +68,7 @@ func (u ResourceMergeUpdater) Update(options UpdateOptions) error {
 	}
 
 	err = settersutil.SetAllSetterDefinitions(
+		false,
 		filepath.Join(options.PackagePath, kptfile.KptFileName),
 		original.AbsPath(),
 		updated.AbsPath(),
@@ -206,6 +207,7 @@ func MergeSubPackages(localRoot, updatedRoot, originalRoot string) error {
 			dirsForSettersUpdate = append(dirsForSettersUpdate, originalPkgPath)
 		}
 		err = settersutil.SetAllSetterDefinitions(
+			false,
 			filepath.Join(localPkgPath, kptfile.KptFileName),
 			dirsForSettersUpdate...,
 		)