You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/06/28 06:47:14 UTC
[camel-k] 07/07: fix(builder): fallback to strategy to pod when Buildah/Kaniko
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e45d26b3d10eed5dc56e9791653580363985393d
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Jun 27 14:33:12 2023 +0200
fix(builder): fallback to strategy to pod when Buildah/Kaniko
---
pkg/platform/defaults.go | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/pkg/platform/defaults.go b/pkg/platform/defaults.go
index 8f694f48f..7504c195b 100644
--- a/pkg/platform/defaults.go
+++ b/pkg/platform/defaults.go
@@ -82,7 +82,18 @@ func ConfigureDefaults(ctx context.Context, c client.Client, p *v1.IntegrationPl
}
if p.Status.Build.BuildConfiguration.Strategy == "" {
- p.Status.Build.BuildConfiguration.Strategy = v1.BuildStrategyRoutine
+ defaultStrategy := v1.BuildStrategyRoutine
+ if p.Status.Build.PublishStrategy == v1.IntegrationPlatformBuildPublishStrategyBuildah ||
+ p.Status.Build.PublishStrategy == v1.IntegrationPlatformBuildPublishStrategyKaniko {
+ defaultStrategy = v1.BuildStrategyPod
+ log.Infof("Integration Platform %s [%s]: setting fallback build strategy %s because PublishStrategy is configured as %s",
+ p.Name,
+ p.Namespace,
+ defaultStrategy,
+ p.Status.Build.PublishStrategy,
+ )
+ }
+ p.Status.Build.BuildConfiguration.Strategy = defaultStrategy
log.Debugf("Integration Platform %s [%s]: setting build strategy %s", p.Name, p.Namespace, p.Status.Build.BuildConfiguration.Strategy)
}