run goimports

Author: stephanhorsthemke

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

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"strings"
+
 	"k8s.io/kubectl/pkg/util/prune"
 
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -21,7 +22,6 @@ import (
 	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 )
 
-
 type DirectApplier struct {
 	inner directApplierSite
 }
@@ -132,13 +132,12 @@ func (d *DirectApplier) Apply(ctx context.Context, opt ApplierOptions) error {
 		IOStreams:           ioStreams,
 		FieldManager:        "kubectl-client-side-apply",
 		ValidationDirective: metav1.FieldValidationStrict,
-		Mapper: 			 opt.RESTMapper,
-		DynamicClient:		 dynamicClient,
+		Mapper:              opt.RESTMapper,
+		DynamicClient:       dynamicClient,
 	}
 	// TODO this will add the print part at all times.
 	applyOpts.PostProcessorFn = applyOpts.PrintAndPrunePostProcessor()
 
-
 	whiteListResources := []string{}
 	for i, arg := range opt.ExtraArgs {
 		switch arg {
@@ -165,10 +164,9 @@ func (d *DirectApplier) Apply(ctx context.Context, opt ApplierOptions) error {
 		if err != nil {
 			return err
 		}
-		applyOpts.PruneResources = append(applyOpts.PruneResources, r...)	
+		applyOpts.PruneResources = append(applyOpts.PruneResources, r...)
 	}
 
-
 	applyOpts.ForceConflicts = opt.Force
 	applyOpts.Namespace = opt.Namespace
 	applyOpts.SetObjects(infos)
@@ -178,7 +176,7 @@ func (d *DirectApplier) Apply(ctx context.Context, opt ApplierOptions) error {
 		return applyOpts.PrintFlags.ToPrinter()
 	}
 	applyOpts.DeleteOptions = &cmdDelete.DeleteOptions{
-		IOStreams: ioStreams,
+		IOStreams:         ioStreams,
 		CascadingStrategy: opt.CascadingStrategy,
 	}
 

pkg/patterns/declarative/pkg/applier/direct_test.go

@@ -152,33 +152,33 @@ metadata:
 				return nil
 			},
 		},
-				{
-					name:      "manifest with prune, prune-whitelist and selector",
-					namespace: "",
-					manifest: `---
+		{
+			name:      "manifest with prune, prune-whitelist and selector",
+			namespace: "",
+			manifest: `---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: foo-operator
   namespace: kube-system`,
-					args: []string{"--prune", "--selector", "label=true", "--prune-whitelist", "core/v1/Namespace", "--prune-whitelist", "core/v1/Service"},
-					// TODO is this used somewhere?
-					expectApplyOptions: &apply.ApplyOptions{
-						Prune: true,
-					},
-					expectCheckFunc: func(opt *apply.ApplyOptions) error {
-						if opt.Prune != true {
-							return fmt.Errorf("prune is not set")
-						}
-						if len(opt.PruneResources) != 2 {
-							return fmt.Errorf("prune resources are not set correctly, found %s", opt.PruneResources)
-						}
-						if opt.Selector != "label=true" {
-							return fmt.Errorf("selector is not set as expected, found %s", opt.Selector)
-						}
-						return nil
-					},
-				},
+			args: []string{"--prune", "--selector", "label=true", "--prune-whitelist", "core/v1/Namespace", "--prune-whitelist", "core/v1/Service"},
+			// TODO is this used somewhere?
+			expectApplyOptions: &apply.ApplyOptions{
+				Prune: true,
+			},
+			expectCheckFunc: func(opt *apply.ApplyOptions) error {
+				if opt.Prune != true {
+					return fmt.Errorf("prune is not set")
+				}
+				if len(opt.PruneResources) != 2 {
+					return fmt.Errorf("prune resources are not set correctly, found %s", opt.PruneResources)
+				}
+				if opt.Selector != "label=true" {
+					return fmt.Errorf("selector is not set as expected, found %s", opt.Selector)
+				}
+				return nil
+			},
+		},
 	}
 
 	for _, test := range tests {

pkg/patterns/declarative/pkg/applier/exec.go

@@ -136,8 +136,6 @@ func (c *ExecKubectl) Apply(ctx context.Context, opt ApplierOptions) error {
 		args = append(args, "--force")
 	}
 
-	
-
 	args = append(args, opt.ExtraArgs...)
 	args = append(args, "-f", "-")
 

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

@@ -23,8 +23,8 @@ type ApplierOptions struct {
 	CascadingStrategy metav1.DeletionPropagation
 
 	PruneWhitelist []string
-	Prune bool
-	
+	Prune          bool
+
 	// Force is set if we should "force" the apply.
 	// For server-side-apply, this corresponds to setting the force option, which ensures we take ownership
 	// even when another field manager owns a field.

pkg/patterns/declarative/reconciler.go

@@ -303,15 +303,15 @@ func (r *Reconciler) reconcileExists(ctx context.Context, name types.NamespacedN
 	}
 
 	applierOpt := applier.ApplierOptions{
-		RESTConfig: 		r.config,
-		RESTMapper: 		r.restMapper,
-		Namespace:  		ns,
-		Manifest:   		manifestStr,
-		Validate:   		r.options.validate,
-		ExtraArgs:  		extraArgs,
-		Force:      		true,
+		RESTConfig: r.config,
+		RESTMapper: r.restMapper,
+		Namespace:  ns,
+		Manifest:   manifestStr,
+		Validate:   r.options.validate,
+		ExtraArgs:  extraArgs,
+		Force:      true,
 		// TODO Make this configurable
-		CascadingStrategy: 	"Foreground",		
+		CascadingStrategy: "Foreground",
 	}
 
 	applier := r.options.applier