File tree Expand file tree Collapse file tree 2 files changed +21
-4
lines changed Expand file tree Collapse file tree 2 files changed +21
-4
lines changed Original file line number Diff line number Diff line change @@ -33,7 +33,7 @@ LDFLAGS := -X knative.dev/func/pkg/app.vers=$(VERS) -X knative.dev/func/pkg
33
33
FUNC_UTILS_IMG ?= ghcr.io/knative/func-utils:v2
34
34
LDFLAGS += -X knative.dev/func/pkg/k8s.SocatImage=$(FUNC_UTILS_IMG )
35
35
LDFLAGS += -X knative.dev/func/pkg/k8s.TarImage=$(FUNC_UTILS_IMG )
36
- LDFLAGS += -X knative.dev/func/pkg/pipelines/tekton.DeployerImage =$(FUNC_UTILS_IMG )
36
+ LDFLAGS += -X knative.dev/func/pkg/pipelines/tekton.FuncUtilImage =$(FUNC_UTILS_IMG )
37
37
38
38
GOFLAGS := "-ldflags=$(LDFLAGS ) "
39
39
export GOFLAGS
Original file line number Diff line number Diff line change @@ -5,7 +5,24 @@ import (
5
5
"strings"
6
6
)
7
7
8
- var DeployerImage = "ghcr.io/knative/func-utils:v2"
8
+ var (
9
+ FuncUtilImage = "ghcr.io/knative/func-utils:v2"
10
+ DeployerImage string
11
+ ScaffoldImage string
12
+ S2IImage string
13
+ )
14
+
15
+ func init () {
16
+ if DeployerImage == "" {
17
+ DeployerImage = FuncUtilImage
18
+ }
19
+ if ScaffoldImage == "" {
20
+ ScaffoldImage = FuncUtilImage
21
+ }
22
+ if S2IImage == "" {
23
+ S2IImage = FuncUtilImage
24
+ }
25
+ }
9
26
10
27
func getBuildpackTask () string {
11
28
return `apiVersion: tekton.dev/v1
@@ -371,7 +388,7 @@ spec:
371
388
name: gen-source
372
389
- emptyDir: {}
373
390
name: env-vars
374
- ` , DeployerImage )
391
+ ` , S2IImage )
375
392
}
376
393
377
394
func getDeployTask () string {
@@ -430,7 +447,7 @@ spec:
430
447
- name: func-scaffold
431
448
image: %s
432
449
command: ["scaffold", "$(params.path)"]
433
- ` , DeployerImage )
450
+ ` , ScaffoldImage )
434
451
}
435
452
436
453
// GetClusterTasks returns multi-document yaml containing tekton tasks used by func.
You can’t perform that action at this time.
0 commit comments