Add pod field

jiangpengcheng · jiangpengcheng · commit edc3ba2141b8 · 2024-07-02T17:21:00.000+08:00
diff --git a/.ci/clusters/global_backend_config.yaml b/.ci/clusters/global_backend_config.yaml
@@ -6,6 +6,7 @@ spec:
   env:
     global1: globalvalue1
     shared1: fromglobal
-  liveness:
-    initialDelaySeconds: 10
-    periodSeconds: 30
+  pod:
+    liveness:
+      initialDelaySeconds: 10
+      periodSeconds: 30
diff --git a/.ci/tests/integration/cases/global-and-namespaced-config/mesh-config-kube-system.yaml b/.ci/tests/integration/cases/global-and-namespaced-config/mesh-config-kube-system.yaml
@@ -7,6 +7,7 @@ spec:
   env:
     namespaced1: namespacedvalue1
     shared1: fromnamespace
-  liveness:
-    initialDelaySeconds: 50
-    periodSeconds: 60
+  pod:
+    liveness:
+      initialDelaySeconds: 50
+      periodSeconds: 60
diff --git a/.ci/tests/integration/cases/global-and-namespaced-config/mesh-config.yaml b/.ci/tests/integration/cases/global-and-namespaced-config/mesh-config.yaml
@@ -7,6 +7,7 @@ spec:
   env:
     namespaced1: namespacedvalue1
     shared1: fromnamespace
-  liveness:
-    initialDelaySeconds: 30
-    periodSeconds: 10
+  pod:
+    liveness:
+      initialDelaySeconds: 30
+      periodSeconds: 10
diff --git a/api/compute/v1alpha1/backendconfig_types.go b/api/compute/v1alpha1/backendconfig_types.go
@@ -34,6 +34,13 @@ type BackendConfigSpec struct {
 	// +kubebuilder:validation:Optional
 	Env map[string]string `json:"env,omitempty"`
 
+	// +kubebuilder:validation:Optional
+	Pod *BackendConfigPodPolicy `json:"pod,omitempty"`
+}
+
+// BackendConfigPodPolicy defines the policy for the pod
+// TODO: Support more fields from PodPolicy
+type BackendConfigPodPolicy struct {
 	// +kubebuilder:validation:Optional
 	Liveness *Liveness `json:"liveness,omitempty"`
 }
diff --git a/api/compute/v1alpha1/zz_generated.deepcopy.go b/api/compute/v1alpha1/zz_generated.deepcopy.go
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
@@ -52,23 +52,26 @@ spec:
                   additionalProperties:
                     type: string
                   type: object
-                liveness:
-                  properties:
-                    failureThreshold:
-                      format: int32
-                      type: integer
-                    initialDelaySeconds:
-                      format: int32
-                      type: integer
-                    periodSeconds:
-                      format: int32
-                      type: integer
-                    successThreshold:
-                      format: int32
-                      type: integer
-                  type: object
                 name:
                   type: string
+                pod:
+                  properties:
+                    liveness:
+                      properties:
+                        failureThreshold:
+                          format: int32
+                          type: integer
+                        initialDelaySeconds:
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          format: int32
+                          type: integer
+                      type: object
+                  type: object
               type: object
             status:
               type: object
diff --git a/config/crd/bases/compute.functionmesh.io_backendconfigs.yaml b/config/crd/bases/compute.functionmesh.io_backendconfigs.yaml
@@ -30,23 +30,26 @@ spec:
                 additionalProperties:
                   type: string
                 type: object
-              liveness:
-                properties:
-                  failureThreshold:
-                    format: int32
-                    type: integer
-                  initialDelaySeconds:
-                    format: int32
-                    type: integer
-                  periodSeconds:
-                    format: int32
-                    type: integer
-                  successThreshold:
-                    format: int32
-                    type: integer
-                type: object
               name:
                 type: string
+              pod:
+                properties:
+                  liveness:
+                    properties:
+                      failureThreshold:
+                        format: int32
+                        type: integer
+                      initialDelaySeconds:
+                        format: int32
+                        type: integer
+                      periodSeconds:
+                        format: int32
+                        type: integer
+                      successThreshold:
+                        format: int32
+                        type: integer
+                    type: object
+                type: object
             type: object
           status:
             type: object
diff --git a/controllers/spec/common.go b/controllers/spec/common.go
@@ -20,6 +20,7 @@ package spec
 import (
 	"bytes"
 	"context"
+
 	// used for template
 	_ "embed"
 	"encoding/json"
@@ -306,8 +307,10 @@ func PatchStatefulSet(ctx context.Context, cli client.Client, namespace string,
 			for key, val := range globalBackendConfig.Spec.Env {
 				envData[key] = val
 			}
-			if globalBackendConfig.Spec.Liveness != nil {
-				liveness = globalBackendConfig.Spec.Liveness
+			if globalBackendConfig.Spec.Pod != nil {
+				if globalBackendConfig.Spec.Pod.Liveness != nil {
+					liveness = globalBackendConfig.Spec.Pod.Liveness
+				}
 			}
 		}
 	}
@@ -329,8 +332,10 @@ func PatchStatefulSet(ctx context.Context, cli client.Client, namespace string,
 			for key, val := range namespacedBackendConfig.Spec.Env {
 				envData[key] = val
 			}
-			if namespacedBackendConfig.Spec.Liveness != nil {
-				liveness = namespacedBackendConfig.Spec.Liveness
+			if namespacedBackendConfig.Spec.Pod != nil {
+				if namespacedBackendConfig.Spec.Pod.Liveness != nil {
+					liveness = namespacedBackendConfig.Spec.Pod.Liveness
+				}
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ package spec`
`20`	`20`	`import (`
`21`	`21`	`"bytes"`
`22`	`22`	`"context"`
	`23`	`+`
`23`	`24`	`// used for template`
`24`	`25`	`_ "embed"`
`25`	`26`	`"encoding/json"`
`@@ -306,8 +307,10 @@ func PatchStatefulSet(ctx context.Context, cli client.Client, namespace string,`
`306`	`307`	`for key, val := range globalBackendConfig.Spec.Env {`
`307`	`308`	`envData[key] = val`
`308`	`309`	`}`
`309`		`- if globalBackendConfig.Spec.Liveness != nil {`
`310`		`- liveness = globalBackendConfig.Spec.Liveness`
	`310`	`+ if globalBackendConfig.Spec.Pod != nil {`
	`311`	`+ if globalBackendConfig.Spec.Pod.Liveness != nil {`
	`312`	`+ liveness = globalBackendConfig.Spec.Pod.Liveness`
	`313`	`+ }`
`311`	`314`	`}`
`312`	`315`	`}`
`313`	`316`	`}`
`@@ -329,8 +332,10 @@ func PatchStatefulSet(ctx context.Context, cli client.Client, namespace string,`
`329`	`332`	`for key, val := range namespacedBackendConfig.Spec.Env {`
`330`	`333`	`envData[key] = val`
`331`	`334`	`}`
`332`		`- if namespacedBackendConfig.Spec.Liveness != nil {`
`333`		`- liveness = namespacedBackendConfig.Spec.Liveness`
	`335`	`+ if namespacedBackendConfig.Spec.Pod != nil {`
	`336`	`+ if namespacedBackendConfig.Spec.Pod.Liveness != nil {`
	`337`	`+ liveness = namespacedBackendConfig.Spec.Pod.Liveness`
	`338`	`+ }`
`334`	`339`	`}`
`335`	`340`	`}`
`336`	`341`	`}`