kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-30 01:46:23 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Create and document diff package.

Browse Source
This commit is contained in:
Jeffrey Regan
2018-05-31 16:50:34 -07:00
parent 487a6ebee4
commit 49f586af39
10 changed files with 210 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/commands/diff.go
View File

@@ -25,10 +25,9 @@ import (
"github.com/kubernetes-sigs/kustomize/pkg/app"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
"github.com/kubernetes-sigs/kustomize/pkg/diff"
"github.com/kubernetes-sigs/kustomize/pkg/loader"
"github.com/kubernetes-sigs/kustomize/pkg/util"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
"k8s.io/utils/exec"
)
type diffOptions struct {
@@ -68,12 +67,6 @@ func (o *diffOptions) Validate(cmd *cobra.Command, args []string) error {
// RunDiff gets the differences between Application.Resources() and Application.RawResources().
func (o *diffOptions) RunDiff(out, errOut io.Writer, fs fs.FileSystem) error {
printer := util.Printer{}
diff := util.DiffProgram{
Exec: exec.New(),
Stdout: out,
Stderr: errOut,
}
l := loader.Init([]loader.SchemeLoader{loader.NewFileLoader(fs)})
@@ -91,7 +84,7 @@ func (o *diffOptions) RunDiff(out, errOut io.Writer, fs fs.FileSystem) error {
if err != nil {
return err
}
resources, err := application.Resources()
transformedResources, err := application.Resources()
if err != nil {
return err
}
@@ -100,17 +93,5 @@ func (o *diffOptions) RunDiff(out, errOut io.Writer, fs fs.FileSystem) error {
return err
}
transformedDir, err := util.WriteToDir(resources, "transformed", printer)
if err != nil {
return err
}
defer transformedDir.Delete()
noopDir, err := util.WriteToDir(rawResources, "noop", printer)
if err != nil {
return err
}
defer noopDir.Delete()
return diff.Run(noopDir.Name, transformedDir.Name)
return diff.RunDiff(rawResources, transformedResources, out, errOut)
}