fix: New kube applier for server side diff dry run with refactoring (a…

…rgoproj#662) * fix: New kube applier for server side diff dry run with refactoring Part of a fix for: argoproj/argo-cd#21488 Separate logic to handle server side diff dry run applies. Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> * Break backwards compatibility for a better code Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> * Don't put applier constructor in the interface Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> * Address comments Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> * Address more comments Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> * chore: enable testifylint linter (argoproj#657) Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com> Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> * chore: enable gofumpt, gosimple and whitespace linters (argoproj#666) Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com> Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> * chore: enable use-any from revive (argoproj#667) Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com> Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> * chore: bump golangci-lint to v1.63.4 and list argo-cd linters (argoproj#670) Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com> Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> * chore: enable unused-parameter and var-declaration from revive (argoproj#668) Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com> Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> * chore: remove actions/cache duplicated behavior with actions/setup-go (argoproj#658) Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com> Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> * Add Leo's code Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> * Make linter happy Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> --------- Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com> Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com> Co-authored-by: Matthieu MOREL <matthieu.morel35@gmail.com> Signed-off-by: Aaron Hoffman <31711338+Aaron-9900@users.noreply.github.com>
Aaron-9900 · Feb 12, 2025 · 263c4c0 · 263c4c0
1 parent 605e88d
commit 263c4c0
Show file tree

Hide file tree

Showing 5 changed files with 210 additions and 76 deletions.
diff --git a/pkg/diff/diff_options.go b/pkg/diff/diff_options.go
@@ -40,7 +40,7 @@ func applyOptions(opts []Option) options {
 }
 
 type KubeApplier interface {
-	ApplyResource(ctx context.Context, obj *unstructured.Unstructured, dryRunStrategy cmdutil.DryRunStrategy, force, validate, serverSideApply bool, manager string, serverSideDiff bool) (string, error)
+	ApplyResource(ctx context.Context, obj *unstructured.Unstructured, dryRunStrategy cmdutil.DryRunStrategy, force, validate, serverSideApply bool, manager string) (string, error)
 }
 
 // ServerSideDryRunner defines the contract to run a server-side apply in
@@ -66,7 +66,7 @@ func NewK8sServerSideDryRunner(kubeApplier KubeApplier) *K8sServerSideDryRunner
 // obj and the given manager in dryrun mode. Will return the predicted live state
 // json as string.
 func (kdr *K8sServerSideDryRunner) Run(ctx context.Context, obj *unstructured.Unstructured, manager string) (string, error) {
-	return kdr.dryrunApplier.ApplyResource(ctx, obj, cmdutil.DryRunServer, false, false, true, manager, true)
+	return kdr.dryrunApplier.ApplyResource(ctx, obj, cmdutil.DryRunServer, false, false, true, manager)
 }
 
 func IgnoreAggregatedRoles(ignore bool) Option {

diff --git a/pkg/sync/sync_context.go b/pkg/sync/sync_context.go
@@ -1001,7 +1001,7 @@ func (sc *syncContext) applyObject(t *syncTask, dryRun, validate bool) (common.R
 			message, err = sc.resourceOps.CreateResource(context.TODO(), t.targetObj, dryRunStrategy, validate)
 		}
 	} else {
-		message, err = sc.resourceOps.ApplyResource(context.TODO(), t.targetObj, dryRunStrategy, force, validate, serverSideApply, sc.serverSideApplyManager, false)
+		message, err = sc.resourceOps.ApplyResource(context.TODO(), t.targetObj, dryRunStrategy, force, validate, serverSideApply, sc.serverSideApplyManager)
 	}
 	if err != nil {
 		return common.ResultCodeSyncFailed, err.Error()

diff --git a/pkg/utils/kube/ctl.go b/pkg/utils/kube/ctl.go
@@ -19,6 +19,7 @@ import (
 	"k8s.io/kube-openapi/pkg/util/proto"
 	"k8s.io/kubectl/pkg/util/openapi"
 
+	"github.com/argoproj/gitops-engine/pkg/diff"
 	utils "github.com/argoproj/gitops-engine/pkg/utils/io"
 	"github.com/argoproj/gitops-engine/pkg/utils/tracing"
 )
@@ -295,6 +296,31 @@ func (k *KubectlCmd) ManageResources(config *rest.Config, openAPISchema openapi.
 	}, cleanup, nil
 }
 
+func ManageServerSideDiffDryRuns(config *rest.Config, openAPISchema openapi.Resources, tracer tracing.Tracer, log logr.Logger, onKubectlRun OnKubectlRunFunc) (diff.KubeApplier, func(), error) {
+	f, err := os.CreateTemp(utils.TempDir, "")
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to generate temp file for kubeconfig: %v", err)
+	}
+	_ = f.Close()
+	err = WriteKubeConfig(config, "", f.Name())
+	if err != nil {
+		utils.DeleteFile(f.Name())
+		return nil, nil, fmt.Errorf("failed to write kubeconfig: %v", err)
+	}
+	fact := kubeCmdFactory(f.Name(), "", config)
+	cleanup := func() {
+		utils.DeleteFile(f.Name())
+	}
+	return &kubectlServerSideDiffDryRunApplier{
+		config:        config,
+		fact:          fact,
+		openAPISchema: openAPISchema,
+		tracer:        tracer,
+		log:           log,
+		onKubectlRun:  onKubectlRun,
+	}, cleanup, nil
+}
+
 // ConvertToVersion converts an unstructured object into the specified group/version
 func (k *KubectlCmd) ConvertToVersion(obj *unstructured.Unstructured, group string, version string) (*unstructured.Unstructured, error) {
 	span := k.Tracer.StartSpan("ConvertToVersion")

diff --git a/pkg/utils/kube/kubetest/mock_resource_operations.go b/pkg/utils/kube/kubetest/mock_resource_operations.go
@@ -106,7 +106,7 @@ func (r *MockResourceOps) GetLastResourceCommand(key kube.ResourceKey) string {
 	return r.lastCommandPerResource[key]
 }
 
-func (r *MockResourceOps) ApplyResource(_ context.Context, obj *unstructured.Unstructured, _ cmdutil.DryRunStrategy, force, validate, serverSideApply bool, manager string, _ bool) (string, error) {
+func (r *MockResourceOps) ApplyResource(_ context.Context, obj *unstructured.Unstructured, _ cmdutil.DryRunStrategy, force, validate, serverSideApply bool, manager string) (string, error) {
 	r.SetLastValidate(validate)
 	r.SetLastServerSideApply(serverSideApply)
 	r.SetLastServerSideApplyManager(manager)