[DO NOT MERGE] testing jammy builder

Signed-off-by: Matej Vasek <[email protected]>

.github/workflows/test-e2e-runtime.yaml

@@ -11,7 +11,7 @@ jobs:
     name: E2E Test
     strategy:
       matrix:
-        runtime: ["node", "go", "python", "quarkus", "springboot", "typescript"]
+        runtime: ["node", "go", "python", "quarkus", "springboot", "typescript", "rust"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

pkg/builders/buildpacks/builder.go

@@ -27,18 +27,18 @@ import (
 // DefaultName when no WithName option is provided to NewBuilder
 const DefaultName = builders.Pack
 
-var DefaultBaseBuilder = "gcr.io/paketo-buildpacks/builder:base"
-var DefaultRustBuilder = "gcr.io/paketo-buildpacks/builder:full-cf"
+var DefaultBaseBuilder = "ghcr.io/knative/builder-jammy-base:latest"
+var DefaultTinyBuilder = "ghcr.io/knative/builder-jammy-tiny:latest"
 
 var (
 	DefaultBuilderImages = map[string]string{
 		"node":       DefaultBaseBuilder,
 		"nodejs":     DefaultBaseBuilder,
 		"typescript": DefaultBaseBuilder,
-		"go":         DefaultBaseBuilder,
+		"go":         DefaultTinyBuilder,
 		"python":     DefaultBaseBuilder,
-		"quarkus":    DefaultBaseBuilder,
-		"rust":       DefaultRustBuilder,
+		"quarkus":    DefaultTinyBuilder,
+		"rust":       DefaultBaseBuilder,
 		"springboot": DefaultBaseBuilder,
 	}
 
@@ -50,11 +50,10 @@ var (
 		"docker.io/paketobuildpacks/",
 		"ghcr.io/vmware-tanzu/function-buildpacks-for-knative/",
 		"gcr.io/buildpacks/",
+		"ghcr.io/knative/",
 	}
 
-	defaultBuildpacks = map[string][]string{
-		"go": {"paketo-buildpacks/go-dist", "ghcr.io/boson-project/go-function-buildpack:tip"},
-	}
+	defaultBuildpacks = map[string][]string{}
 )
 
 // Builder will build Function using Pack.

pkg/k8s/security_context.go

@@ -13,8 +13,8 @@ func defaultPodSecurityContext() *corev1.PodSecurityContext {
 	if IsOpenShift() {
 		return nil
 	}
-	runAsUser := int64(1000)
-	runAsGroup := int64(1000)
+	runAsUser := int64(1001)
+	runAsGroup := int64(1002)
 	return &corev1.PodSecurityContext{
 		RunAsUser:  &runAsUser,
 		RunAsGroup: &runAsGroup,

pkg/pipelines/resources/tekton/task/func-buildpacks/0.1/func-buildpacks.yaml

@@ -57,7 +57,7 @@ spec:
       default: "false"
     - name: USER_ID
       description: The user ID of the builder image user.
-      default: "1000"
+      default: "1001"
     - name: GROUP_ID
       description: The group ID of the builder image user.
       default: "0"
@@ -74,7 +74,7 @@ spec:
   stepTemplate:
     env:
       - name: CNB_PLATFORM_API
-        value: "0.4"
+        value: "0.10"
 
   steps:
     - name: prepare
@@ -168,7 +168,6 @@ spec:
         - "-layers=/layers"
         - "-platform=/platform"
         - "-report=/layers/report.toml"
-        - "-process-type=$(params.PROCESS_TYPE)"
         - "-skip-restore=$(params.SKIP_RESTORE)"
         - "-previous-image=$(params.APP_IMAGE)"
         - "-run-image=$(params.RUN_IMAGE)"
@@ -179,7 +178,7 @@ spec:
         - name: $(params.PLATFORM_DIR)
           mountPath: /platform
       securityContext:
-        runAsUser: 1000
+        runAsUser: 1001
         #################################################################
         #####  "runAsGroup" has been changed to "0" for Knative Functions
         runAsGroup: 0

pkg/pipelines/tekton/gitlab_test.go

@@ -34,6 +34,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"knative.dev/pkg/apis"
 
+	"knative.dev/func/pkg/builders/buildpacks"
 	"knative.dev/func/pkg/docker"
 	fn "knative.dev/func/pkg/functions"
 	"knative.dev/func/pkg/k8s"
@@ -79,7 +80,7 @@ func TestGitlab(t *testing.T) {
 				URL:      strings.TrimSuffix(glabEnv.HTTPProjectURL, ".git"),
 				Revision: "devel",
 			},
-			BuilderImages: map[string]string{"pack": "docker.io/paketobuildpacks/builder:tiny"},
+			BuilderImages: map[string]string{"pack": buildpacks.DefaultTinyBuilder},
 			Builder:       "pack",
 			PVCSize:       "256Mi",
 		},

pkg/pipelines/tekton/pipelines_integration_test.go

@@ -16,6 +16,7 @@ import (
 	"testing"
 	"time"
 
+	"knative.dev/func/pkg/builders/buildpacks"
 	"knative.dev/func/pkg/docker"
 	fn "knative.dev/func/pkg/functions"
 	"knative.dev/func/pkg/pipelines/tekton"
@@ -153,12 +154,12 @@ func createSimpleGoProject(t *testing.T, ns string) fn.Function {
 		t.Fatal(err)
 	}
 
-	err = os.WriteFile(filepath.Join(projDir, "main.go"), []byte(simpleGOSvc), 0644)
+	err = os.WriteFile(filepath.Join(projDir, "handle.go"), []byte(simpleGOSvc), 0644)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	err = os.WriteFile(filepath.Join(projDir, "go.mod"), []byte("module web\n\ngo 1.20\n"), 0644)
+	err = os.WriteFile(filepath.Join(projDir, "go.mod"), []byte("module function\n\ngo 1.20\n"), 0644)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -173,7 +174,7 @@ func createSimpleGoProject(t *testing.T, ns string) fn.Function {
 		Invoke:   "none",
 		Build: fn.BuildSpec{
 			BuilderImages: map[string]string{
-				"pack": "docker.io/paketobuildpacks/builder:base",
+				"pack": buildpacks.DefaultTinyBuilder,
 				"s2i":  "registry.access.redhat.com/ubi8/go-toolset",
 			},
 		},
@@ -189,40 +190,16 @@ func createSimpleGoProject(t *testing.T, ns string) fn.Function {
 	return f
 }
 
-const simpleGOSvc = `package main
+const simpleGOSvc = `package function
 
 import (
 	"context"
-	"net"
 	"net/http"
-	"os"
-	"os/signal"
-	"syscall"
 )
 
-func main() {
-	sigs := make(chan os.Signal, 5)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
-
-	s := http.Server{
-		Handler: http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
-			resp.Header().Add("Content-Type", "text/plain")
-			resp.WriteHeader(200)
-			_, _ = resp.Write([]byte("OK"))
-		}),
-	}
-	go func() {
-		<-sigs
-		_ = s.Shutdown(context.Background())
-	}()
-	port := "8080"
-	if p, ok := os.LookupEnv("PORT"); ok {
-		port = p
-	}
-	l, err := net.Listen("tcp4", ":"+port)
-	if err != nil {
-		panic(err)
-	}
-	_ = s.Serve(l)
+func Handle(ctx context.Context, resp http.ResponseWriter, req *http.Request) {
+	resp.Header().Add("Content-Type", "text/plain")
+	resp.WriteHeader(200)
+	_, _ = resp.Write([]byte("Hello World!\n"))
 }
 `

pkg/pipelines/tekton/validate.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"knative.dev/func/pkg/builders"
-	"knative.dev/func/pkg/builders/buildpacks"
 	"knative.dev/func/pkg/builders/s2i"
 	fn "knative.dev/func/pkg/functions"
 )
@@ -32,17 +31,6 @@ func validatePipeline(f fn.Function) (string, error) {
 			return "", ErrRuntimeRequired
 		}
 
-		if f.Runtime == "go" || f.Runtime == "rust" {
-			builder := f.Build.BuilderImages[builders.Pack]
-			defaultBuilder := buildpacks.DefaultBuilderImages[f.Runtime]
-			if builder != "" && builder != defaultBuilder {
-				warningMsg = fmt.Sprintf("runtime %q is not supported for on cluster build with default builders, "+
-					"continuing with the custom builder provided", f.Runtime)
-			} else {
-				return "", ErrRuntimeNotSupported{f.Runtime}
-			}
-		}
-
 		if len(f.Build.Buildpacks) > 0 {
 			return "", ErrBuilpacksNotSupported
 		}

pkg/pipelines/tekton/validate_test.go

@@ -70,9 +70,9 @@ func Test_validatePipeline(t *testing.T) {
 			wantErr:  true,
 		},
 		{
-			name:     "Unsupported runtime - Go - pack builder - without additional Buildpacks",
+			name:     "Supported runtime - Go - pack builder",
 			function: fn.Function{Build: fn.BuildSpec{Builder: builders.Pack}, Runtime: "go"},
-			wantErr:  true,
+			wantErr:  false,
 		},
 		{
 			name:     "Unsupported runtime - Go - pack builder - with additional Buildpacks",
@@ -95,9 +95,9 @@ func Test_validatePipeline(t *testing.T) {
 			wantErr:  false,
 		},
 		{
-			name:     "Unsupported runtime - Rust - pack builder - without additional Buildpacks",
+			name:     "Supported runtime - Rust - pack builder",
 			function: fn.Function{Build: fn.BuildSpec{Builder: builders.Pack}, Runtime: "rust"},
-			wantErr:  true,
+			wantErr:  false,
 		},
 		{
 			name:     "Unsupported runtime - Rust - s2i builder",

test/e2e/scenario_runtime-http_test.go

@@ -18,6 +18,7 @@ import (
 var runtimeSupportMap = map[string][]string{
 	"node":       {"pack", "s2i"},
 	"go":         {"pack"},
+	"rust":       {"pack"},
 	"python":     {"pack", "s2i"},
 	"quarkus":    {"pack", "s2i"},
 	"springboot": {"pack"},

test/oncluster/scenario_runtime_test.go

@@ -15,7 +15,8 @@ import (
 
 var runtimeSupportMap = map[string][]string{
 	"node":       {"pack", "s2i"},
-	"go":         {},
+	"go":         {"pack"},
+	"rust":       {"pack"},
 	"python":     {"pack", "s2i"},
 	"quarkus":    {"pack", "s2i"},
 	"springboot": {"pack"},