Consume podspec patch directly on executor/builder mounts (#2661)

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

pkg/executor/util/util.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os"
 	"strings"
 	"sync"
 	"time"
@@ -119,18 +120,14 @@ func ConvertConfigSecrets(ctx context.Context, fn *fv1.Function, kc kubernetes.I
 	return envFromSources, nil
 }
 
-func GetSpecFromConfigMap(ctx context.Context, kubeClient kubernetes.Interface, cm string, cmns string) (*apiv1.PodSpec, error) {
-
-	podSpecPatch, err := kubeClient.CoreV1().ConfigMaps(cmns).Get(ctx, cm, metav1.GetOptions{})
+func GetSpecFromConfigMap(filePath string) (*apiv1.PodSpec, error) {
+	content, err := os.ReadFile(filePath)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error reading YAML file %s: %w", filePath, err)
 	}
-
-	var additionalSpec apiv1.PodSpec
-
-	err = yaml.Unmarshal([]byte(podSpecPatch.Data["spec"]), &additionalSpec)
-
-	return &additionalSpec, err
+	additionalSpec := &apiv1.PodSpec{}
+	err = yaml.UnmarshalStrict(content, &additionalSpec)
+	return additionalSpec, err
 }
 
 func GetObjectReaperInterval(logger *zap.Logger, executorType fv1.ExecutorType, defaultReaperInterval uint) uint {

pkg/executor/util/util_test.go

@@ -17,57 +17,45 @@ limitations under the License.
 package util
 
 import (
-	"context"
 	"fmt"
 	"os"
 	"reflect"
 	"testing"
 
-	apiv1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes/fake"
+	"github.com/google/go-cmp/cmp"
 
 	fv1 "github.com/fission/fission/pkg/apis/core/v1"
 	"github.com/fission/fission/pkg/utils/loggerfactory"
+	apiv1 "k8s.io/api/core/v1"
 )
 
 func TestGetSpecFromConfigMap(t *testing.T) {
-
-	kubeClient := fake.NewSimpleClientset()
-
-	var permissionNum int64 = 10001
-	var runAsNonRoot bool = true
-
-	configMapData := make(map[string]string, 0)
+	runtimePodSpecPath := "runtime-podspec-patch.yaml"
+	tempDir := t.TempDir()
 	specPatch := `
 securityContext:
   fsGroup: 10001
   runAsGroup: 10001
   runAsNonRoot: true
   runAsUser: 10001`
-
-	configMapData["spec"] = specPatch
-
-	testConfigMap := apiv1.ConfigMap{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "ConfigMap",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "test-config-map",
-			Namespace: "fission",
-		},
-		Data: configMapData,
-	}
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	configmap, err := kubeClient.CoreV1().ConfigMaps("fission").Create(ctx, &testConfigMap, metav1.CreateOptions{})
+	err := os.WriteFile(tempDir+"/"+runtimePodSpecPath, []byte(specPatch), 0644)
 	if err != nil {
-		t.Errorf("Error creating configmap %v", err)
+		t.Errorf("Error writing to file %s", err)
+	}
+	specPatch2 := `
+securityContext2:
+securityContext:
+  fsGroup: "invalida_input"
+  runAsGroup: 10001
+  runAsNonRoot: true
+  runAsUser: 10001`
+	err = os.WriteFile(tempDir+"/"+runtimePodSpecPath+"2", []byte(specPatch2), 0644)
+	if err != nil {
+		t.Errorf("Error writing to file %s", err)
 	}
 
-	t.Logf("Configmap: %v", configmap.Data)
+	var permissionNum int64 = 10001
+	var runAsNonRoot bool = true
 
 	testSpecPatch := apiv1.PodSpec{
 		SecurityContext: &apiv1.PodSecurityContext{
@@ -79,42 +67,41 @@ securityContext:
 	}
 	tests := []struct {
 		name    string
-		cm      string
-		cmns    string
+		path    string
 		want    *apiv1.PodSpec
 		wantErr bool
 	}{
 		{
-			name:    "Configmap exists",
-			cm:      "test-config-map",
-			cmns:    "fission",
+			name:    "File exists with valid data",
+			path:    tempDir + "/" + runtimePodSpecPath,
 			want:    &testSpecPatch,
 			wantErr: false,
 		},
 		{
-			name:    "Configmap does not exists",
-			cm:      "wrongname",
-			cmns:    "fission",
+			name:    "File with invalid data",
+			path:    tempDir + "/" + runtimePodSpecPath + "2",
 			want:    nil,
 			wantErr: true,
 		},
 		{
-			name:    "Wrong namespace",
-			cm:      "test-config-map",
-			cmns:    "fissio",
+			name:    "File does not exist",
+			path:    tempDir + "/" + "notexist",
 			want:    nil,
 			wantErr: true,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := GetSpecFromConfigMap(ctx, kubeClient, tt.cm, tt.cmns)
+			got, err := GetSpecFromConfigMap(tt.path)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("GetSpecFromConfigMap() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
+			if err != nil {
+				return
+			}
 			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("GetSpecFromConfigMap() got = %v, want %v", got, tt.want)
+				t.Errorf("GetSpecFromConfigMap() diff = %s", cmp.Diff(tt.want, got))
 			}
 		})
 	}