fix: s2i on cluster build of Quarkus functions (#1233)

Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com>

Signed-off-by: Zbynek Roubalik <zroubalik@gmail.com>
This commit is contained in:
Zbynek Roubalik 2022-09-12 22:54:47 +02:00 committed by GitHub
parent 427d453f81
commit d9ffaa944e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 0 deletions

View File

@ -37,6 +37,9 @@ spec:
type: array
description: Environment variables to set during _build-time_.
default: []
- name: S2I_IMAGE_SCRIPTS_URL
description: The URL containing the default assemble and run scripts for the builder image.
default: "image:///usr/libexec/s2i"
workspaces:
- name: source
- name: sslcertdir
@ -69,6 +72,7 @@ spec:
echo "------------------------------"
/usr/local/bin/s2i --loglevel=$(params.LOGLEVEL) build $(params.PATH_CONTEXT) $(params.BUILDER_IMAGE) \
--image-scripts-url $(params.S2I_IMAGE_SCRIPTS_URL) \
--as-dockerfile /gen-source/Dockerfile.gen --environment-file /env-vars/env-file
volumeMounts:
- mountPath: /gen-source

View File

@ -85,6 +85,10 @@ func generatePipeline(f fn.Function, labels map[string]string) *pplnv1beta1.Pipe
} else if f.Builder == builders.S2I {
// ----- S2I build related properties
params = append(params, pplnv1beta1.ParamSpec{Name: "s2iImageScriptsUrl", Description: "URL containing the default assemble and run scripts for the builder image.",
Default: pplnv1beta1.NewArrayOrString("image:///usr/libexec/s2i")})
taskBuild = taskS2iBuild(taskNameFetchSources)
referenceImageFromPreviousTaskResults = true
}
@ -194,6 +198,10 @@ func generatePipelineRun(f fn.Function, labels map[string]string) *pplnv1beta1.P
},
SubPath: "cache",
})
} else if f.Builder == builders.S2I {
if f.Runtime == "quarkus" {
params = append(params, pplnv1beta1.Param{Name: "s2iImageScriptsUrl", Value: *pplnv1beta1.NewArrayOrString("image:///usr/local/s2i")})
}
}
// ----- PipelineRun definition

View File

@ -70,6 +70,7 @@ func taskS2iBuild(runAfter string) pplnv1beta1.PipelineTask {
Type: pplnv1beta1.ParamTypeArray,
ArrayVal: []string{"$(params.buildEnvs[*])"},
}},
{Name: "S2I_IMAGE_SCRIPTS_URL", Value: *pplnv1beta1.NewArrayOrString("$(params.s2iImageScriptsUrl)")},
}
return pplnv1beta1.PipelineTask{
Name: taskNameBuild,