This is an automated email from the ASF dual-hosted git repository. nferraro 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 e9f37e3 Upgrade to Runtime 1.0.9 and Kaniko 0.14.0 e9f37e3 is described below commit e9f37e37ed775abcd4d5de2a1c5183a4a8572157 Author: Nicola Ferraro <ni.ferr...@gmail.com> AuthorDate: Thu Dec 19 18:29:39 2019 +0100 Upgrade to Runtime 1.0.9 and Kaniko 0.14.0 --- ...g-3.0.0-1.0.8.yaml => camel-catalog-3.0.0-1.0.9.yaml} | 6 +++--- ....8.yaml => camel-catalog-quarkus-1.0.0-M1-1.0.9.yaml} | 6 +++--- deploy/resources.go | 16 ++++++++-------- docs/modules/ROOT/pages/traits/quarkus.adoc | 4 ++++ pkg/util/defaults/defaults.go | 4 ++-- script/Makefile | 6 +++--- 6 files changed, 23 insertions(+), 19 deletions(-) diff --git a/deploy/camel-catalog-3.0.0-1.0.8.yaml b/deploy/camel-catalog-3.0.0-1.0.9.yaml similarity index 99% rename from deploy/camel-catalog-3.0.0-1.0.8.yaml rename to deploy/camel-catalog-3.0.0-1.0.9.yaml index 963f485..22c3eb8 100644 --- a/deploy/camel-catalog-3.0.0-1.0.8.yaml +++ b/deploy/camel-catalog-3.0.0-1.0.9.yaml @@ -18,15 +18,15 @@ apiVersion: camel.apache.org/v1 kind: CamelCatalog metadata: - name: camel-catalog-3.0.0-1.0.8 + name: camel-catalog-3.0.0-1.0.9 labels: app: camel-k camel.apache.org/catalog.version: 3.0.0 camel.apache.org/catalog.loader.version: 3.0.0 - camel.apache.org/runtime.version: 1.0.8 + camel.apache.org/runtime.version: 1.0.9 spec: version: 3.0.0 - runtimeVersion: 1.0.8 + runtimeVersion: 1.0.9 artifacts: camel-activemq: groupId: org.apache.camel diff --git a/deploy/camel-catalog-quarkus-1.0.0-M1-1.0.8.yaml b/deploy/camel-catalog-quarkus-1.0.0-M1-1.0.9.yaml similarity index 99% rename from deploy/camel-catalog-quarkus-1.0.0-M1-1.0.8.yaml rename to deploy/camel-catalog-quarkus-1.0.0-M1-1.0.9.yaml index d77a638..4ffa04f 100644 --- a/deploy/camel-catalog-quarkus-1.0.0-M1-1.0.8.yaml +++ b/deploy/camel-catalog-quarkus-1.0.0-M1-1.0.9.yaml @@ -18,16 +18,16 @@ apiVersion: camel.apache.org/v1 kind: CamelCatalog metadata: - name: camel-catalog-quarkus-1.0.0-m1-1.0.8 + name: camel-catalog-quarkus-1.0.0-m1-1.0.9 labels: app: camel-k camel.apache.org/catalog.version: 3.0.0 camel.apache.org/catalog.loader.version: 3.0.0 - camel.apache.org/runtime.version: 1.0.8 + camel.apache.org/runtime.version: 1.0.9 camel.apache.org/runtime.provider: quarkus spec: version: 3.0.0 - runtimeVersion: 1.0.8 + runtimeVersion: 1.0.9 runtimeProvider: quarkus: camelQuarkusVersion: 1.0.0-M1 diff --git a/deploy/resources.go b/deploy/resources.go index eb90634..cec53a4 100644 --- a/deploy/resources.go +++ b/deploy/resources.go @@ -243,7 +243,7 @@ metadata: app: "camel-k" ` - Resources["camel-catalog-3.0.0-1.0.8.yaml"] = + Resources["camel-catalog-3.0.0-1.0.9.yaml"] = ` # --------------------------------------------------------------------------- # Licensed to the Apache Software Foundation (ASF) under one or more @@ -265,15 +265,15 @@ metadata: apiVersion: camel.apache.org/v1 kind: CamelCatalog metadata: - name: camel-catalog-3.0.0-1.0.8 + name: camel-catalog-3.0.0-1.0.9 labels: app: camel-k camel.apache.org/catalog.version: 3.0.0 camel.apache.org/catalog.loader.version: 3.0.0 - camel.apache.org/runtime.version: 1.0.8 + camel.apache.org/runtime.version: 1.0.9 spec: version: 3.0.0 - runtimeVersion: 1.0.8 + runtimeVersion: 1.0.9 artifacts: camel-activemq: groupId: org.apache.camel @@ -3166,7 +3166,7 @@ spec: - org.apache.camel.component.zookeepermaster.MasterComponent ` - Resources["camel-catalog-quarkus-1.0.0-M1-1.0.8.yaml"] = + Resources["camel-catalog-quarkus-1.0.0-M1-1.0.9.yaml"] = ` # --------------------------------------------------------------------------- # Licensed to the Apache Software Foundation (ASF) under one or more @@ -3188,16 +3188,16 @@ spec: apiVersion: camel.apache.org/v1 kind: CamelCatalog metadata: - name: camel-catalog-quarkus-1.0.0-m1-1.0.8 + name: camel-catalog-quarkus-1.0.0-m1-1.0.9 labels: app: camel-k camel.apache.org/catalog.version: 3.0.0 camel.apache.org/catalog.loader.version: 3.0.0 - camel.apache.org/runtime.version: 1.0.8 + camel.apache.org/runtime.version: 1.0.9 camel.apache.org/runtime.provider: quarkus spec: version: 3.0.0 - runtimeVersion: 1.0.8 + runtimeVersion: 1.0.9 runtimeProvider: quarkus: camelQuarkusVersion: 1.0.0-M1 diff --git a/docs/modules/ROOT/pages/traits/quarkus.adoc b/docs/modules/ROOT/pages/traits/quarkus.adoc index ffe20e1..cd4b030 100755 --- a/docs/modules/ROOT/pages/traits/quarkus.adoc +++ b/docs/modules/ROOT/pages/traits/quarkus.adoc @@ -34,6 +34,10 @@ The following configuration options are available: | string | The Camel-Quarkus version to use for the integration +| quarkus.native +| bool +| The Quarkus runtime type (reserved for future use) + |=== // End of autogenerated code - DO NOT EDIT! (configuration) diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go index 928df10..7f88f56 100644 --- a/pkg/util/defaults/defaults.go +++ b/pkg/util/defaults/defaults.go @@ -29,7 +29,7 @@ const ( DefaultCamelVersion = "3.0.0" // DefaultRuntimeVersion -- - DefaultRuntimeVersion = "1.0.8" + DefaultRuntimeVersion = "1.0.9" // DefaultCamelQuarkusVersion -- DefaultCamelQuarkusVersion = "1.0.0-M1" @@ -38,7 +38,7 @@ const ( DefaultQuarkusVersion = "1.0.1.Final" // KanikoVersion -- - KanikoVersion = "0.9.0" + KanikoVersion = "0.14.0" // BaseImage -- BaseImage = "fabric8/s2i-java:3.0-java8" diff --git a/script/Makefile b/script/Makefile index 3e75d44..163bcf6 100644 --- a/script/Makefile +++ b/script/Makefile @@ -16,11 +16,11 @@ VERSIONFILE := pkg/util/defaults/defaults.go VERSION := 1.0.0-RC1-SNAPSHOT LAST_RELEASED_VERSION := 1.0.0-M4 -RUNTIME_VERSION := 1.0.8 +RUNTIME_VERSION := 1.0.9 CAMEL_VERSION := 3.0.0 CAMEL_QUARKUS_VERSION := 1.0.0-M1 QUARKUS_VERSION := 1.0.1.Final -KANIKO_VERSION := 0.9.0 +KANIKO_VERSION := 0.14.0 BASE_IMAGE := fabric8/s2i-java:3.0-java8 LOCAL_REPOSITORY := /tmp/artifacts/m2 IMAGE_NAME := docker.io/apache/camel-k @@ -32,7 +32,7 @@ LINT_DEADLINE := 5m # Used to push pre-relase artifacts STAGING_IMAGE_NAME := docker.io/camelk/camel-k -STAGING_RUNTIME_REPO := https://repository.apache.org/content/repositories/orgapachecamel-1166 +STAGING_RUNTIME_REPO := https://repository.apache.org/content/repositories/orgapachecamel-1168 # When packaging artifacts into the docker image, you can "copy" them from local maven # or "download" them from Apache Snapshots and Maven Central