Merge pull request kubernetes-sigs#101 from SomtochiAma/cli-utils

Uses new apply function so we don't need kubectl

Author: k8s-ci-robot

go.mod

@@ -7,9 +7,11 @@ require (
 	github.com/evanphx/json-patch v4.5.0+incompatible
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
-	k8s.io/api v0.18.2
-	k8s.io/apimachinery v0.18.2
-	k8s.io/client-go v0.18.2
+	k8s.io/api v0.18.4
+	k8s.io/apimachinery v0.18.4
+	k8s.io/cli-runtime v0.18.4
+	k8s.io/client-go v0.18.4
+	k8s.io/kubectl v0.18.4
 	sigs.k8s.io/controller-runtime v0.6.0
 	sigs.k8s.io/kustomize/api v0.3.2
 	sigs.k8s.io/yaml v1.2.0

go.sum

@@ -0,0 +1,58 @@
+package applier
+
+import (
+	"context"
+	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/cli-runtime/pkg/printers"
+	"k8s.io/cli-runtime/pkg/resource"
+	"k8s.io/kubectl/pkg/cmd/apply"
+	cmdDelete "k8s.io/kubectl/pkg/cmd/delete"
+	cmdutil "k8s.io/kubectl/pkg/cmd/util"
+	"os"
+	"strings"
+)
+
+type DirectApplier struct {
+	a apply.ApplyOptions
+}
+
+func NewDirectApplier() *DirectApplier {
+	return &DirectApplier{}
+}
+
+func (d *DirectApplier) Apply(ctx context.Context,
+	namespace string,
+	manifest string,
+	validate bool,
+	extraArgs ...string,
+) error {
+	ioStreams := genericclioptions.IOStreams{
+		In:     os.Stdin,
+		Out:    os.Stdout,
+		ErrOut: os.Stderr,
+	}
+	restClient := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag()
+	ioReader := strings.NewReader(manifest)
+
+	b := resource.NewBuilder(restClient)
+	res := b.Unstructured().Stream(ioReader, "manifestString").Do()
+	infos, err := res.Infos()
+	if err != nil {
+		return err
+	}
+
+	applyOpts := apply.NewApplyOptions(ioStreams)
+	applyOpts.Namespace = namespace
+	applyOpts.SetObjects(infos)
+	applyOpts.ToPrinter = func(operation string) (printers.ResourcePrinter, error) {
+		applyOpts.PrintFlags.NamePrintFlags.Operation = operation
+		cmdutil.PrintFlagsWithDryRunStrategy(applyOpts.PrintFlags, applyOpts.DryRunStrategy)
+		return applyOpts.PrintFlags.ToPrinter()
+	}
+	applyOpts.DeleteOptions = &cmdDelete.DeleteOptions{
+		IOStreams: ioStreams,
+	}
+
+	return applyOpts.Run()
+}
+

pkg/patterns/declarative/pkg/applier/direct.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kubectlcmd
+package applier
 
 import (
 	"bytes"
@@ -28,12 +28,12 @@ import (
 )
 
 // New creates a Client that runs kubectl avaliable on the path with default authentication
-func New() *Client {
-	return &Client{cmdSite: &console{}}
+func NewExec() *ExecKubectl {
+	return &ExecKubectl{cmdSite: &console{}}
 }
 
-// Client provides an interface to kubectl
-type Client struct {
+// ExecKubectl provides an interface to kubectl
+type ExecKubectl struct {
 	cmdSite commandSite
 }
 
@@ -49,7 +49,8 @@ func (console) Run(c *exec.Cmd) error {
 }
 
 // Apply runs the kubectl apply with the provided manifest argument
-func (c *Client) Apply(ctx context.Context, namespace string, manifest string, validate bool, extraArgs ...string) error {
+func (c *ExecKubectl) Apply(ctx context.Context, namespace string, manifest string, validate bool,
+	extraArgs ...string) error {
 	log := log.Log
 
 	log.Info("applying manifest")
@@ -87,3 +88,4 @@ func (c *Client) Apply(ctx context.Context, namespace string, manifest string, v
 
 	return nil
 }
+

pkg/patterns/declarative/pkg/kubectlcmd/client.go renamed to pkg/patterns/declarative/pkg/applier/exec.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kubectlcmd
+package applier
 
 import (
 	"context"
@@ -84,7 +84,7 @@ func TestKubectlApply(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			cs := collector{Error: test.err}
-			kubectl := &Client{cmdSite: &cs}
+			kubectl := &ExecKubectl{cmdSite: &cs}
 			err := kubectl.Apply(context.Background(), test.namespace, test.manifest, test.validate, test.args...)
 
 			if test.err != nil && err == nil {

pkg/patterns/declarative/pkg/kubectlcmd/client_test.go renamed to pkg/patterns/declarative/pkg/applier/exec_test.go

@@ -0,0 +1,9 @@
+package applier
+
+import (
+	"context"
+)
+
+type Applier interface {
+	Applyx(ctx context.Context, namespace string, manifest string, validate bool, extraArgs ...string) error
+}

pkg/patterns/declarative/pkg/applier/type.go

@@ -32,7 +32,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/declarative/pkg/kubectlcmd"
+	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/declarative/pkg/applier"
 	"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/declarative/pkg/manifest"
 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/krusty"
@@ -61,7 +61,7 @@ type DeclarativeObject interface {
 }
 
 // For mocking
-var kubectl = kubectlcmd.New()
+var kubectl = applier.NewDirectApplier()
 
 func (r *Reconciler) Init(mgr manager.Manager, prototype DeclarativeObject, opts ...reconcilerOption) error {
 	r.prototype = prototype