Merge pull request #145 from darkowlzz/use-applier

k8s-ci-robot · web-flow · commit e9de8f5672ea · 2021-07-26T07:48:33.000-07:00
Embed Applier interface in kubectlClient interface
diff --git a/pkg/patterns/declarative/pkg/applier/type.go b/pkg/patterns/declarative/pkg/applier/type.go
@@ -5,5 +5,5 @@ import (
 )
 
 type Applier interface {
-	Applyx(ctx context.Context, namespace string, manifest string, validate bool, extraArgs ...string) error
+	Apply(ctx context.Context, namespace string, manifest string, validate bool, extraArgs ...string) error
 }
diff --git a/pkg/patterns/declarative/reconciler.go b/pkg/patterns/declarative/reconciler.go
@@ -65,7 +65,7 @@ type Reconciler struct {
 }
 
 type kubectlClient interface {
-	Apply(ctx context.Context, namespace string, manifest string, validate bool, args ...string) error
+	applier.Applier
 }
 
 type DeclarativeObject interface {

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ import (`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`type Applier interface {`
`8`		`- Applyx(ctx context.Context, namespace string, manifest string, validate bool, extraArgs ...string) error`
	`8`	`+ Apply(ctx context.Context, namespace string, manifest string, validate bool, extraArgs ...string) error`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ type Reconciler struct {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`type kubectlClient interface {`
`68`		`- Apply(ctx context.Context, namespace string, manifest string, validate bool, args ...string) error`
	`68`	`+ applier.Applier`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`type DeclarativeObject interface {`