Add a DisableDefaultAffinity field to PodPolicy

jiangpengcheng · jiangpengcheng · commit 349eaa90fe1c · 2025-07-15T11:22:33.000+08:00
diff --git a/.ci/tests/integration/cases/global-and-namespaced-config/manifests.yaml b/.ci/tests/integration/cases/global-and-namespaced-config/manifests.yaml
@@ -16,6 +16,7 @@ spec:
       - persistent://public/default/input-java-topic
     typeClassName: java.lang.String
   pod:
+    disableDefaultAffinity: true
     env:
       - name: "podenv"
         value: "podvalue"
diff --git a/.ci/tests/integration/e2e_with_tls.yaml b/.ci/tests/integration/e2e_with_tls.yaml
@@ -31,7 +31,7 @@ setup:
         image="function-mesh-operator:latest"
         IMG=${image} make docker-build-skip-test
         kind load docker-image ${image}
-        helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --set controllerManager.globalBackendConfig=global-backend-config --set controllerManager.globalBackendConfigNamespace=${FUNCTION_MESH_NAMESPACE} --set controllerManager.namespacedBackendConfig=backend-config --set controllerManager.addDefaultAffinity=false --create-namespace charts/function-mesh-operator
+        helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --set controllerManager.globalBackendConfig=global-backend-config --set controllerManager.globalBackendConfigNamespace=${FUNCTION_MESH_NAMESPACE} --set controllerManager.namespacedBackendConfig=backend-config --create-namespace charts/function-mesh-operator
       wait:
         - namespace: function-mesh
           resource: pod
