Support for server side apply

pkg/kapp/clusterapply/add_or_update_change.go

@@ -4,7 +4,9 @@
 package clusterapply
 
 import (
+	"context"
 	"fmt"
+	"k8s.io/apimachinery/pkg/types"
 	"time"
 
 	ctldiff "github.com/k14s/kapp/pkg/kapp/diff"
@@ -26,7 +28,9 @@ const (
 )
 
 type AddOrUpdateChangeOpts struct {
-	DefaultUpdateStrategy string
+	DefaultUpdateStrategy   string
+	ServerSideApply         bool
+	ServerSideForceConflict bool
 }
 
 type AddOrUpdateChange struct {
@@ -131,7 +135,7 @@ func (c AddOrUpdateChange) tryToResolveUpdateConflict(
 		changeSet := c.changeSetFactory.New([]ctlres.Resource{latestExistingRes},
 			[]ctlres.Resource{c.change.AppliedResource()})
 
-		recalcChanges, err := changeSet.Calculate()
+		recalcChanges, err := changeSet.Calculate(context.TODO())
 		if err != nil {
 			return err
 		}
@@ -172,7 +176,7 @@ func (c AddOrUpdateChange) tryToUpdateAfterCreateConflict() error {
 		changeSet := c.changeSetFactory.New([]ctlres.Resource{latestExistingRes},
 			[]ctlres.Resource{c.change.AppliedResource()})
 
-		recalcChanges, err := changeSet.Calculate()
+		recalcChanges, err := changeSet.Calculate(context.TODO())
 		if err != nil {
 			return err
 		}
@@ -295,7 +299,17 @@ type UpdatePlainStrategy struct {
 func (c UpdatePlainStrategy) Op() ClusterChangeApplyStrategyOp { return updateStrategyPlainAnnValue }
 
 func (c UpdatePlainStrategy) Apply() error {
-	updatedRes, err := c.aou.identifiedResources.Update(c.newRes)
+	var updatedRes ctlres.Resource
+	var err error
+
+	if c.aou.opts.ServerSideApply {
+		updatedRes, err = ctlres.WithIdentityAnnotation(c.newRes, func(r ctlres.Resource) (ctlres.Resource, error) {
+			resBytes, _ := r.AsYAMLBytes()
+			return c.aou.identifiedResources.Patch(r, types.ApplyPatchType, resBytes)
+		})
+	} else {
+		updatedRes, err = c.aou.identifiedResources.Update(c.newRes)
+	}
 	if err != nil {
 		if errors.IsConflict(err) {
 			return c.aou.tryToResolveUpdateConflict(err, func(err error) error { return err })
@@ -323,8 +337,20 @@ func (c UpdateOrFallbackOnReplaceStrategy) Apply() error {
 		return err
 	}
 
-	updatedRes, err := c.aou.identifiedResources.Update(c.newRes)
+	var updatedRes ctlres.Resource
+	var err error
+
+	if c.aou.opts.ServerSideApply {
+		updatedRes, err = ctlres.WithIdentityAnnotation(c.newRes, func(r ctlres.Resource) (ctlres.Resource, error) {
+			resBytes, _ := r.AsYAMLBytes()
+			return c.aou.identifiedResources.Patch(r, types.ApplyPatchType, resBytes)
+		})
+	} else {
+		updatedRes, err = c.aou.identifiedResources.Update(c.newRes)
+	}
+
 	if err != nil {
+		//TODO: find out if SSA conflicts worth retrying
 		if errors.IsConflict(err) {
 			return c.aou.tryToResolveUpdateConflict(err, replaceIfIsInvalidErrFunc)
 		}

pkg/kapp/cmd/app/apply_flags.go

@@ -32,6 +32,8 @@ type ApplyFlags struct {
 	ctlcap.ClusterChangeSetOpts
 	ctlcap.ClusterChangeOpts
 
+	FieldManagerName string
+
 	ExitStatus bool
 }
 
@@ -62,6 +64,10 @@ func (s *ApplyFlags) SetWithDefaults(prefix string, defaults ApplyFlags, cmd *co
 	cmd.Flags().IntVar(&s.WaitingChangesOpts.Concurrency, prefix+"wait-concurrency",
 		5, "Maximum number of concurrent wait operations")
 
+	cmd.Flags().BoolVar(&s.ServerSideApply, prefix+"server-side", false, "If true, apply runs in the server instead of the client")
+	cmd.Flags().StringVar(&s.FieldManagerName, prefix+"field-manager", "kapp-server-side-apply", "Name of the manager used to track field ownership")
+	cmd.Flags().BoolVar(&s.ServerSideForceConflict, prefix+"force-conflicts", false, "If true, server-side apply will force the changes against conflicts.")
+
 	cmd.Flags().BoolVar(&s.ExitStatus, prefix+"apply-exit-status", false, "Return specific exit status based on number of changes")
 }
 

pkg/kapp/cmd/app/delete.go

@@ -59,7 +59,7 @@ func NewDeleteCmd(o *DeleteOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Co
 func (o *DeleteOptions) Run() error {
 	failingAPIServicesPolicy := o.ResourceTypesFlags.FailingAPIServicePolicy()
 
-	app, supportObjs, err := Factory(o.depsFactory, o.AppFlags, o.ResourceTypesFlags, o.logger)
+	app, supportObjs, err := Factory(o.depsFactory, o.AppFlags, o.ResourceTypesFlags, o.logger, &o.ApplyFlags.FieldManagerName)
 	if err != nil {
 		return err
 	}
@@ -189,10 +189,10 @@ func (o *DeleteOptions) calculateAndPresentChanges(existingResources []ctlres.Re
 	)
 
 	{ // Figure out changes for X existing resources -> 0 new resources
-		changeFactory := ctldiff.NewChangeFactory(nil, nil)
+		changeFactory := ctldiff.NewChangeFactory(nil, nil, supportObjs.Resources)
 		changeSetFactory := ctldiff.NewChangeSetFactory(o.DiffFlags.ChangeSetOpts, changeFactory)
 
-		changes, err := changeSetFactory.New(existingResources, nil).Calculate()
+		changes, err := changeSetFactory.New(existingResources, nil).Calculate(nil)
 		if err != nil {
 			return ctlcap.ClusterChangeSet{}, nil, changesSummary{}, err
 		}

pkg/kapp/cmd/app/deploy.go

@@ -4,6 +4,7 @@
 package app
 
 import (
+	"context"
 	"fmt"
 	"sort"
 	"strings"
@@ -51,7 +52,12 @@ func NewDeployCmd(o *DeployOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Co
 		Use:     "deploy",
 		Aliases: []string{"d", "dep"},
 		Short:   "Deploy app",
-		RunE:    func(_ *cobra.Command, _ []string) error { return o.Run() },
+		RunE: func(_ *cobra.Command, _ []string) error {
+			if o.ApplyFlags.ServerSideApply {
+				o.DiffFlags.ChangeSetOpts.Mode = ctldiff.ServerSideApplyChangeSetMode
+			}
+			return o.Run()
+		},
 		Annotations: map[string]string{
 			cmdcore.AppHelpGroup.Key: cmdcore.AppHelpGroup.Value,
 		},
@@ -72,9 +78,10 @@ func NewDeployCmd(o *DeployOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Co
 
 	o.AppFlags.Set(cmd, flagsFactory)
 	o.FileFlags.Set(cmd)
-	o.DiffFlags.SetWithPrefix("diff", cmd)
 	o.ResourceFilterFlags.Set(cmd)
 	o.ApplyFlags.SetWithDefaults("", ApplyFlagsDeployDefaults, cmd)
+	o.DiffFlags.SetWithPrefix("diff", cmd)
+
 	o.DeployFlags.Set(cmd)
 	o.ResourceTypesFlags.Set(cmd)
 	o.LabelFlags.Set(cmd)
@@ -83,9 +90,11 @@ func NewDeployCmd(o *DeployOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Co
 }
 
 func (o *DeployOptions) Run() error {
+	ctx := context.Background()
+
 	failingAPIServicesPolicy := o.ResourceTypesFlags.FailingAPIServicePolicy()
 
-	app, supportObjs, err := Factory(o.depsFactory, o.AppFlags, o.ResourceTypesFlags, o.logger)
+	app, supportObjs, err := Factory(o.depsFactory, o.AppFlags, o.ResourceTypesFlags, o.logger, &o.ApplyFlags.FieldManagerName)
 	if err != nil {
 		return err
 	}
@@ -140,7 +149,7 @@ func (o *DeployOptions) Run() error {
 	}
 
 	clusterChangeSet, clusterChangesGraph, hasNoChanges, changeSummary, err :=
-		o.calculateAndPresentChanges(existingResources, newResources, conf, supportObjs)
+		o.calculateAndPresentChanges(ctx, existingResources, newResources, conf, supportObjs)
 	if err != nil {
 		if o.DiffFlags.UI && clusterChangesGraph != nil {
 			return o.presentDiffUI(clusterChangesGraph)
@@ -315,19 +324,19 @@ func (o *DeployOptions) existingResources(newResources []ctlres.Resource,
 	return resourceFilter.Apply(existingResources), o.existingPodResources(existingResources), nil
 }
 
-func (o *DeployOptions) calculateAndPresentChanges(existingResources,
+func (o *DeployOptions) calculateAndPresentChanges(ctx context.Context, existingResources,
 	newResources []ctlres.Resource, conf ctlconf.Conf, supportObjs FactorySupportObjs) (
 	ctlcap.ClusterChangeSet, *ctldgraph.ChangeGraph, bool, string, error) {
 
 	var clusterChangeSet ctlcap.ClusterChangeSet
 
 	{ // Figure out changes for X existing resources -> X new resources
-		changeFactory := ctldiff.NewChangeFactory(conf.RebaseMods(), conf.DiffAgainstLastAppliedFieldExclusionMods())
+		changeFactory := ctldiff.NewChangeFactory(conf.RebaseMods(), conf.DiffAgainstLastAppliedFieldExclusionMods(), supportObjs.Resources)
 		changeSetFactory := ctldiff.NewChangeSetFactory(o.DiffFlags.ChangeSetOpts, changeFactory)
 
 		changes, err := ctldiff.NewChangeSetWithVersionedRs(
 			existingResources, newResources, conf.TemplateRules(),
-			o.DiffFlags.ChangeSetOpts, changeFactory).Calculate()
+			o.DiffFlags.ChangeSetOpts, changeFactory).Calculate(ctx)
 		if err != nil {
 			return clusterChangeSet, nil, false, "", err
 		}

pkg/kapp/cmd/app/factory.go

@@ -15,11 +15,12 @@ type FactorySupportObjs struct {
 	CoreClient          kubernetes.Interface
 	ResourceTypes       *ctlres.ResourceTypesImpl
 	IdentifiedResources ctlres.IdentifiedResources
+	Resources           ctlres.Resources
 	Apps                ctlapp.Apps
 }
 
 func FactoryClients(depsFactory cmdcore.DepsFactory, nsFlags cmdcore.NamespaceFlags,
-	resTypesFlags ResourceTypesFlags, logger logger.Logger) (FactorySupportObjs, error) {
+	resTypesFlags ResourceTypesFlags, logger logger.Logger, fieldManagerName *string) (FactorySupportObjs, error) {
 
 	coreClient, err := depsFactory.CoreClient()
 	if err != nil {
@@ -44,6 +45,7 @@ func FactoryClients(depsFactory cmdcore.DepsFactory, nsFlags cmdcore.NamespaceFl
 	resourcesImplOpts := ctlres.ResourcesImplOpts{
 		FallbackAllowedNamespaces:        []string{nsFlags.Name},
 		ScopeToFallbackAllowedNamespaces: resTypesFlags.ScopeToFallbackAllowedNamespaces,
+		FieldManagerName:                 fieldManagerName,
 	}
 
 	resources := ctlres.NewResourcesImpl(
@@ -56,16 +58,17 @@ func FactoryClients(depsFactory cmdcore.DepsFactory, nsFlags cmdcore.NamespaceFl
 		CoreClient:          coreClient,
 		ResourceTypes:       resTypes,
 		IdentifiedResources: identifiedResources,
+		Resources:           resources,
 		Apps:                ctlapp.NewApps(nsFlags.Name, coreClient, identifiedResources, logger),
 	}
 
 	return result, nil
 }
 
 func Factory(depsFactory cmdcore.DepsFactory, appFlags Flags,
-	resTypesFlags ResourceTypesFlags, logger logger.Logger) (ctlapp.App, FactorySupportObjs, error) {
+	resTypesFlags ResourceTypesFlags, logger logger.Logger, fieldManagerName *string) (ctlapp.App, FactorySupportObjs, error) {
 
-	supportingObjs, err := FactoryClients(depsFactory, appFlags.NamespaceFlags, resTypesFlags, logger)
+	supportingObjs, err := FactoryClients(depsFactory, appFlags.NamespaceFlags, resTypesFlags, logger, fieldManagerName)
 	if err != nil {
 		return nil, FactorySupportObjs{}, err
 	}

pkg/kapp/cmd/app/inspect.go

@@ -56,7 +56,7 @@ func NewInspectCmd(o *InspectOptions, flagsFactory cmdcore.FlagsFactory) *cobra.
 func (o *InspectOptions) Run() error {
 	failingAPIServicesPolicy := o.ResourceTypesFlags.FailingAPIServicePolicy()
 
-	app, supportObjs, err := Factory(o.depsFactory, o.AppFlags, o.ResourceTypesFlags, o.logger)
+	app, supportObjs, err := Factory(o.depsFactory, o.AppFlags, o.ResourceTypesFlags, o.logger, nil)
 	if err != nil {
 		return err
 	}

pkg/kapp/cmd/app/label.go

@@ -36,7 +36,7 @@ func NewLabelCmd(o *LabelOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Comm
 }
 
 func (o *LabelOptions) Run() error {
-	app, _, err := Factory(o.depsFactory, o.AppFlags, ResourceTypesFlags{}, o.logger)
+	app, _, err := Factory(o.depsFactory, o.AppFlags, ResourceTypesFlags{}, o.logger, nil)
 	if err != nil {
 		return err
 	}

pkg/kapp/cmd/app/list.go

@@ -53,7 +53,7 @@ func (o *ListOptions) Run() error {
 		nsHeader.Hidden = false
 	}
 
-	supportObjs, err := FactoryClients(o.depsFactory, o.NamespaceFlags, ResourceTypesFlags{}, o.logger)
+	supportObjs, err := FactoryClients(o.depsFactory, o.NamespaceFlags, ResourceTypesFlags{}, o.logger, nil)
 	if err != nil {
 		return err
 	}

pkg/kapp/cmd/app/logs.go

@@ -54,7 +54,7 @@ func (o *LogsOptions) Run() error {
 		return err
 	}
 
-	app, supportObjs, err := Factory(o.depsFactory, o.AppFlags, ResourceTypesFlags{}, o.logger)
+	app, supportObjs, err := Factory(o.depsFactory, o.AppFlags, ResourceTypesFlags{}, o.logger, nil)
 	if err != nil {
 		return err
 	}

pkg/kapp/cmd/app/rename.go

@@ -42,7 +42,7 @@ func NewRenameCmd(o *RenameOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Co
 }
 
 func (o *RenameOptions) Run() error {
-	app, _, err := Factory(o.depsFactory, o.AppFlags, ResourceTypesFlags{}, o.logger)
+	app, _, err := Factory(o.depsFactory, o.AppFlags, ResourceTypesFlags{}, o.logger, nil)
 	if err != nil {
 		return err
 	}

pkg/kapp/cmd/appchange/gc.go

@@ -38,7 +38,7 @@ func NewGCCmd(o *GCOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Command {
 }
 
 func (o *GCOptions) Run() error {
-	app, _, err := cmdapp.Factory(o.depsFactory, o.AppFlags, cmdapp.ResourceTypesFlags{}, o.logger)
+	app, _, err := cmdapp.Factory(o.depsFactory, o.AppFlags, cmdapp.ResourceTypesFlags{}, o.logger, nil)
 	if err != nil {
 		return err
 	}

pkg/kapp/cmd/appchange/list.go

@@ -39,7 +39,7 @@ func NewListCmd(o *ListOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Comman
 }
 
 func (o *ListOptions) Run() error {
-	app, _, err := cmdapp.Factory(o.depsFactory, o.AppFlags, cmdapp.ResourceTypesFlags{}, o.logger)
+	app, _, err := cmdapp.Factory(o.depsFactory, o.AppFlags, cmdapp.ResourceTypesFlags{}, o.logger, nil)
 	if err != nil {
 		return err
 	}

pkg/kapp/cmd/appgroup/delete.go

@@ -54,7 +54,7 @@ func (o *DeleteOptions) Run() error {
 		return fmt.Errorf("Expected group name to be non-empty")
 	}
 
-	supportObjs, err := cmdapp.FactoryClients(o.depsFactory, o.AppGroupFlags.NamespaceFlags, cmdapp.ResourceTypesFlags{}, o.logger)
+	supportObjs, err := cmdapp.FactoryClients(o.depsFactory, o.AppGroupFlags.NamespaceFlags, cmdapp.ResourceTypesFlags{}, o.logger, nil)
 	if err != nil {
 		return err
 	}

pkg/kapp/cmd/appgroup/deploy.go

@@ -82,7 +82,7 @@ func (o *DeployOptions) Run() error {
 		}
 	}
 
-	supportObjs, err := cmdapp.FactoryClients(o.depsFactory, o.AppGroupFlags.NamespaceFlags, cmdapp.ResourceTypesFlags{}, o.logger)
+	supportObjs, err := cmdapp.FactoryClients(o.depsFactory, o.AppGroupFlags.NamespaceFlags, cmdapp.ResourceTypesFlags{}, o.logger, &o.AppFlags.ApplyFlags.FieldManagerName)
 	if err != nil {
 		return err
 	}

pkg/kapp/cmd/configmap/list.go

@@ -38,7 +38,7 @@ func NewListCmd(o *ListOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Comman
 }
 
 func (o *ListOptions) Run() error {
-	app, supportObjs, err := cmdapp.Factory(o.depsFactory, o.AppFlags, cmdapp.ResourceTypesFlags{}, o.logger)
+	app, supportObjs, err := cmdapp.Factory(o.depsFactory, o.AppFlags, cmdapp.ResourceTypesFlags{}, o.logger, nil)
 	if err != nil {
 		return err
 	}

pkg/kapp/cmd/serviceaccount/list.go

@@ -37,7 +37,7 @@ func NewListCmd(o *ListOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Comman
 }
 
 func (o *ListOptions) Run() error {
-	app, supportObjs, err := cmdapp.Factory(o.depsFactory, o.AppFlags, cmdapp.ResourceTypesFlags{}, o.logger)
+	app, supportObjs, err := cmdapp.Factory(o.depsFactory, o.AppFlags, cmdapp.ResourceTypesFlags{}, o.logger, nil)
 	if err != nil {
 		return err
 	}

pkg/kapp/cmd/tools/diff.go

@@ -4,6 +4,7 @@
 package tools
 
 import (
+	"context"
 	"github.com/cppforlife/go-cli-ui/ui"
 	ctlcap "github.com/k14s/kapp/pkg/kapp/clusterapply"
 	cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core"
@@ -33,11 +34,15 @@ func NewDiffCmd(o *DiffOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Comman
 	}
 	o.FileFlags.Set(cmd)
 	o.FileFlags2.Set(cmd)
+
+	//TODO: support for the server side apply in diff command
 	o.DiffFlags.SetWithPrefix("", cmd)
 	return cmd
 }
 
 func (o *DiffOptions) Run() error {
+	ctx := context.Background()
+
 	newResources, err := o.fileResources(o.FileFlags.Files)
 	if err != nil {
 		return err
@@ -48,9 +53,9 @@ func (o *DiffOptions) Run() error {
 		return err
 	}
 
-	changeFactory := ctldiff.NewChangeFactory(nil, nil)
+	changeFactory := ctldiff.NewChangeFactory(nil, nil, nil)
 
-	changes, err := ctldiff.NewChangeSet(existingResources, newResources, o.DiffFlags.ChangeSetOpts, changeFactory).Calculate()
+	changes, err := ctldiff.NewChangeSet(existingResources, newResources, o.DiffFlags.ChangeSetOpts, changeFactory).Calculate(ctx)
 	if err != nil {
 		return err
 	}

pkg/kapp/cmd/tools/diff_flags.go

@@ -35,7 +35,11 @@ func (s *DiffFlags) SetWithPrefix(prefix string, cmd *cobra.Command) {
 	cmd.Flags().BoolVar(&s.LineNumbers, prefix+"line-numbers", true, "Show line numbers")
 	cmd.Flags().BoolVar(&s.Mask, prefix+"mask", true, "Apply masking rules")
 
-	cmd.Flags().BoolVar(&s.AgainstLastApplied, prefix+"against-last-applied", true, "Show changes against last applied copy when possible")
+	if *cmd.Flags().Bool(prefix+"against-last-applied", true, "Show changes against last applied copy when possible. (Conflicts with server-side apply)") {
+		s.ChangeSetOpts.Mode = ctldiff.AgainstLastAppliedChangeSetMode
+	} else {
+		s.ChangeSetOpts.Mode = ctldiff.ExactChangeSetMode
+	}
 
 	cmd.Flags().StringVar(&s.Filter, prefix+"filter", "", `Set changes filter (example: {"and":[{"ops":["update"]},{"existingResource":{"kinds":["Deployment"]}]})`)
 }