Skip to content

[release-v1.16] Tekton 1.0.x fixes #1349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: release-v1.16
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions pkg/pipelines/tekton/tasks.go
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,12 @@ spec:
workspaces:
- name: source
description: The workspace containing the function project
- name: cache
optional: true
- name: sslcertdir
optional: true
- name: dockerconfig
optional: true
steps:
- name: func-deploy
image: "%s"
Expand All @@ -431,6 +437,15 @@ spec:
- name: path
description: Path to the function project
default: ""
workspaces:
- name: source
description: The workspace containing the function project
- name: cache
optional: true
- name: sslcertdir
optional: true
- name: dockerconfig
optional: true
steps:
- name: func-scaffold
image: %s
Expand Down
14 changes: 11 additions & 3 deletions pkg/pipelines/tekton/templates_pack.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ spec:
workspaces:
- name: source
workspace: source-workspace
- name: cache
workspace: cache-workspace
- name: dockerconfig
workspace: dockerconfig-workspace
{{.RunAfterFetchSources}}
{{.FuncScaffoldTaskRef}}
- name: build
Expand Down Expand Up @@ -86,6 +90,10 @@ spec:
workspaces:
- name: source
workspace: source-workspace
- name: cache
workspace: cache-workspace
- name: dockerconfig
workspace: dockerconfig-workspace
workspaces:
- description: Directory where function source is located.
name: source-workspace
Expand Down Expand Up @@ -115,11 +123,11 @@ metadata:
spec:
params:
- name: gitRepository
value: {{.RepoUrl}}
value: "{{.RepoUrl}}"
- name: gitRevision
value: {{.Revision}}
- name: contextDir
value: {{.ContextDir}}
value: "{{.ContextDir}}"
- name: imageName
value: {{.FunctionImage}}
- name: registry
Expand Down Expand Up @@ -182,7 +190,7 @@ spec:
- name: gitRevision
value: {{.Revision}}
- name: contextDir
value: {{.ContextDir}}
value: "{{.ContextDir}}"
- name: imageName
value: {{.FunctionImage}}
- name: registry
Expand Down
14 changes: 11 additions & 3 deletions pkg/pipelines/tekton/templates_s2i.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ spec:
workspaces:
- name: source
workspace: source-workspace
- name: cache
workspace: cache-workspace
- name: dockerconfig
workspace: dockerconfig-workspace
{{.RunAfterFetchSources}}
{{.FuncScaffoldTaskRef}}
- name: build
Expand Down Expand Up @@ -92,6 +96,10 @@ spec:
workspaces:
- name: source
workspace: source-workspace
- name: cache
workspace: cache-workspace
- name: dockerconfig
workspace: dockerconfig-workspace
workspaces:
- description: Directory where function source is located.
name: source-workspace
Expand Down Expand Up @@ -120,11 +128,11 @@ metadata:
spec:
params:
- name: gitRepository
value: {{.RepoUrl}}
value: "{{.RepoUrl}}"
- name: gitRevision
value: {{.Revision}}
- name: contextDir
value: {{.ContextDir}}
value: "{{.ContextDir}}"
- name: imageName
value: {{.FunctionImage}}
- name: registry
Expand Down Expand Up @@ -192,7 +200,7 @@ spec:
- name: gitRevision
value: {{.Revision}}
- name: contextDir
value: {{.ContextDir}}
value: "{{.ContextDir}}"
- name: imageName
value: {{.FunctionImage}}
- name: registry
Expand Down
Loading