diff --git a/api/compute/v1alpha1/common.go b/api/compute/v1alpha1/common.go
@@ -227,6 +227,8 @@ type PodPolicy struct {
 	Env []corev1.EnvVar `json:"env,omitempty"`
 
 	Liveness *Liveness `json:"liveness,omitempty"`
+
+	DisableDefaultAffinity bool `json:"disableDefaultAffinity,omitempty"`
 }
 
 type Runtime struct {
diff --git a/charts/function-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-backendconfigs.yaml b/charts/function-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-backendconfigs.yaml
@@ -828,6 +828,8 @@ spec:
                       items:
                         type: string
                       type: array
+                    disableDefaultAffinity:
+                      type: boolean
                     env:
                       items:
                         properties:
diff --git a/charts/function-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functionmeshes.yaml b/charts/function-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functionmeshes.yaml
@@ -1127,6 +1127,8 @@ spec:
                             items:
                               type: string
                             type: array
+                          disableDefaultAffinity:
+                            type: boolean
                           env:
                             items:
                               properties:
@@ -5004,6 +5006,8 @@ spec:
                             items:
                               type: string
                             type: array
+                          disableDefaultAffinity:
+                            type: boolean
                           env:
                             items:
                               properties:
@@ -8662,6 +8666,8 @@ spec:
                             items:
                               type: string
                             type: array
+                          disableDefaultAffinity:
+                            type: boolean
                           env:
                             items:
                               properties:
diff --git a/charts/function-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functions.yaml b/charts/function-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functions.yaml
@@ -6,7 +6,7 @@ metadata:
     {{- if eq .Values.admissionWebhook.certificate.provider "cert-manager" }}
       {{- include "function-mesh-operator.certManager.annotation" . | nindent 4 -}}
     {{- end }}
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: functions.compute.functionmesh.io
 spec:
   conversion:
@@ -1146,6 +1146,8 @@ spec:
                       items:
                         type: string
                       type: array
+                    disableDefaultAffinity:
+                      type: boolean
                     env:
                       items:
                         properties:
diff --git a/charts/function-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-sinks.yaml b/charts/function-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-sinks.yaml
@@ -1067,6 +1067,8 @@ spec:
                       items:
                         type: string
                       type: array
+                    disableDefaultAffinity:
+                      type: boolean
                     env:
                       items:
                         properties:
diff --git a/charts/function-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-sources.yaml b/charts/function-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-sources.yaml
@@ -1062,6 +1062,8 @@ spec:
                       items:
                         type: string
                       type: array
+                    disableDefaultAffinity:
+                      type: boolean
                     env:
                       items:
                         properties:
diff --git a/config/crd/bases/compute.functionmesh.io_backendconfigs.yaml b/config/crd/bases/compute.functionmesh.io_backendconfigs.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: backendconfigs.compute.functionmesh.io
 spec:
   group: compute.functionmesh.io
@@ -807,6 +806,8 @@ spec:
                     items:
                       type: string
                     type: array
+                  disableDefaultAffinity:
+                    type: boolean
                   env:
                     items:
                       properties:
diff --git a/config/crd/bases/compute.functionmesh.io_functionmeshes.yaml b/config/crd/bases/compute.functionmesh.io_functionmeshes.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: functionmeshes.compute.functionmesh.io
 spec:
   group: compute.functionmesh.io
@@ -1128,6 +1127,8 @@ spec:
                           items:
                             type: string
                           type: array
+                        disableDefaultAffinity:
+                          type: boolean
                         env:
                           items:
                             properties:
@@ -5005,6 +5006,8 @@ spec:
                           items:
                             type: string
                           type: array
+                        disableDefaultAffinity:
+                          type: boolean
                         env:
                           items:
                             properties:
@@ -8663,6 +8666,8 @@ spec:
                           items:
                             type: string
                           type: array
+                        disableDefaultAffinity:
+                          type: boolean
                         env:
                           items:
                             properties:
diff --git a/config/crd/bases/compute.functionmesh.io_functions.yaml b/config/crd/bases/compute.functionmesh.io_functions.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: functions.compute.functionmesh.io
 spec:
   group: compute.functionmesh.io
@@ -1125,6 +1124,8 @@ spec:
                     items:
                       type: string
                     type: array
+                  disableDefaultAffinity:
+                    type: boolean
                   env:
                     items:
                       properties:
diff --git a/config/crd/bases/compute.functionmesh.io_sinks.yaml b/config/crd/bases/compute.functionmesh.io_sinks.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: sinks.compute.functionmesh.io
 spec:
   group: compute.functionmesh.io
@@ -1046,6 +1045,8 @@ spec:
                     items:
                       type: string
                     type: array
+                  disableDefaultAffinity:
+                    type: boolean
                   env:
                     items:
                       properties:
diff --git a/config/crd/bases/compute.functionmesh.io_sources.yaml b/config/crd/bases/compute.functionmesh.io_sources.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: sources.compute.functionmesh.io
 spec:
   group: compute.functionmesh.io
@@ -1041,6 +1040,8 @@ spec:
                     items:
                       type: string
                     type: array
+                  disableDefaultAffinity:
+                    type: boolean
                   env:
                     items:
                       properties:
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:
diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml
@@ -2,7 +2,6 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: mutating-webhook-configuration
 webhooks:
 - admissionReviewVersions:
@@ -72,7 +71,6 @@ webhooks:
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: validating-webhook-configuration
 webhooks:
 - admissionReviewVersions:
diff --git a/controllers/spec/common.go b/controllers/spec/common.go
@@ -475,7 +475,7 @@ func makePodTemplate(container *corev1.Container, filebeatContainer *corev1.Cont
 			TerminationGracePeriodSeconds: policy.TerminationGracePeriodSeconds,
 			Volumes:                       volumes,
 			NodeSelector:                  policy.NodeSelector,
-			Affinity:                      GenerateAffinity(policy.Affinity, mergedLabels),
+			Affinity:                      GenerateAffinity(policy.Affinity, mergedLabels, policy.DisableDefaultAffinity),
 			Tolerations:                   policy.Tolerations,
 			SecurityContext:               podSecurityContext,
 			ImagePullSecrets:              policy.ImagePullSecrets,
@@ -484,8 +484,8 @@ func makePodTemplate(container *corev1.Container, filebeatContainer *corev1.Cont
 	}
 }
 
-func GenerateAffinity(affinity *corev1.Affinity, labels map[string]string) *corev1.Affinity {
-	if !utils.AddDefaultAffinity {
+func GenerateAffinity(affinity *corev1.Affinity, labels map[string]string, disableDefaultAffinity bool) *corev1.Affinity {
+	if !utils.AddDefaultAffinity || disableDefaultAffinity {
 		return affinity
 	}
 	if affinity == nil {
@@ -495,21 +495,7 @@ func GenerateAffinity(affinity *corev1.Affinity, labels map[string]string) *core
 		affinity.PodAntiAffinity = &corev1.PodAntiAffinity{}
 	}
 
-	// add default pod anti-affinity rules to ensure replica pods doesn't run on the same node
-	if affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution == nil {
-		affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution = []corev1.PodAffinityTerm{}
-	}
-	affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution = append(
-		affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution,
-		corev1.PodAffinityTerm{
-			LabelSelector: &metav1.LabelSelector{
-				MatchLabels: labels,
-			},
-			TopologyKey: "kubernetes.io/hostname",
-		},
-	)
-
-	// add default pod anti-affinity rules to ensure replica pods prefer running in different zones
+	// add default pod anti-affinity rules to ensure replica pods prefer running on different node
 	if affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution == nil {
 		affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution = []corev1.WeightedPodAffinityTerm{}
 	}
@@ -521,7 +507,7 @@ func GenerateAffinity(affinity *corev1.Affinity, labels map[string]string) *core
 				LabelSelector: &metav1.LabelSelector{
 					MatchLabels: labels,
 				},
-				TopologyKey: "topology.kubernetes.io/zone",
+				TopologyKey: "kubernetes.io/hostname",
 			},
 		},
 	)

Original file line number	Diff line number	Diff line change
`@@ -227,6 +227,8 @@ type PodPolicy struct {`
`227`	`227`	Env []corev1.EnvVar `json:"env,omitempty"`
`228`	`228`
`229`	`229`	Liveness *Liveness `json:"liveness,omitempty"`
	`230`	`+`
	`231`	+ DisableDefaultAffinity bool `json:"disableDefaultAffinity,omitempty"`
`230`	`232`	`}`
`231`	`233`
`232`	`234`	`type Runtime struct {`