[release-1.9] feat: enabled s2i for python (#1562) (#1579)

* feat: enabled s2i for python (#1562) * feat: enable s2i for python Signed-off-by: Matej Vasek <[email protected]> --------- Signed-off-by: Matej Vasek <[email protected]> * Use current (as in PR) func image in integration tests (#1548) * cleanup: style Signed-off-by: Matej Vasek <[email protected]> * fix: use current func image for in cluster tests Signed-off-by: Matej Vasek <[email protected]> --------- Signed-off-by: Matej Vasek <[email protected]> --------- Signed-off-by: Matej Vasek <[email protected]> Co-authored-by: Matej Vasek <[email protected]>
knative · Feb 21, 2023 · 1dd4eb6 · 1dd4eb6
1 parent 5333945
commit 1dd4eb6
Show file tree

Hide file tree

Showing 10 changed files with 8,452 additions and 8,411 deletions.
diff --git a/.github/workflows/test-e2e-oncluster-runtime.yaml b/.github/workflows/test-e2e-oncluster-runtime.yaml
@@ -15,8 +15,11 @@ jobs:
       - uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go }}
+      - uses: imjasonh/[email protected]
       - name: Install Binaries
         run: ./hack/binaries.sh
+      - name: Setup testing func image
+        run: ./hack/create-testing-func-image.sh
       - name: Allocate Cluster
         run: ./hack/allocate.sh
       - name: Deploy Tekton

diff --git a/.github/workflows/test-e2e-oncluster.yaml b/.github/workflows/test-e2e-oncluster.yaml
@@ -15,8 +15,11 @@ jobs:
       - uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go }}
+      - uses: imjasonh/[email protected]
       - name: Install Binaries
         run: ./hack/binaries.sh
+      - name: Setup testing func image
+        run: ./hack/create-testing-func-image.sh
       - name: Allocate Cluster
         run: ./hack/allocate.sh
       - name: Deploy Tekton

diff --git a/hack/create-testing-func-image.sh b/hack/create-testing-func-image.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+KO_DOCKER_REPO="ttl.sh/$(head -c 128 </dev/urandom | LC_CTYPE=C tr -dc 'a-z0-9' | fold -w 8 | head -n 1)"
+export KO_DOCKER_REPO
+
+REF_FILE=$(mktemp)
+
+ko build --image-refs "${REF_FILE}" --tags "30m" -B ./cmd/func
+
+yq -Y -i ".spec.steps[0].image = \"$(cat "${REF_FILE}")\"" \
+  pipelines/resources/tekton/task/func-deploy/0.1/func-deploy.yaml
diff --git a/pipelines/resources/tekton/task/func-deploy/0.1/func-deploy.yaml b/pipelines/resources/tekton/task/func-deploy/0.1/func-deploy.yaml
@@ -13,18 +13,18 @@ spec:
   description: >-
     This Task performs a deploy operation using the Knative `func` CLI
   params:
-  - name: path
-    description: Path to the function project
-    default: ""
-  - name: image
-    description: Container image to be deployed
-    default: ""
+    - name: path
+      description: Path to the function project
+      default: ""
+    - name: image
+      description: Container image to be deployed
+      default: ""
   workspaces:
     - name: source
       description: The workspace containing the function project
   steps:
-  - name: func-deploy
-    image: "ghcr.io/knative/func/func:latest"
-    script: |
-      export FUNC_IMAGE="$(params.image)"
-      func deploy --verbose --build=false --push=false --path=$(params.path) --remote=false
+    - name: func-deploy
+      image: "ghcr.io/knative/func/func:latest"
+      script: |
+        export FUNC_IMAGE="$(params.image)"
+        func deploy --verbose --build=false --push=false --path=$(params.path) --remote=false
diff --git a/s2i/builder.go b/s2i/builder.go
@@ -40,6 +40,7 @@ var DefaultBuilderImages = map[string]string{
 	"nodejs":     "registry.access.redhat.com/ubi8/nodejs-16",
 	"typescript": "registry.access.redhat.com/ubi8/nodejs-16",
 	"quarkus":    "registry.access.redhat.com/ubi8/openjdk-17",
+	"python":     "registry.access.redhat.com/ubi8/python-39",
 }
 
 // DockerClient is subset of dockerClient.CommonAPIClient required by this package

diff --git a/s2i/builder_test.go b/s2i/builder_test.go
@@ -63,9 +63,9 @@ func Test_BuildImages(t *testing.T) {
 			wantErr:  true,
 		},
 		{
-			name:     "Without builder - unsupported runtime - python",
+			name:     "Without builder - supported runtime - python",
 			function: fn.Function{Runtime: "python"},
-			wantErr:  true,
+			wantErr:  false,
 		},
 		{
 			name:     "Without builder - unsupported runtime - rust",

diff --git a/templates/python/cloudevents/app.sh b/templates/python/cloudevents/app.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec python -m parliament "$(dirname "$0")"
diff --git a/templates/python/http/app.sh b/templates/python/http/app.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec python -m parliament "$(dirname "$0")"
diff --git a/test/oncluster/scenario_runtime_test.go b/test/oncluster/scenario_runtime_test.go
@@ -18,7 +18,7 @@ import (
 var runtimeSupportMap = map[string][]string{
 	"node":       {"pack", "s2i"},
 	"go":         {},
-	"python":     {"pack"},
+	"python":     {"pack", "s2i"},
 	"quarkus":    {"pack", "s2i"},
 	"springboot": {"pack"},
 	"typescript": {"pack", "s2i"},

diff --git a/zz_filesystem_generated.go b/zz_filesystem_generated.go
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/sh

		exec python -m parliament "$(dirname "$0")"