Use server-side apply for e2e CreateOrUpdate

Author: nojnhuh

test/e2e/clusterctl_upgrade.go

@@ -454,7 +454,7 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg
 		// Applying the cluster template in dry-run to ensure mgmt cluster webhooks are up and available
 		log.Logf("Applying the cluster template yaml to the cluster in dry-run")
 		Eventually(func() error {
-			return managementClusterProxy.CreateOrUpdate(ctx, workloadClusterTemplate, framework.WithCreateOpts([]client.CreateOption{client.DryRunAll}...), framework.WithUpdateOpts([]client.UpdateOption{client.DryRunAll}...))
+			return managementClusterProxy.CreateOrUpdate(ctx, workloadClusterTemplate, framework.WithPatchOpts([]client.PatchOption{client.DryRunAll}...))
 		}, "1m", "10s").ShouldNot(HaveOccurred())
 
 		log.Logf("Applying the cluster template yaml to the cluster")

test/framework/cluster_proxy.go

@@ -30,11 +30,8 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
@@ -108,8 +105,7 @@ type ClusterProxy interface {
 // createOrUpdateConfig contains options for use with CreateOrUpdate.
 type createOrUpdateConfig struct {
 	labelSelector labels.Selector
-	createOpts    []client.CreateOption
-	updateOpts    []client.UpdateOption
+	patchOpts     []client.PatchOption
 }
 
 // CreateOrUpdateOption is a configuration option supplied to CreateOrUpdate.
@@ -122,17 +118,10 @@ func WithLabelSelector(labelSelector labels.Selector) CreateOrUpdateOption {
 	}
 }
 
-// WithCreateOpts allows definition of the Create options to be used in resource Create.
-func WithCreateOpts(createOpts ...client.CreateOption) CreateOrUpdateOption {
+// WithPatchOpts allows definition of the Patch options to be used in resource Patch.
+func WithPatchOpts(patchOpts ...client.PatchOption) CreateOrUpdateOption {
 	return func(c *createOrUpdateConfig) {
-		c.createOpts = createOpts
-	}
-}
-
-// WithUpdateOpts allows definition of the Update options to be used in resource Update.
-func WithUpdateOpts(updateOpts ...client.UpdateOption) CreateOrUpdateOption {
-	return func(c *createOrUpdateConfig) {
-		c.updateOpts = updateOpts
+		c.patchOpts = patchOpts
 	}
 }
 
@@ -306,8 +295,9 @@ func (p *clusterProxy) GetCache(ctx context.Context) cache.Cache {
 	return p.cache
 }
 
-// CreateOrUpdate creates or updates objects using the clusterProxy client.
-// Defaults to use FieldValidation: strict, which can be overwritten with CreateOrUpdateOptions.
+// CreateOrUpdate creates or updates objects using the clusterProxy client using server-side apply.
+// Defaults to use FieldValidation: strict and FieldManager: cluster-api-e2e,
+// which can be overwritten with CreateOrUpdateOptions.
 func (p *clusterProxy) CreateOrUpdate(ctx context.Context, resources []byte, opts ...CreateOrUpdateOption) error {
 	Expect(ctx).NotTo(BeNil(), "ctx is required for CreateOrUpdate")
 	Expect(resources).NotTo(BeNil(), "resources is required for CreateOrUpdate")
@@ -320,38 +310,18 @@ func (p *clusterProxy) CreateOrUpdate(ctx context.Context, resources []byte, opt
 		labelSelector = config.labelSelector
 	}
 	// Prepending field validation strict so that it is used per default, but can still be overwritten.
-	config.createOpts = append([]client.CreateOption{client.FieldValidation("Strict")}, config.createOpts...)
-	config.updateOpts = append([]client.UpdateOption{client.FieldValidation("Strict")}, config.updateOpts...)
+	config.patchOpts = append([]client.PatchOption{client.FieldValidation("Strict"), client.FieldOwner("cluster-api-e2e")}, config.patchOpts...)
 	objs, err := yaml.ToUnstructured(resources)
 	if err != nil {
 		return err
 	}
 
-	existingObject := &unstructured.Unstructured{}
 	var retErrs []error
 	for _, o := range objs {
-		objectKey := types.NamespacedName{
-			Name:      o.GetName(),
-			Namespace: o.GetNamespace(),
-		}
-		existingObject.SetAPIVersion(o.GetAPIVersion())
-		existingObject.SetKind(o.GetKind())
 		labels := labels.Set(o.GetLabels())
 		if labelSelector.Matches(labels) {
-			if err := p.GetClient().Get(ctx, objectKey, existingObject); err != nil {
-				// Expected error -- if the object does not exist, create it
-				if apierrors.IsNotFound(err) {
-					if err := p.GetClient().Create(ctx, &o, config.createOpts...); err != nil {
-						retErrs = append(retErrs, err)
-					}
-				} else {
-					retErrs = append(retErrs, err)
-				}
-			} else {
-				o.SetResourceVersion(existingObject.GetResourceVersion())
-				if err := p.GetClient().Update(ctx, &o, config.updateOpts...); err != nil {
-					retErrs = append(retErrs, err)
-				}
+			if err := p.GetClient().Patch(ctx, &o, client.Apply, config.patchOpts...); err != nil {
+				retErrs = append(retErrs, err)
 			}
 		}
 	}