fix: Server-side apply

ntkathole · ntkathole · commit 31ca5de6845f · 2026-03-20T19:15:35.000+05:30
Signed-off-by: ntkathole &lt;nikhilkathole2683@gmail.com&gt;
diff --git a/infra/feast-operator/config/rbac/role.yaml b/infra/feast-operator/config/rbac/role.yaml
@@ -110,7 +110,7 @@ rules:
   - delete
   - get
   - list
-  - update
+  - patch
   - watch
 - apiGroups:
   - policy
diff --git a/infra/feast-operator/dist/install.yaml b/infra/feast-operator/dist/install.yaml
@@ -20405,7 +20405,7 @@ rules:
   - delete
   - get
   - list
-  - update
+  - patch
   - watch
 - apiGroups:
   - policy
diff --git a/infra/feast-operator/internal/controller/featurestore_controller.go b/infra/feast-operator/internal/controller/featurestore_controller.go
@@ -71,7 +71,7 @@ type FeatureStoreReconciler struct {
 // +kubebuilder:rbac:groups=batch,resources=cronjobs,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=autoscaling,resources=horizontalpodautoscalers,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=policy,resources=poddisruptionbudgets,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors,verbs=get;list;watch;create;update;delete
+// +kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors,verbs=get;list;watch;create;patch;delete
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
diff --git a/infra/feast-operator/internal/controller/services/service_monitor.go b/infra/feast-operator/internal/controller/services/service_monitor.go
@@ -17,9 +17,13 @@ limitations under the License.
 package services
 
 import (
+	"encoding/json"
+
+	feastdevv1 "github.com/feast-dev/feast/infra/feast-operator/api/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
@@ -30,32 +34,38 @@ var serviceMonitorGVK = schema.GroupVersionKind{
 }
 
 // createOrDeleteServiceMonitor reconciles the ServiceMonitor for the
-// FeatureStore's online store metrics endpoint. When the Prometheus Operator
-// CRD is not present in the cluster, this is a no-op. When metrics are enabled
-// on the online store, a ServiceMonitor is created; otherwise any existing
-// ServiceMonitor is deleted.
+// FeatureStore's online store metrics endpoint using Server-Side Apply.
+// When the Prometheus Operator CRD is not present in the cluster, this is
+// a no-op. When metrics are enabled on the online store, a ServiceMonitor
+// is applied; otherwise any existing ServiceMonitor is deleted.
 func (feast *FeastServices) createOrDeleteServiceMonitor() error {
 	if !hasServiceMonitorCRD {
 		return nil
 	}
 
 	if feast.isOnlineStore() && feast.isMetricsEnabled(OnlineFeastType) {
-		return feast.createServiceMonitor()
+		return feast.applyServiceMonitor()
 	}
 
 	return feast.deleteServiceMonitor()
 }
 
-func (feast *FeastServices) createServiceMonitor() error {
-	logger := log.FromContext(feast.Handler.Context)
+func (feast *FeastServices) applyServiceMonitor() error {
+	smApply := feast.buildServiceMonitorApplyConfig()
+	data, err := json.Marshal(smApply)
+	if err != nil {
+		return err
+	}
+
 	sm := feast.initServiceMonitor()
-	if op, err := controllerutil.CreateOrUpdate(feast.Handler.Context, feast.Handler.Client, sm, controllerutil.MutateFn(func() error {
-		return feast.setServiceMonitor(sm)
-	})); err != nil {
+	logger := log.FromContext(feast.Handler.Context)
+	if err := feast.Handler.Client.Patch(feast.Handler.Context, sm,
+		client.RawPatch(types.ApplyPatchType, data),
+		client.FieldOwner(fieldManager), client.ForceOwnership); err != nil {
 		return err
-	} else if op == controllerutil.OperationResultCreated || op == controllerutil.OperationResultUpdated {
-		logger.Info("Successfully reconciled", "ServiceMonitor", sm.GetName(), "operation", op)
 	}
+	logger.Info("Successfully applied", "ServiceMonitor", sm.GetName())
+
 	return nil
 }
 
@@ -72,25 +82,43 @@ func (feast *FeastServices) initServiceMonitor() *unstructured.Unstructured {
 	return sm
 }
 
-func (feast *FeastServices) setServiceMonitor(sm *unstructured.Unstructured) error {
+// buildServiceMonitorApplyConfig constructs the fully desired ServiceMonitor
+// state for Server-Side Apply.
+func (feast *FeastServices) buildServiceMonitorApplyConfig() map[string]interface{} {
 	cr := feast.Handler.FeatureStore
-
-	sm.SetLabels(feast.getFeastTypeLabels(OnlineFeastType))
-
-	sm.Object["spec"] = map[string]interface{}{
-		"endpoints": []interface{}{
-			map[string]interface{}{
-				"port": "metrics",
-				"path": "/metrics",
+	objMeta := feast.GetObjectMetaType(OnlineFeastType)
+
+	return map[string]interface{}{
+		"apiVersion": "monitoring.coreos.com/v1",
+		"kind":       "ServiceMonitor",
+		"metadata": map[string]interface{}{
+			"name":      objMeta.Name,
+			"namespace": objMeta.Namespace,
+			"labels":    feast.getFeastTypeLabels(OnlineFeastType),
+			"ownerReferences": []interface{}{
+				map[string]interface{}{
+					"apiVersion":         feastdevv1.GroupVersion.String(),
+					"kind":               "FeatureStore",
+					"name":               cr.Name,
+					"uid":                string(cr.UID),
+					"controller":         true,
+					"blockOwnerDeletion": true,
+				},
 			},
 		},
-		"selector": map[string]interface{}{
-			"matchLabels": map[string]interface{}{
-				NameLabelKey:        cr.Name,
-				ServiceTypeLabelKey: string(OnlineFeastType),
+		"spec": map[string]interface{}{
+			"endpoints": []interface{}{
+				map[string]interface{}{
+					"port": "metrics",
+					"path": "/metrics",
+				},
+			},
+			"selector": map[string]interface{}{
+				"matchLabels": map[string]interface{}{
+					NameLabelKey:        cr.Name,
+					ServiceTypeLabelKey: string(OnlineFeastType),
+				},
 			},
 		},
 	}
-
-	return controllerutil.SetControllerReference(cr, sm, feast.Handler.Scheme)
 }
diff --git a/infra/feast-operator/internal/controller/services/service_monitor_test.go b/infra/feast-operator/internal/controller/services/service_monitor_test.go
@@ -110,35 +110,42 @@ var _ = Describe("ServiceMonitor", func() {
 		})
 	})
 
-	Describe("setServiceMonitor", func() {
-		It("should populate the ServiceMonitor spec with correct selector and endpoint", func() {
-			sm := feast.initServiceMonitor()
-			Expect(feast.setServiceMonitor(sm)).To(Succeed())
+	Describe("buildServiceMonitorApplyConfig", func() {
+		It("should build the correct SSA payload with labels, endpoints, selector, and owner reference", func() {
+			sm := feast.buildServiceMonitorApplyConfig()
+
+			Expect(sm["apiVersion"]).To(Equal("monitoring.coreos.com/v1"))
+			Expect(sm["kind"]).To(Equal("ServiceMonitor"))
 
-			labels := sm.GetLabels()
+			metadata := sm["metadata"].(map[string]interface{})
+			Expect(metadata["name"]).To(Equal(feast.GetFeastServiceName(OnlineFeastType)))
+			Expect(metadata["namespace"]).To(Equal(featureStore.Namespace))
+
+			labels := metadata["labels"].(map[string]string)
 			Expect(labels).To(HaveKeyWithValue(NameLabelKey, featureStore.Name))
 			Expect(labels).To(HaveKeyWithValue(ServiceTypeLabelKey, string(OnlineFeastType)))
 
-			spec, ok := sm.Object["spec"].(map[string]interface{})
-			Expect(ok).To(BeTrue())
+			ownerRefs := metadata["ownerReferences"].([]interface{})
+			Expect(ownerRefs).To(HaveLen(1))
+			ownerRef := ownerRefs[0].(map[string]interface{})
+			Expect(ownerRef["apiVersion"]).To(Equal(feastdevv1.GroupVersion.String()))
+			Expect(ownerRef["kind"]).To(Equal("FeatureStore"))
+			Expect(ownerRef["name"]).To(Equal(featureStore.Name))
+			Expect(ownerRef["controller"]).To(BeTrue())
+			Expect(ownerRef["blockOwnerDeletion"]).To(BeTrue())
 
-			endpoints, ok := spec["endpoints"].([]interface{})
-			Expect(ok).To(BeTrue())
+			spec := sm["spec"].(map[string]interface{})
+
+			endpoints := spec["endpoints"].([]interface{})
 			Expect(endpoints).To(HaveLen(1))
 			ep := endpoints[0].(map[string]interface{})
 			Expect(ep["port"]).To(Equal("metrics"))
 			Expect(ep["path"]).To(Equal("/metrics"))
 
-			selector, ok := spec["selector"].(map[string]interface{})
-			Expect(ok).To(BeTrue())
+			selector := spec["selector"].(map[string]interface{})
 			matchLabels := selector["matchLabels"].(map[string]interface{})
 			Expect(matchLabels[NameLabelKey]).To(Equal(featureStore.Name))
 			Expect(matchLabels[ServiceTypeLabelKey]).To(Equal(string(OnlineFeastType)))
-
-			ownerRefs := sm.GetOwnerReferences()
-			Expect(ownerRefs).To(HaveLen(1))
-			Expect(ownerRefs[0].Name).To(Equal(featureStore.Name))
-			Expect(*ownerRefs[0].Controller).To(BeTrue())
 		})
 	})
 

-Original file line number
+Diff line change
   - delete
   - get
   - list
 -  - update
 +  - patch
   - watch
 - apiGroups:
   - policy