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/03/11 22:53:17 UTC
[camel-k] branch master updated: chore(runtime): update to runtime
v0.3.1
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 1ae4f9b chore(runtime): update to runtime v0.3.1
1ae4f9b is described below
commit 1ae4f9b8e0a0339cd9a9cbd5485ca6eb95351d5c
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Mon Mar 11 23:02:36 2019 +0100
chore(runtime): update to runtime v0.3.1
---
assets/json-schema/IntegrationPlatform.json | 27 ++++++++++++++++++++-------
deploy/camel-catalog-2.23.0.yaml | 6 ++++++
deploy/camel-catalog-2.23.1.yaml | 6 ++++++
deploy/resources.go | 12 ++++++++++++
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 2 +-
6 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/assets/json-schema/IntegrationPlatform.json b/assets/json-schema/IntegrationPlatform.json
index b5cd364..a8b091e 100644
--- a/assets/json-schema/IntegrationPlatform.json
+++ b/assets/json-schema/IntegrationPlatform.json
@@ -132,9 +132,6 @@
"localRepository": {
"type": "string"
},
- "organization": {
- "type": "string"
- },
"properties": {
"patternProperties": {
".*": {
@@ -146,11 +143,9 @@
"publishStrategy": {
"type": "string"
},
- "pushSecret": {
- "type": "string"
- },
"registry": {
- "type": "string"
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "$ref": "#/definitions/IntegrationPlatformRegistrySpec"
},
"repositories": {
"items": {
@@ -165,6 +160,24 @@
"additionalProperties": false,
"type": "object"
},
+ "IntegrationPlatformRegistrySpec": {
+ "properties": {
+ "address": {
+ "type": "string"
+ },
+ "insecure": {
+ "type": "boolean"
+ },
+ "organization": {
+ "type": "string"
+ },
+ "secret": {
+ "type": "string"
+ }
+ },
+ "additionalProperties": false,
+ "type": "object"
+ },
"IntegrationPlatformResourcesSpec": {
"properties": {
"contexts": {
diff --git a/deploy/camel-catalog-2.23.0.yaml b/deploy/camel-catalog-2.23.0.yaml
index 634d641..faccf3b 100644
--- a/deploy/camel-catalog-2.23.0.yaml
+++ b/deploy/camel-catalog-2.23.0.yaml
@@ -1113,6 +1113,12 @@ spec:
dependencies:
- groupId: org.apache.camel
artifactId: camel-groovy
+ camel-k-runtime-health:
+ groupId: org.apache.camel.k
+ artifactId: camel-k-runtime-health
+ dependencies:
+ - groupId: org.apache.camel
+ artifactId: camel-netty4-http
camel-k-runtime-jvm:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-jvm
diff --git a/deploy/camel-catalog-2.23.1.yaml b/deploy/camel-catalog-2.23.1.yaml
index 5eb60ca..8e088e1 100644
--- a/deploy/camel-catalog-2.23.1.yaml
+++ b/deploy/camel-catalog-2.23.1.yaml
@@ -1113,6 +1113,12 @@ spec:
dependencies:
- groupId: org.apache.camel
artifactId: camel-groovy
+ camel-k-runtime-health:
+ groupId: org.apache.camel.k
+ artifactId: camel-k-runtime-health
+ dependencies:
+ - groupId: org.apache.camel
+ artifactId: camel-netty4-http
camel-k-runtime-jvm:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-jvm
diff --git a/deploy/resources.go b/deploy/resources.go
index 504e9ec..aed931b 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -1157,6 +1157,12 @@ spec:
dependencies:
- groupId: org.apache.camel
artifactId: camel-groovy
+ camel-k-runtime-health:
+ groupId: org.apache.camel.k
+ artifactId: camel-k-runtime-health
+ dependencies:
+ - groupId: org.apache.camel
+ artifactId: camel-netty4-http
camel-k-runtime-jvm:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-jvm
@@ -3227,6 +3233,12 @@ spec:
dependencies:
- groupId: org.apache.camel
artifactId: camel-groovy
+ camel-k-runtime-health:
+ groupId: org.apache.camel.k
+ artifactId: camel-k-runtime-health
+ dependencies:
+ - groupId: org.apache.camel
+ artifactId: camel-netty4-http
camel-k-runtime-jvm:
groupId: org.apache.camel.k
artifactId: camel-k-runtime-jvm
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 76d2ebe..0d88bc5 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -12,7 +12,7 @@ const (
CamelVersionConstraint = "~2.23.x"
// RuntimeVersion --
- RuntimeVersion = "0.3.0"
+ RuntimeVersion = "0.3.1"
// BaseImage --
BaseImage = "fabric8/s2i-java:3.0-java8"
diff --git a/script/Makefile b/script/Makefile
index f584eb3..b3c7dcd 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -1,6 +1,6 @@
VERSIONFILE := pkg/util/defaults/defaults.go
VERSION := 0.3.1-SNAPSHOT
-RUNTIME_VERSION := 0.3.0
+RUNTIME_VERSION := 0.3.1
CAMEL_VERSION := 2.23.1
CAMEL_VERSION_CONSTRAINT := ~2.23.x
BASE_IMAGE := fabric8/s2i-java:3.0-java8