This is an automated email from the ASF dual-hosted git repository.
ricardozanini pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-serverless-operator.git
The following commit(s) were added to refs/heads/main by this push:
new 5ef630e KOGITO-9819: [Operator image builder] Persistence not working
in the image produced by operator generated image (#261)
5ef630e is described below
commit 5ef630ef06983571c349e723a1f849fe460df0bc
Author: Walter Medvedeo <[email protected]>
AuthorDate: Thu Sep 21 20:15:13 2023 +0200
KOGITO-9819: [Operator image builder] Persistence not working in the image
produced by operator generated image (#261)
- Fixes the parameters construction for the kaniko builder which produced
the issue.
---
container-builder/builder/kubernetes/builder_kaniko_test.go | 4 ++++
container-builder/builder/kubernetes/kaniko.go | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/container-builder/builder/kubernetes/builder_kaniko_test.go
b/container-builder/builder/kubernetes/builder_kaniko_test.go
index 91f9a33..e914076 100644
--- a/container-builder/builder/kubernetes/builder_kaniko_test.go
+++ b/container-builder/builder/kubernetes/builder_kaniko_test.go
@@ -137,6 +137,9 @@ func TestNewBuildWithKanikoWithBuildArgsAndEnv(t
*testing.T) {
WithBuildArgs([]v1.EnvVar{{
Name: "QUARKUS_EXTENSIONS",
Value: "extension1,extension2",
+ }, {
+ Name: "MY_PROPERTY",
+ Value: "my_property_value",
}}).
WithEnvs([]v1.EnvVar{{
Name: "MYENV",
@@ -159,5 +162,6 @@ func TestNewBuildWithKanikoWithBuildArgsAndEnv(t
*testing.T) {
assert.NotNil(t, pod)
assert.Subset(t, pod.Spec.Containers[0].Args,
[]string{"--build-arg=QUARKUS_EXTENSIONS=extension1,extension2"})
+ assert.Subset(t, pod.Spec.Containers[0].Args,
[]string{"--build-arg=MY_PROPERTY=my_property_value"})
assert.Subset(t, pod.Spec.Containers[0].Env, []v1.EnvVar{{Name:
"MYENV", Value: "value"}})
}
diff --git a/container-builder/builder/kubernetes/kaniko.go
b/container-builder/builder/kubernetes/kaniko.go
index 5e63f12..2f4bf91 100644
--- a/container-builder/builder/kubernetes/kaniko.go
+++ b/container-builder/builder/kubernetes/kaniko.go
@@ -124,7 +124,9 @@ func addKanikoTaskToPod(ctx context.Context, c
client.Client, build *api.Contain
return err
}
if len(buildArgs) > 0 {
- args = append(args, fmt.Sprintf("%s=%s", kanikoBuildArgs,
strings.Join(buildArgs, ",")))
+ for _, buildArg := range buildArgs {
+ args = append(args, fmt.Sprintf("%s=%s",
kanikoBuildArgs, buildArg))
+ }
}
container := corev1.Container{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
