[release-v1.16] Pick Python scaffolding

[matejvasek]

Picking knative#2685
Picking knative#2770

[matejvasek]

@lkingland ^^^

[matejvasek]

btw there is bunch of other backports needed beside this

[matejvasek]

PTAL @lkingland @dsimansk

[matejvasek]

@lkingland please carefully review this if I cherry-picked it correctly.

[lkingland]

/lgtm
Looks right to me.
Wish we had the Python E2Es to be more sure, but expecting we get the pack support soon.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lkingland, matejvasek

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [lkingland,matejvasek]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[gauron99]

/cherry-pick release-v1.17

[openshift-cherrypick-robot]

@gauron99: #1236 failed to apply on top of branch "release-v1.17":

Applying: Pick https://github.com/knative/func/pull/2685
.git/rebase-apply/patch:18273: new blank line at EOF.
+
.git/rebase-apply/patch:18648: new blank line at EOF.
+
.git/rebase-apply/patch:18788: new blank line at EOF.
+
.git/rebase-apply/patch:18866: new blank line at EOF.
+
warning: 4 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	.github/workflows/test-e2e-runtime.yaml
M	.gitignore
M	Makefile
M	cmd/build.go
M	cmd/deploy_test.go
M	generate/zz_filesystem_generated.go
M	pkg/builders/s2i/builder.go
Falling back to patching base and 3-way merge...
Removing templates/python/wsgi/requirements.txt
Removing templates/python/wsgi/manifest.yaml
Removing templates/python/wsgi/func.py
Removing templates/python/wsgi/Procfile
Removing templates/python/http/test_func.py
Removing templates/python/http/requirements.txt
Removing templates/python/http/func.py
Removing templates/python/http/app.sh
Removing templates/python/http/Procfile
Removing templates/python/flask/requirements.txt
Removing templates/python/flask/manifest.yaml
Removing templates/python/flask/func.py
Removing templates/python/flask/Procfile
Removing templates/python/cloudevents/test_func.py
Removing templates/python/cloudevents/requirements.txt
Removing templates/python/cloudevents/func.py
Removing templates/python/cloudevents/app.sh
Removing templates/python/cloudevents/Procfile
Removing pkg/oci/containerize_test.go
Removing pkg/oci/containerize.go
Auto-merging pkg/builders/s2i/builder.go
Auto-merging generate/zz_filesystem_generated.go
CONFLICT (content): Merge conflict in generate/zz_filesystem_generated.go
Auto-merging cmd/deploy_test.go
Auto-merging cmd/build.go
Auto-merging Makefile
Auto-merging .gitignore
Auto-merging .github/workflows/test-e2e-runtime.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Pick https://github.com/knative/func/pull/2685

Details

In response to this:

/cherry-pick release-v1.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.