You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/01/25 17:19:13 UTC
[camel-k] branch master updated: Automatically apply defaults to
platform configuration #365
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new 673553d Automatically apply defaults to platform configuration #365
673553d is described below
commit 673553d081e363945abcfeffdde54ee6d915b376
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Fri Jan 25 17:33:30 2019 +0100
Automatically apply defaults to platform configuration #365
---
deploy/platform-cr.yaml | 5 -----
deploy/resources.go | 5 -----
pkg/controller/integrationplatform/initialize.go | 15 +++++++++++++++
pkg/platform/resources.go | 11 +++++++++++
4 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/deploy/platform-cr.yaml b/deploy/platform-cr.yaml
index 8f9b3e6..cdf13ff 100644
--- a/deploy/platform-cr.yaml
+++ b/deploy/platform-cr.yaml
@@ -4,8 +4,3 @@ metadata:
name: camel-k
labels:
app: "camel-k"
-spec:
- build:
- camelVersion: "2.23.1"
- baseImage: "fabric8/s2i-java:3.0-java8"
- localRepository: "/tmp/artifacts/m2"
diff --git a/deploy/resources.go b/deploy/resources.go
index 2a0028e..f6ffcff 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -3338,11 +3338,6 @@ metadata:
name: camel-k
labels:
app: "camel-k"
-spec:
- build:
- camelVersion: "2.23.1"
- baseImage: "fabric8/s2i-java:3.0-java8"
- localRepository: "/tmp/artifacts/m2"
`
Resources["platform-integration-context-groovy.yaml"] =
diff --git a/pkg/controller/integrationplatform/initialize.go b/pkg/controller/integrationplatform/initialize.go
index 865ecc3..5e99a20 100644
--- a/pkg/controller/integrationplatform/initialize.go
+++ b/pkg/controller/integrationplatform/initialize.go
@@ -95,7 +95,22 @@ func (action *initializeAction) Handle(ctx context.Context, platform *v1alpha1.I
// next status
target.Status.Phase = v1alpha1.IntegrationPlatformPhaseCreating
+ if target.Spec.Build.CamelVersion == "" {
+ target.Spec.Build.CamelVersion = platformutils.DefaultCamelVersion
+ }
+ if target.Spec.Build.BaseImage == "" {
+ target.Spec.Build.BaseImage = platformutils.DefaultBaseImage
+ }
+ if target.Spec.Build.LocalRepository == "" {
+ target.Spec.Build.LocalRepository = platformutils.DefaultLocalRepository
+ }
+
+ action.L.Infof("CamelVersion set to %s", target.Spec.Build.CamelVersion)
+ action.L.Infof("BaseImage set to %s", target.Spec.Build.BaseImage)
+ action.L.Infof("LocalRepository set to %s", target.Spec.Build.LocalRepository)
+
action.L.Info("IntegrationPlatform state transition", "phase", target.Status.Phase)
+
return action.client.Update(ctx, target)
}
diff --git a/pkg/platform/resources.go b/pkg/platform/resources.go
index a0b208b..993b591 100644
--- a/pkg/platform/resources.go
+++ b/pkg/platform/resources.go
@@ -19,6 +19,17 @@ package platform
import "strings"
+const (
+ // DefaultCamelVersion --
+ DefaultCamelVersion = "2.23.1"
+
+ // DefaultBaseImage --
+ DefaultBaseImage = "fabric8/s2i-java:3.0-java8"
+
+ // DefaultLocalRepository --
+ DefaultLocalRepository = "/tmp/artifacts/m2"
+)
+
// DefaultContexts --
var DefaultContexts = []string{
"platform-integration-context-jvm.yaml",