Updated porch e2e tests to use service manifest from function pod template configmap (#285)

* Updated porch e2e tests to use service manifest from function pod template configmap

* Updated function pod template changes as per review comments

* Applying suggestions from code review comments

Co-authored-by: Fiachra Corcoran <fiachra.corcoran@est.tech>

* Update deployment.yaml to correct copyright line year

---------

Co-authored-by: Fiachra Corcoran <fiachra.corcoran@est.tech>

Author: gkumar78

deployments/function-pods/README.md

@@ -0,0 +1,35 @@
+### Function Pod Template
+
+In order to leverage custom manifests for Pod and frontend Service of Function Pods created by Function Runner, the following additional Kubernetes Resource Manifests (KRM) need to be provisioned in the Porch environment
+
+* A ConfigMap containing 2 data elements: a) a KRM of type Pod under the `template` key and b) a KRM of type Service under `serviceTemplate` key
+* A Kubernetes Role providing read access to resource type ConfigMap in the porch-system namespace
+* A Kubernetes RoleBinding, binding to the above listed Role to the ServiceAccount (porch-fn-runner) used by Function Runner Pod
+
+All of the above KRMs are predefined in `deployment.yaml` file present in this folder.
+
+### How to enable Function Pod Template use by Function Runner
+
+* Apply the [deployment.yaml manifest](deployment.yaml) from this directory
+
+```
+kubectl apply -f deployment.yaml
+```
+
+* Add an additional argument `--function-pod-template` in command section of function-runner deployment instructing it to use the Function Pod Template ConfigMap, as shown below
+
+```
+kubectl edit deployment -n porch-system function-runner
+```
+
+```
+          command:
+            - /server
+            - --config=/config.yaml
+            - --functions=/functions
+            - --pod-namespace=porch-fn-system
+            - --function-pod-template=kpt-function-eval-pod-template
+            - --max-request-body-size=6291456 # Keep this in sync with porch-server's corresponding argument
+```
+
+After the function-runner Pods restart, they will start using the Pod and Service templates from ConfigMap.

deployments/function-pods/deployment.yaml

@@ -0,0 +1,83 @@
+# Copyright 2025 The kpt and Nephio Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kpt-function-eval-pod-template
+  namespace: porch-system
+data:
+  template: |
+    apiVersion: v1
+    kind: Pod
+    annotations:
+      cluster-autoscaler.kubernetes.io/safe-to-evict: true
+    spec:
+      initContainers:
+        - name: copy-wrapper-server
+          image: docker.io/nephio/porch-wrapper-server:latest
+          command:
+            - cp
+            - -a
+            - /wrapper-server/.
+            - /wrapper-server-tools
+          volumeMounts:
+            - name: wrapper-server-tools
+              mountPath: /wrapper-server-tools
+      containers:
+        - name: function
+          image: image-replaced-by-kpt-func-image
+          command:
+            - /wrapper-server-tools/wrapper-server
+          volumeMounts:
+            - name: wrapper-server-tools
+              mountPath: /wrapper-server-tools
+      volumes:
+        - name: wrapper-server-tools
+          emptyDir: {}
+  serviceTemplate: |
+    apiVersion: v1
+    kind: Service
+    spec:
+      ports:
+      - port: 9446
+        protocol: TCP
+        targetPort: 9446
+      selector:
+        fn.kpt.dev/image: to-be-replaced
+      type: ClusterIP
+---
+# Need to lookup and access Configmap containing Function Pod Template
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: porch-fn-runner
+  namespace: porch-system
+rules:
+  - apiGroups: [""]
+    resources: ["configmaps"]
+    verbs: ["get", "list"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: porch-fn-runner
+  namespace: porch-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: porch-fn-runner
+subjects:
+  - kind: ServiceAccount
+    name: porch-fn-runner

func/internal/podevaluator.go

@@ -938,12 +938,16 @@ func (pm *podManager) getBasePodTemplate(ctx context.Context) (*corev1.Pod, stri
 			return nil, "", err
 		}
 
-		decoder := yamlutil.NewYAMLOrJSONDecoder(strings.NewReader(podTemplateCm.Data["template"]), 100)
+		podTemplate, ok := podTemplateCm.Data["template"]
+		if !ok {
+			return nil, "", fmt.Errorf("function pod template with key template does not exist in Configmap %s", pm.functionPodTemplateName)
+		}
+
+		decoder := yamlutil.NewYAMLOrJSONDecoder(strings.NewReader(podTemplate), 100)
 		var basePodTemplate corev1.Pod
 		err = decoder.Decode(&basePodTemplate)
 
 		if err != nil {
-			klog.Errorf("Could not decode function pod template: %s", pm.functionPodTemplateName)
 			return nil, "", fmt.Errorf("unable to decode function pod template: %w", err)
 		}
 
@@ -1087,12 +1091,16 @@ func (pm *podManager) getBaseServiceTemplate(ctx context.Context) (*corev1.Servi
 			return nil, err
 		}
 
-		decoder := yamlutil.NewYAMLOrJSONDecoder(strings.NewReader(serviceTemplateCm.Data["serviceTemplate"]), 100)
+		serviceTemplate, ok := serviceTemplateCm.Data["serviceTemplate"]
+		if !ok {
+			return nil, fmt.Errorf("function pod service template with key serviceTemplate does not exist in Configmap %s", pm.functionPodTemplateName)
+		}
+
+		decoder := yamlutil.NewYAMLOrJSONDecoder(strings.NewReader(serviceTemplate), 100)
 		var baseServiceTemplate corev1.Service
 		err = decoder.Decode(&baseServiceTemplate)
 
 		if err != nil {
-			klog.Errorf("Could not decode function service template: %s", pm.functionPodTemplateName)
 			return nil, fmt.Errorf("unable to decode function service template: %w", err)
 		}