✨ Add FieldOwner field to client.Options (#3389)

* Add FieldOwner field to client.Options

* Update client.Options.FieldOwner documentation

Author: aerfio

pkg/client/client.go

@@ -52,6 +52,15 @@ type Options struct {
 
 	// DryRun instructs the client to only perform dry run requests.
 	DryRun *bool
+
+	// FieldOwner, if provided, sets the default field manager for all write operations
+	// (Create, Update, Patch, Apply) performed by this client. The field manager is used by
+	// the server for Server-Side Apply to track field ownership.
+	// For more details, see: https://kubernetes.io/docs/reference/using-api/server-side-apply/#field-management
+	//
+	// This default can be overridden for a specific call by passing a [FieldOwner] option
+	// to the method.
+	FieldOwner string
 }
 
 // CacheOptions are options for creating a cache-backed client.
@@ -99,6 +108,10 @@ func New(config *rest.Config, options Options) (c Client, err error) {
 	if err == nil && options.DryRun != nil && *options.DryRun {
 		c = NewDryRunClient(c)
 	}
+	if fo := options.FieldOwner; fo != "" {
+		c = WithFieldOwner(c, fo)
+	}
+
 	return c, err
 }
 

pkg/client/client_test.go

@@ -365,6 +365,19 @@ U5wwSivyi7vmegHKmblOzNVKA5qPO8zWzqBC
 			Expect(cl.List(ctx, &corev1.NamespaceList{})).To(Succeed())
 			Expect(cache.Called).To(Equal(0))
 		})
+
+		It("should use the provided FieldOwner if provided", func(ctx SpecContext) {
+			cl, err := client.New(cfg, client.Options{FieldOwner: "test-owner"})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(cl).NotTo(BeNil())
+			// no explicit FieldOwner option set on Apply method call
+			err = cl.Apply(ctx, corev1applyconfigurations.ConfigMap("test-cm", "default").WithData(map[string]string{"foo": "bar"}))
+			Expect(err).NotTo(HaveOccurred())
+			actual, err := clientset.CoreV1().ConfigMaps("default").Get(ctx, "test-cm", metav1.GetOptions{})
+			Expect(err).NotTo(HaveOccurred())
+			Expect(actual.ManagedFields).To(HaveLen(1))
+			Expect(actual.ManagedFields[0].Manager).To(Equal("test-owner"))
+		})
 	})
 
 	Describe("Create", func() {