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 bcbcb57 Use Quarkus as default runtime (#1609)
bcbcb57 is described below
commit bcbcb575e5c284ab22704d42c2d5acc878a633fe
Author: Nicola Ferraro <ni.ferr...@gmail.com>
AuthorDate: Sat Sep 19 07:12:55 2020 +0200
Use Quarkus as default runtime (#1609)
* Fix #1513: upgrade to runtime 1.4.0 and use Quarkus as default
* Fix #1513: enable quarkus trait by default
* Fix #1513: fix e2e tests
* Fix #1513: rebase to master
Fix #1670: restore catalog
* Fix #1513: update runtime and tests
* Fix #1513: use master capability
* Fix #1513: refresh resources
* Fix #1604: remove support for default kits
* Fix #1604: remove support for default kits
* Fix #1604: regen catalog
* Fix #1604: refactor kit test
* Fix #1604: fix failing test
* Fix #1604: re-enable test
---
addons/master/master.go | 2 +-
addons/tracing/tracing_test.go | 4 +-
deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml | 4 +-
deploy/platform-integration-kit-groovy.yaml | 30 ----
deploy/platform-integration-kit-java.yaml | 30 ----
deploy/platform-integration-kit-js.yaml | 30 ----
deploy/platform-integration-kit-knative.yaml | 30 ----
deploy/platform-integration-kit-kotlin.yaml | 30 ----
deploy/platform-integration-kit-main.yaml | 29 ----
deploy/platform-integration-kit-xml.yaml | 30 ----
deploy/platform-integration-kit-yaml.yaml | 30 ----
deploy/resources.go | 72 +--------
deploy/traits.yaml | 2 +-
docs/modules/traits/pages/quarkus.adoc | 2 +-
e2e/builder/build_test.go | 39 ++---
e2e/common/files/RestConsumer.java | 2 +-
e2e/common/install_test.go | 5 +-
e2e/common/platformless_run_test.go | 4 +-
e2e/common/rest_test.go | 2 +-
pkg/apis/camel/v1/common_types.go | 2 +
pkg/apis/camel/v1/integrationplatform_types.go | 1 -
pkg/apis/camel/v1/zz_generated.deepcopy.go | 7 +-
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 5 +
pkg/cmd/describe_platform.go | 11 --
pkg/cmd/install.go | 9 --
pkg/controller/integrationplatform/create.go | 25 ----
pkg/metadata/metadata_capabilities_test.go | 4 +-
pkg/metadata/metadata_dependencies_test.go | 181 +++++++++++------------
pkg/metadata/metadata_http_test.go | 6 +-
pkg/trait/camel_test.go | 4 +-
pkg/trait/container_probes_test.go | 2 +-
pkg/trait/cron_test.go | 6 +-
pkg/trait/dependencies_test.go | 46 +++---
pkg/trait/jvm_test.go | 12 +-
pkg/trait/knative_test.go | 4 +-
pkg/trait/prometheus_test.go | 2 +-
pkg/trait/quarkus.go | 4 +-
pkg/trait/service_test.go | 6 +-
pkg/trait/trait_test.go | 6 +-
pkg/util/camel/catalog.go | 5 +
pkg/util/source/inspector_yaml_test.go | 2 +-
script/travis_build.sh | 2 +-
42 files changed, 182 insertions(+), 547 deletions(-)
diff --git a/addons/master/master.go b/addons/master/master.go
index 967a5f0..bd69f22 100644
--- a/addons/master/master.go
+++ b/addons/master/master.go
@@ -124,7 +124,7 @@ func (t *masterTrait) Configure(e *trait.Environment)
(bool, error) {
func (t *masterTrait) Apply(e *trait.Environment) error {
if e.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
- util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies,
"mvn:org.apache.camel.k/camel-k-runtime-master")
+ util.StringSliceUniqueAdd(&e.Integration.Status.Capabilities,
v1.CapabilityMaster)
// Master sub endpoints need to be added to the list of
dependencies
for _, dep := range t.delegateDependencies {
diff --git a/addons/tracing/tracing_test.go b/addons/tracing/tracing_test.go
index 96ca852..2aad336 100644
--- a/addons/tracing/tracing_test.go
+++ b/addons/tracing/tracing_test.go
@@ -28,7 +28,7 @@ import (
)
func TestTracingTrait(t *testing.T) {
- e := createEnvironment(t, camel.DefaultCatalog)
+ e := createEnvironment(t, camel.MainCatalog)
tracing := NewTracingTrait()
enabled := true
tracing.(*tracingTrait).Enabled = &enabled
@@ -48,7 +48,7 @@ func TestTracingTrait(t *testing.T) {
}
func TestTracingTraitFullConfig(t *testing.T) {
- e := createEnvironment(t, camel.DefaultCatalog)
+ e := createEnvironment(t, camel.MainCatalog)
tracing := NewTracingTrait()
enabled := true
tracing.(*tracingTrait).Enabled = &enabled
diff --git a/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml
b/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml
index 6a4b50a..ebd0118 100644
--- a/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml
+++ b/deploy/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml
@@ -66,8 +66,8 @@ spec:
artifactId: camel-quarkus-opentracing
master:
dependencies:
- - groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-master
+ - groupId: org.apache.camel.k
+ artifactId: camel-k-quarkus-master
artifacts:
camel-quarkus-aws2-ses:
groupId: org.apache.camel.quarkus
diff --git a/deploy/platform-integration-kit-groovy.yaml
b/deploy/platform-integration-kit-groovy.yaml
deleted file mode 100644
index b525c58..0000000
--- a/deploy/platform-integration-kit-groovy.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: IntegrationKit
-metadata:
- name: groovy
- labels:
- app: "camel-k"
- camel.apache.org/created.by.kind: Operator
- camel.apache.org/created.by.name: camel-k-operator
- camel.apache.org/kit.type: platform
-spec:
- dependencies:
- - mvn:org.apache.camel.k/camel-k-runtime-main
- - mvn:org.apache.camel.k/camel-k-loader-groovy
\ No newline at end of file
diff --git a/deploy/platform-integration-kit-java.yaml
b/deploy/platform-integration-kit-java.yaml
deleted file mode 100644
index 511ce4f..0000000
--- a/deploy/platform-integration-kit-java.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: IntegrationKit
-metadata:
- name: java
- labels:
- app: "camel-k"
- camel.apache.org/created.by.kind: Operator
- camel.apache.org/created.by.name: camel-k-operator
- camel.apache.org/kit.type: platform
-spec:
- dependencies:
- - mvn:org.apache.camel.k/camel-k-runtime-main
- - mvn:org.apache.camel.k/camel-k-loader-java
\ No newline at end of file
diff --git a/deploy/platform-integration-kit-js.yaml
b/deploy/platform-integration-kit-js.yaml
deleted file mode 100644
index 6187905..0000000
--- a/deploy/platform-integration-kit-js.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: IntegrationKit
-metadata:
- name: js
- labels:
- app: "camel-k"
- camel.apache.org/created.by.kind: Operator
- camel.apache.org/created.by.name: camel-k-operator
- camel.apache.org/kit.type: platform
-spec:
- dependencies:
- - mvn:org.apache.camel.k/camel-k-runtime-main
- - mvn:org.apache.camel.k/camel-k-loader-js
\ No newline at end of file
diff --git a/deploy/platform-integration-kit-knative.yaml
b/deploy/platform-integration-kit-knative.yaml
deleted file mode 100644
index 74fc176..0000000
--- a/deploy/platform-integration-kit-knative.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: IntegrationKit
-metadata:
- name: knative
- labels:
- app: "camel-k"
- camel.apache.org/created.by.kind: Operator
- camel.apache.org/created.by.name: camel-k-operator
- camel.apache.org/kit.type: platform
-spec:
- dependencies:
- - mvn:org.apache.camel.k/camel-k-runtime-main
- - mvn:org.apache.camel.k/camel-k-runtime-knative
\ No newline at end of file
diff --git a/deploy/platform-integration-kit-kotlin.yaml
b/deploy/platform-integration-kit-kotlin.yaml
deleted file mode 100644
index 44f5819..0000000
--- a/deploy/platform-integration-kit-kotlin.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: IntegrationKit
-metadata:
- name: kotlin
- labels:
- app: "camel-k"
- camel.apache.org/created.by.kind: Operator
- camel.apache.org/created.by.name: camel-k-operator
- camel.apache.org/kit.type: platform
-spec:
- dependencies:
- - mvn:org.apache.camel.k/camel-k-runtime-main
- - mvn:org.apache.camel.k/camel-k-loader-kotlin
\ No newline at end of file
diff --git a/deploy/platform-integration-kit-main.yaml
b/deploy/platform-integration-kit-main.yaml
deleted file mode 100644
index 0b5cfb9..0000000
--- a/deploy/platform-integration-kit-main.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: IntegrationKit
-metadata:
- name: main
- labels:
- app: "camel-k"
- camel.apache.org/created.by.kind: Operator
- camel.apache.org/created.by.name: camel-k-operator
- camel.apache.org/kit.type: platform
-spec:
- dependencies:
- - mvn:org.apache.camel.k/camel-k-runtime-main
\ No newline at end of file
diff --git a/deploy/platform-integration-kit-xml.yaml
b/deploy/platform-integration-kit-xml.yaml
deleted file mode 100644
index ab1de23..0000000
--- a/deploy/platform-integration-kit-xml.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: IntegrationKit
-metadata:
- name: xml
- labels:
- app: "camel-k"
- camel.apache.org/created.by.kind: Operator
- camel.apache.org/created.by.name: camel-k-operator
- camel.apache.org/kit.type: platform
-spec:
- dependencies:
- - mvn:org.apache.camel.k/camel-k-runtime-main
- - mvn:org.apache.camel.k/camel-k-loader-js
\ No newline at end of file
diff --git a/deploy/platform-integration-kit-yaml.yaml
b/deploy/platform-integration-kit-yaml.yaml
deleted file mode 100644
index 1b4b0f4..0000000
--- a/deploy/platform-integration-kit-yaml.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-
-apiVersion: camel.apache.org/v1
-kind: IntegrationKit
-metadata:
- name: yaml
- labels:
- app: "camel-k"
- camel.apache.org/created.by.kind: Operator
- camel.apache.org/created.by.name: camel-k-operator
- camel.apache.org/kit.type: platform
-spec:
- dependencies:
- - mvn:org.apache.camel.k/camel-k-runtime-main
- - mvn:org.apache.camel.k/camel-k-loader-yaml
\ No newline at end of file
diff --git a/deploy/resources.go b/deploy/resources.go
index 71d31a1..3992cd2 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -98,9 +98,9 @@ var assets = func() http.FileSystem {
"/camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml":
&vfsgen۰CompressedFileInfo{
name:
"camel-catalog-1.5.1-SNAPSHOT-quarkus.yaml",
modTime: time.Time{},
- uncompressedSize: 87989,
+ uncompressedSize: 87985,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5d\x57\xdc\x38\xd2\xff\x7d\x3e\x85\xcf\xe4\xe6\x79\xce\x7f\xad\x9d\x21\xbb\x3b\x7b\xe6\x7f\x05\x4d\x48\x20\x40\x48\xcc\x26\xd9\xbd\x99\xa3\xb6\xd5\xdd\xa2\x6d\xcb\x48\xea\x06\xf2\xe9\x9f\xa3\x17\xbf\xb6\x29\xbf\x20\xb1\x5c\x60\xbb\x55\xfa\x95\x55\x92\xa5\x52\xa9\x54\x7a\x1b\x84\xee\xfe\xde\xbc\x0d\x2e\x69\x4c\x72\x41\x92\x40\xb2\x40\x6e\x48\x70\x5c\xe0\x78\x43\x82\x88\xad\xe4\x03\xe6\x24\x38\x63\xbb\x3c\xc1\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5d\x57\xdc\x38\xd2\xff\x7d\x3e\x85\xcf\xe4\xe6\x79\xce\x7f\xad\x9d\x21\xbb\x3b\x7b\xe6\x7f\x05\x4d\x48\x20\x40\x48\xcc\x26\xd9\xbd\x99\xa3\xb6\xd5\xdd\xa2\x6d\xcb\x48\xea\x06\xf2\xe9\x9f\xa3\x17\xbf\xb6\x29\xbf\x20\xb1\x5c\x60\xbb\x55\xfa\x95\x55\x92\xa5\x52\xa9\x54\x7a\x1b\x84\xee\xfe\xde\xbc\x0d\x2e\x69\x4c\x72\x41\x92\x40\xb2\x40\x6e\x48\x70\x5c\xe0\x78\x43\x82\x88\xad\xe4\x03\xe6\x24\x38\x63\xbb\x3c\xc1\x
[...]
},
"/cr-example.yaml": &vfsgen۰CompressedFileInfo{
name: "cr-example.yaml",
@@ -256,62 +256,6 @@ var assets = func() http.FileSystem {
compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xcd\x6e\xdb\x3c\x10\xbc\xf3\x29\x06\xd6\x25\x01\x1c\xfb\xfb\x7a\x74\x4f\x6a\x62\xa3\x42\x03\xb9\x88\x9c\x06\x39\xae\xa5\xb5\xb4\x08\x45\xaa\x24\x15\xc5\x6f\x5f\x50\x96\x1b\x07\xbd\x86\x37\x81\xcb\xf9\xd9\x19\x25\xb8\xf9\xbc\xa3\x12\xdc\x4b\xc9\xc6\x73\x85\x60\x11\x1a\x46\xda\x51\xd9\x30\x0a\x7b\x08\x03\x39\xc6\xc6\xf6\xa6\xa2\x20\xd6\xe0\x2a\x2d\x36\xd7\xe8\x4d\xc5\x0e\xd6\x30\xac\x43\x6b\x1d\xab\x04\xa5\x35\x
[...]
},
- "/platform-integration-kit-groovy.yaml":
&vfsgen۰CompressedFileInfo{
- name:
"platform-integration-kit-groovy.yaml",
- modTime: time.Time{},
- uncompressedSize: 1310,
-
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x8f\xdb\x36\x10\xbd\xf3\x57\x3c\x58\x97\x04\x58\xcb\x6d\x8f\xee\xc9\xdd\xec\xa2\x42\x02\x1b\x58\x39\x0d\x72\x1c\x8b\x63\x79\x60\x89\x64\x87\xd4\x2a\xfe\xf7\x05\x25\xbb\x71\x10\xa0\xcd\x21\xbc\x49\x9c\x79\x1f\xf3\x86\x05\x96\x3f\xef\x98\x02\x1f\xa4\x61\x17\xd9\x22\x79\xa4\x13\x63\x13\xa8\x39\x31\x6a\x7f\x4c\x23\x29\xe3\xd9\x0f\xce\x52\x12\xef\xf0\x66\x53\x3f\xbf\xc5\xe0\x2c\x2b\xbc\x63\x78\x45\xef\x95\x4d\x
[...]
- },
- "/platform-integration-kit-java.yaml":
&vfsgen۰CompressedFileInfo{
- name: "platform-integration-kit-java.yaml",
- modTime: time.Time{},
- uncompressedSize: 1306,
-
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x8f\xdb\x36\x10\xbd\xf3\x57\x3c\x58\x97\x04\xb0\xe5\xb6\x47\xf5\xe4\x6e\x6c\x54\x48\x60\x03\x2b\xa7\x41\x8e\x63\x71\x2c\x4d\x2d\x91\x2c\x49\x59\xf1\xbf\x2f\x28\xdb\x5d\x2f\x16\x68\x7b\x58\xde\x44\xcd\xbc\x8f\x79\xc3\x0c\x8b\xf7\x3b\x2a\xc3\x17\xa9\xd9\x04\xd6\x88\x16\xb1\x65\xac\x1c\xd5\x2d\xa3\xb2\xc7\x38\x92\x67\x6c\xec\x60\x34\x45\xb1\x06\x1f\x56\xd5\xe6\x23\x06\xa3\xd9\xc3\x1a\x86\xf5\xe8\xad\x67\x95\x
[...]
- },
- "/platform-integration-kit-js.yaml": &vfsgen۰CompressedFileInfo{
- name: "platform-integration-kit-js.yaml",
- modTime: time.Time{},
- uncompressedSize: 1302,
-
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x8f\xdb\x36\x10\xbd\xf3\x57\x3c\x58\x97\x04\xb0\xe5\xb6\x47\xf5\xe4\x6e\x6c\x54\x48\x60\x03\x2b\xa7\x41\x8e\x63\x71\x2c\x4d\x2c\x91\x2c\x49\xad\xd6\xff\xbe\xa0\x6c\x77\xbd\x58\xa0\xcd\x61\x79\x13\x35\xf3\x3e\xe6\x0d\x33\x2c\xde\xef\xa8\x0c\x5f\xa4\x66\x13\x58\x23\x5a\xc4\x96\xb1\x72\x54\xb7\x8c\xca\x1e\xe3\x48\x9e\xb1\xb1\x83\xd1\x14\xc5\x1a\x7c\x58\x55\x9b\x8f\x18\x8c\x66\x0f\x6b\x18\xd6\xa3\xb7\x9e\x55\x
[...]
- },
- "/platform-integration-kit-knative.yaml":
&vfsgen۰CompressedFileInfo{
- name:
"platform-integration-kit-knative.yaml",
- modTime: time.Time{},
- uncompressedSize: 1313,
-
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xcd\xce\xdb\x36\x10\xbc\xf3\x29\x06\xd6\x25\x01\x6c\xb9\xed\x51\x3d\xb9\x5f\x6c\x54\x48\x60\x03\x9f\x9c\x06\x39\xae\xc5\xb5\xb4\xb0\x44\xb2\x24\x65\xc5\x6f\x5f\x50\x96\x1b\x07\x01\x5a\x04\x08\x6f\x12\x77\xe7\x67\x67\x99\x61\xf5\xf3\x8e\xca\xf0\x41\x6a\x36\x81\x35\xa2\x45\x6c\x19\x1b\x47\x75\xcb\xa8\xec\x39\x8e\xe4\x19\x3b\x3b\x18\x4d\x51\xac\xc1\x9b\x4d\xb5\x7b\x8b\xc1\x68\xf6\xb0\x86\x61\x3d\x7a\xeb\x59\x65\x
[...]
- },
- "/platform-integration-kit-kotlin.yaml":
&vfsgen۰CompressedFileInfo{
- name:
"platform-integration-kit-kotlin.yaml",
- modTime: time.Time{},
- uncompressedSize: 1310,
-
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x8f\xdb\x36\x10\xbd\xf3\x57\x3c\x58\x97\x04\x58\xcb\x6d\x8f\xea\xc9\xdd\xec\xa2\x42\x02\x1b\x58\x39\x0d\x72\x1c\x8b\x63\x69\x60\x8a\x64\x49\x6a\x15\xff\xfb\x82\x92\xdd\x38\x08\xd0\xe6\x10\xde\x24\xce\xbc\x8f\x79\xc3\x02\xeb\x9f\x77\x54\x81\x0f\xd2\xb2\x8d\xac\x91\x1c\x52\xcf\xd8\x7a\x6a\x7b\x46\xe3\x4e\x69\xa2\xc0\x78\x76\xa3\xd5\x94\xc4\x59\xbc\xd9\x36\xcf\x6f\x31\x5a\xcd\x01\xce\x32\x5c\xc0\xe0\x02\xab\x
[...]
- },
- "/platform-integration-kit-main.yaml":
&vfsgen۰CompressedFileInfo{
- name: "platform-integration-kit-main.yaml",
- modTime: time.Time{},
- uncompressedSize: 1257,
-
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x6f\xe3\x36\x10\xbd\xf3\x57\x3c\x58\x97\x5d\xc0\x96\xdb\x1e\xd5\x93\x9b\xb5\x51\x61\x17\x36\x10\x79\x1b\xe4\x38\x16\xc7\xd2\xc0\x12\xc9\x92\x54\x14\xff\xfb\x82\xb2\xdd\x38\x08\xd0\x5e\xc2\x9b\xa8\xe1\xfb\xe0\x7b\xcc\xb0\xf8\xbc\xa5\x32\xfc\x90\x9a\x4d\x60\x8d\x68\x11\x5b\xc6\xca\x51\xdd\x32\x2a\x7b\x8c\x23\x79\xc6\xc6\x0e\x46\x53\x14\x6b\xf0\x65\x55\x6d\xbe\x62\x30\x9a\x3d\xac\x61\x58\x8f\xde\x7a\x56\x19\x
[...]
- },
- "/platform-integration-kit-xml.yaml":
&vfsgen۰CompressedFileInfo{
- name: "platform-integration-kit-xml.yaml",
- modTime: time.Time{},
- uncompressedSize: 1303,
-
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x8f\xdb\x36\x10\xbd\xf3\x57\x3c\x58\x97\x04\x58\xcb\x6d\x8f\xea\xc9\xdd\xac\x51\x21\x81\x0d\xac\x9c\x06\x39\x8e\xc5\xb1\x34\x35\x45\xb2\x24\xb5\x5a\xff\xfb\x82\xb2\xdd\x38\x08\xd0\xf6\xb0\xbc\x89\x9a\x79\x1f\xf3\x86\x05\x96\x6f\x77\x54\x81\x4f\xd2\xb2\x8d\xac\x91\x1c\x52\xcf\x58\x7b\x6a\x7b\x46\xe3\x8e\x69\xa2\xc0\xd8\xb8\xd1\x6a\x4a\xe2\x2c\xde\xad\x9b\xcd\x7b\x8c\x56\x73\x80\xb3\x0c\x17\x30\xb8\xc0\xaa\x
[...]
- },
- "/platform-integration-kit-yaml.yaml":
&vfsgen۰CompressedFileInfo{
- name: "platform-integration-kit-yaml.yaml",
- modTime: time.Time{},
- uncompressedSize: 1306,
-
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x8f\xdb\x36\x10\xbd\xf3\x57\x3c\x58\x97\x04\x58\xcb\x6d\x8f\xea\xc9\xdd\xd8\xa8\x90\xc0\x06\x56\x4e\x83\x1c\xc7\xe2\x58\x1a\x98\x22\x59\x92\x5a\xc5\xff\xbe\xa0\x6c\x37\x0e\x02\xb4\x39\x84\x37\x51\x33\xef\x63\xde\xb0\xc0\xf2\xe7\x1d\x55\xe0\x83\xb4\x6c\x23\x6b\x24\x87\xd4\x33\xd6\x9e\xda\x9e\xd1\xb8\x53\x9a\x28\x30\xb6\x6e\xb4\x9a\x92\x38\x8b\x37\xeb\x66\xfb\x16\xa3\xd5\x1c\xe0\x2c\xc3\x05\x0c\x2e\xb0\x2a\x
[...]
- },
"/prometheus-jmx-exporter.yaml": &vfsgen۰CompressedFileInfo{
name: "prometheus-jmx-exporter.yaml",
modTime: time.Time{},
@@ -368,9 +312,9 @@ var assets = func() http.FileSystem {
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 32786,
+ uncompressedSize: 32785,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6d\x73\x1b\x37\x92\xf0\xf7\xfc\x0a\x94\x9e\xa7\x4a\xa2\x8a\x1c\xc9\xd9\xca\x26\xab\xbb\x5c\x4a\xeb\x38\xbb\x72\x62\x5b\x67\x39\xc9\x5d\xe5\xb6\x96\xe0\x4c\x93\x84\x85\x01\x66\x01\x0c\x65\xe6\xea\xfe\xfb\x55\x37\x5e\x06\x33\x1c\x49\x94\x63\xa5\xb4\x55\x57\xf9\x10\x93\x9a\x69\x34\x1a\xfd\xfe\x02\x3a\xc3\x85\xb3\x67\x9f\xcd\x98\xe2\x35\x9c\x31\xbe\x5c\x0a\x25\xdc\xf6\x33\xc6\x1a\xc9\xdd\x52\x9b\xfa\x8c\x2d\xb9\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6d\x73\x1b\x37\x92\xf0\xf7\xfc\x0a\x94\x9e\xa7\x4a\xa2\x8a\x1c\xc9\xd9\xca\x26\xab\xbb\x5c\x4a\xeb\x38\xbb\x72\x62\x5b\x67\x39\xc9\x5d\xe5\xb6\x96\xe0\x4c\x93\x84\x85\x01\x66\x01\x0c\x65\xe6\xea\xfe\xfb\x55\x37\x5e\x06\x33\x1c\x49\x94\x63\xa5\xb4\x55\x57\xf9\x10\x93\x9a\x69\x34\x1a\xfd\xfe\x02\x3a\xc3\x85\xb3\x67\x9f\xcd\x98\xe2\x35\x9c\x31\xbe\x5c\x0a\x25\xdc\xf6\x33\xc6\x1a\xc9\xdd\x52\x9b\xfa\x8c\x2d\xb9\x
[...]
},
"/user-cluster-role.yaml": &vfsgen۰CompressedFileInfo{
name: "user-cluster-role.yaml",
@@ -410,14 +354,6 @@ var assets = func() http.FileSystem {
fs["/operator-role-servicemonitors.yaml"].(os.FileInfo),
fs["/operator-service-account.yaml"].(os.FileInfo),
fs["/platform-cr.yaml"].(os.FileInfo),
- fs["/platform-integration-kit-groovy.yaml"].(os.FileInfo),
- fs["/platform-integration-kit-java.yaml"].(os.FileInfo),
- fs["/platform-integration-kit-js.yaml"].(os.FileInfo),
- fs["/platform-integration-kit-knative.yaml"].(os.FileInfo),
- fs["/platform-integration-kit-kotlin.yaml"].(os.FileInfo),
- fs["/platform-integration-kit-main.yaml"].(os.FileInfo),
- fs["/platform-integration-kit-xml.yaml"].(os.FileInfo),
- fs["/platform-integration-kit-yaml.yaml"].(os.FileInfo),
fs["/prometheus-jmx-exporter.yaml"].(os.FileInfo),
fs["/templates"].(os.FileInfo),
fs["/traits.yaml"].(os.FileInfo),
diff --git a/deploy/traits.yaml b/deploy/traits.yaml
index c2d85f0..517a155 100755
--- a/deploy/traits.yaml
+++ b/deploy/traits.yaml
@@ -519,7 +519,7 @@ traits:
- Kubernetes
- Knative
- OpenShift
- description: The Quarkus trait activates the Quarkus runtime. It's disabled
by default.
+ description: The Quarkus trait activates the Quarkus runtime. It's enabled
by default.
properties:
- name: enabled
type: bool
diff --git a/docs/modules/traits/pages/quarkus.adoc
b/docs/modules/traits/pages/quarkus.adoc
index 82ec62f..1c6e64d 100755
--- a/docs/modules/traits/pages/quarkus.adoc
+++ b/docs/modules/traits/pages/quarkus.adoc
@@ -3,7 +3,7 @@
// Start of autogenerated code - DO NOT EDIT! (description)
The Quarkus trait activates the Quarkus runtime.
-It's disabled by default.
+It's enabled by default.
This trait is available in the following profiles: **Kubernetes, Knative,
OpenShift**.
diff --git a/e2e/builder/build_test.go b/e2e/builder/build_test.go
index 2169bbe..4b2ad8b 100644
--- a/e2e/builder/build_test.go
+++ b/e2e/builder/build_test.go
@@ -29,41 +29,22 @@ import (
. "github.com/onsi/gomega"
)
-func TestKitMainFullBuild(t *testing.T) {
- doNamedKitFullBuild(t, "main")
-}
-
-func TestKitGroovyFullBuild(t *testing.T) {
- doNamedKitFullBuild(t, "groovy")
-}
-
-func TestKitKotlinFullBuild(t *testing.T) {
- doNamedKitFullBuild(t, "kotlin")
-}
-
-func TestKitJSFullBuild(t *testing.T) {
- doNamedKitFullBuild(t, "js")
-}
-
-func TestKitXMLFullBuild(t *testing.T) {
- doNamedKitFullBuild(t, "xml")
-}
-
-func TestKitJavaFullBuild(t *testing.T) {
- doNamedKitFullBuild(t, "java")
-}
-
-func TestKitYAMLFullBuild(t *testing.T) {
- doNamedKitFullBuild(t, "yaml")
+func TestKitTimerToLogFullBuild(t *testing.T) {
+ doKitFullBuild(t, "timer-to-log", "camel:timer", "camel:log")
}
func TestKitKnativeFullBuild(t *testing.T) {
- doNamedKitFullBuild(t, "knative")
+ doKitFullBuild(t, "knative", "camel:knative")
}
-func doNamedKitFullBuild(t *testing.T, name string) {
+func doKitFullBuild(t *testing.T, name string, dependencies ...string) {
WithNewTestNamespace(t, func(ns string) {
- Expect(Kamel("install", "-n", ns, "--kit",
name).Execute()).Should(BeNil())
+ Expect(Kamel("install", "-n", ns).Execute()).Should(BeNil())
+ buildKitArgs := []string{"kit", "create", name, "-n", ns}
+ for _, dep := range dependencies {
+ buildKitArgs = append(buildKitArgs, "-d", dep)
+ }
+ Expect(Kamel(buildKitArgs...).Execute()).Should(BeNil())
Eventually(Build(ns, name)).ShouldNot(BeNil())
Eventually(func() v1.BuildPhase {
return Build(ns, name)().Status.Phase
diff --git a/e2e/common/files/RestConsumer.java
b/e2e/common/files/RestConsumer.java
index a5c64ed..bcdfbdb 100644
--- a/e2e/common/files/RestConsumer.java
+++ b/e2e/common/files/RestConsumer.java
@@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder;
public class RestConsumer extends RouteBuilder {
@Override
public void configure() throws Exception {
- restConfiguration().port(8080);
+
rest("/customers")
.get("/{name}").to("direct:start");
diff --git a/e2e/common/install_test.go b/e2e/common/install_test.go
index 5d472a8..805477a 100644
--- a/e2e/common/install_test.go
+++ b/e2e/common/install_test.go
@@ -44,8 +44,9 @@ func TestAlternativeImageInstallation(t *testing.T) {
func TestKitMainInstallation(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
- Expect(Kamel("install", "-n", ns, "--kit",
"main").Execute()).Should(BeNil())
- Eventually(Build(ns, "main")).ShouldNot(BeNil())
+ Expect(Kamel("install", "-n", ns).Execute()).Should(BeNil())
+ Expect(Kamel("kit", "create", "timer", "-d", "camel:timer",
"-n", ns).Execute()).Should(BeNil())
+ Eventually(Build(ns, "timer")).ShouldNot(BeNil())
})
}
diff --git a/e2e/common/platformless_run_test.go
b/e2e/common/platformless_run_test.go
index 743a462..b908685 100644
--- a/e2e/common/platformless_run_test.go
+++ b/e2e/common/platformless_run_test.go
@@ -34,10 +34,10 @@ import (
)
func TestPlatformlessRun(t *testing.T) {
- needsStagingRepo := os.Getenv("STAGING_RUNTIME_REPO") != ""
+ needsExternalRepo := os.Getenv("STAGING_RUNTIME_REPO") != "" ||
os.Getenv("KAMEL_INSTALL_MAVEN_REPOSITORIES") != ""
ocp, err := openshift.IsOpenShift(TestClient)
assert.Nil(t, err)
- if needsStagingRepo || !ocp {
+ if needsExternalRepo || !ocp {
t.Skip("This test is for OpenShift only and cannot work when a
custom platform configuration is needed")
return
}
diff --git a/e2e/common/rest_test.go b/e2e/common/rest_test.go
index 2adfb34..259f158 100644
--- a/e2e/common/rest_test.go
+++ b/e2e/common/rest_test.go
@@ -46,7 +46,7 @@ func TestRunREST(t *testing.T) {
}
Expect(Kamel("install", "-n", ns, "--trait-profile",
profile).Execute()).Should(BeNil())
- Expect(Kamel("run", "-n", ns, "files/RestConsumer.java", "-d",
"camel:undertow").Execute()).Should(BeNil())
+ Expect(Kamel("run", "-n", ns,
"files/RestConsumer.java").Execute()).Should(BeNil())
Eventually(IntegrationPodPhase(ns, "rest-consumer"),
TestTimeoutMedium).Should(Equal(v1.PodRunning))
t.Run("Service works", func(t *testing.T) {
diff --git a/pkg/apis/camel/v1/common_types.go
b/pkg/apis/camel/v1/common_types.go
index d7b9e35..eb7639e 100644
--- a/pkg/apis/camel/v1/common_types.go
+++ b/pkg/apis/camel/v1/common_types.go
@@ -129,6 +129,8 @@ const (
CapabilityCircuitBreaker = "circuit-breaker"
// CapabilityTracing --
CapabilityTracing = "tracing"
+ // CapabilityMaster --
+ CapabilityMaster = "master"
)
// ResourceCondition is a common type for all conditions
diff --git a/pkg/apis/camel/v1/integrationplatform_types.go
b/pkg/apis/camel/v1/integrationplatform_types.go
index 6f39073..202016f 100644
--- a/pkg/apis/camel/v1/integrationplatform_types.go
+++ b/pkg/apis/camel/v1/integrationplatform_types.go
@@ -36,7 +36,6 @@ type IntegrationPlatformSpec struct {
// IntegrationPlatformResourcesSpec contains platform related resources
type IntegrationPlatformResourcesSpec struct {
- Kits []string `json:"kits,omitempty"`
}
// IntegrationPlatformStatus defines the observed state of IntegrationPlatform
diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go
b/pkg/apis/camel/v1/zz_generated.deepcopy.go
index 534a75d..1b72431 100644
--- a/pkg/apis/camel/v1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go
@@ -1019,11 +1019,6 @@ func (in *IntegrationPlatformRegistrySpec) DeepCopy()
*IntegrationPlatformRegist
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver,
writing into out. in must be non-nil.
func (in *IntegrationPlatformResourcesSpec) DeepCopyInto(out
*IntegrationPlatformResourcesSpec) {
*out = *in
- if in.Kits != nil {
- in, out := &in.Kits, &out.Kits
- *out = make([]string, len(*in))
- copy(*out, *in)
- }
return
}
@@ -1041,7 +1036,7 @@ func (in *IntegrationPlatformResourcesSpec) DeepCopy()
*IntegrationPlatformResou
func (in *IntegrationPlatformSpec) DeepCopyInto(out *IntegrationPlatformSpec) {
*out = *in
in.Build.DeepCopyInto(&out.Build)
- in.Resources.DeepCopyInto(&out.Resources)
+ out.Resources = in.Resources
if in.Traits != nil {
in, out := &in.Traits, &out.Traits
*out = make(map[string]TraitSpec, len(*in))
diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index fe54781..00e8f80 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -363,6 +363,11 @@ func (in *JSONSchemaProps) DeepCopyInto(out
*JSONSchemaProps) {
*out = new(string)
**out = **in
}
+ if in.XDescriptors != nil {
+ in, out := &in.XDescriptors, &out.XDescriptors
+ *out = make([]string, len(*in))
+ copy(*out, *in)
+ }
return
}
diff --git a/pkg/cmd/describe_platform.go b/pkg/cmd/describe_platform.go
index fef0506..151ac1d 100644
--- a/pkg/cmd/describe_platform.go
+++ b/pkg/cmd/describe_platform.go
@@ -98,17 +98,6 @@ func (command *describePlatformCommandOptions)
describeIntegrationPlatform(platf
w.Write(0, "Local Repository:\t%s\n",
platform.GetActualValue(getPlatformMavenLocalRepository))
w.Write(0, "Publish Strategy:\t%s\n",
platform.GetActualValue(getPlatformPublishStrategy))
- kits := platform.Status.Resources.Kits
- if len(kits) == 0 {
- kits = platform.Spec.Resources.Kits
- }
- if len(kits) > 0 {
- w.Write(0, "Resources:\n")
- w.Write(1, "Kits:\n")
- for _, kit := range kits {
- w.Write(2, "%s\n", kit)
- }
- }
return nil
})
}
diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index b5c9c44..3df7108 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -93,7 +93,6 @@ func newCmdInstall(rootCmdOptions *RootCmdOptions)
(*cobra.Command, *installCmdO
cmd.Flags().String("base-image", "", "Set the base Image used to run
integrations")
cmd.Flags().String("operator-image", "", "Set the operator Image used
for the operator deployment")
cmd.Flags().String("operator-image-pull-policy", "", "Set the operator
ImagePullPolicy used for the operator deployment")
- cmd.Flags().StringArray("kit", nil, "Add an integration kit to build at
startup")
cmd.Flags().String("build-strategy", "", "Set the build strategy")
cmd.Flags().String("build-publish-strategy", "", "Set the build publish
strategy")
cmd.Flags().String("build-timeout", "", "Set how long the build process
can last")
@@ -159,7 +158,6 @@ type installCmdOptions struct {
MavenRepositories []string `mapstructure:"maven-repositories"`
MavenSettings string `mapstructure:"maven-settings"`
Properties []string `mapstructure:"properties"`
- Kits []string `mapstructure:"kits"`
TraitProfile string `mapstructure:"trait-profile"`
HTTPProxySecret string `mapstructure:"http-proxy-secret"`
@@ -347,8 +345,6 @@ func (o *installCmdOptions) install(cobraCmd
*cobra.Command, _ []string) error {
platform.Spec.Build.KanikoBuildCache =
&o.KanikoBuildCache
}
- platform.Spec.Resources.Kits = o.Kits
-
// Do not create an integration platform in global mode as
platforms are expected
// to be created in other namespaces.
// In OLM mode, the operator is installed in an external
namespace, so it's ok to install the platform locally.
@@ -481,11 +477,6 @@ func (o *installCmdOptions) validate(_ *cobra.Command, _
[]string) error {
return err
}
- for _, kit := range o.Kits {
- err := errorIfKitIsNotAvailable(schema, kit)
- result = multierr.Append(result, err)
- }
-
if len(o.MavenRepositories) > 0 && o.MavenSettings != "" {
err := fmt.Errorf("incompatible options combinations: you
cannot set both mavenRepository and mavenSettings")
result = multierr.Append(result, err)
diff --git a/pkg/controller/integrationplatform/create.go
b/pkg/controller/integrationplatform/create.go
index e8efeba..af87a5f 100644
--- a/pkg/controller/integrationplatform/create.go
+++ b/pkg/controller/integrationplatform/create.go
@@ -19,7 +19,6 @@ package integrationplatform
import (
"context"
- "fmt"
"strings"
"github.com/apache/camel-k/deploy"
@@ -56,30 +55,6 @@ func (action *createAction) Handle(ctx context.Context,
platform *v1.Integration
}
}
- if l := len(platform.Status.Resources.Kits); l > 0 {
- res := make([]string, 0, l)
-
- for _, c := range platform.Status.Resources.Kits {
- //
- // Assuming that if the resource ends with a yaml
extension, the full
- // resource name is provided
- //
- if !strings.HasSuffix(c, ".yaml") &&
!strings.HasSuffix(c, ".yml") {
- c =
fmt.Sprintf("platform-integration-kit-%s.yaml", c)
- }
-
- res = append(res, c)
- }
-
- if len(res) > 0 {
- action.L.Info("Installing custom platform resources")
- err := install.Resources(ctx, action.client,
platform.Namespace, true, install.IdentityResourceCustomizer, res...)
- if err != nil {
- return nil, err
- }
- }
- }
-
platform.Status.Phase = v1.IntegrationPlatformPhaseReady
return platform, nil
diff --git a/pkg/metadata/metadata_capabilities_test.go
b/pkg/metadata/metadata_capabilities_test.go
index 349e485..2d9d6ce 100644
--- a/pkg/metadata/metadata_capabilities_test.go
+++ b/pkg/metadata/metadata_capabilities_test.go
@@ -43,8 +43,8 @@ func TestPlatformHttpCapabilities(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:platform-http",
- "camel:log",
+ "camel-quarkus:platform-http",
+ "camel-quarkus:log",
},
meta.Dependencies.List())
diff --git a/pkg/metadata/metadata_dependencies_test.go
b/pkg/metadata/metadata_dependencies_test.go
index 0a3e8cc..bb1c494 100644
--- a/pkg/metadata/metadata_dependencies_test.go
+++ b/pkg/metadata/metadata_dependencies_test.go
@@ -51,12 +51,12 @@ func TestDependenciesJavaSource(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:activemq",
- "camel:amqp",
- "camel:log",
- "camel:telegram",
- "camel:timer",
- "camel:twitter",
+ "camel-quarkus:activemq",
+ "camel-quarkus:amqp",
+ "camel-quarkus:log",
+ "camel-quarkus:telegram",
+ "camel-quarkus:timer",
+ "camel-quarkus:twitter",
},
meta.Dependencies.List())
}
@@ -85,11 +85,11 @@ func TestDependenciesJavaScript(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:activemq",
- "camel:amqp",
- "camel:log",
- "camel:telegram",
- "camel:timer",
+ "camel-quarkus:activemq",
+ "camel-quarkus:amqp",
+ "camel-quarkus:log",
+ "camel-quarkus:telegram",
+ "camel-quarkus:timer",
},
meta.Dependencies.List())
}
@@ -120,12 +120,12 @@ func TestDependenciesGroovy(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:activemq",
- "camel:amqp",
- "camel:log",
- "camel:telegram",
- "camel:timer",
- "camel:twitter",
+ "camel-quarkus:activemq",
+ "camel-quarkus:amqp",
+ "camel-quarkus:log",
+ "camel-quarkus:telegram",
+ "camel-quarkus:timer",
+ "camel-quarkus:twitter",
},
meta.Dependencies.List())
}
@@ -150,10 +150,10 @@ func TestDependencies(t *testing.T) {
assert.ElementsMatch(t,
[]string{
- "camel:http",
- "camel:log",
- "camel:mock",
- "camel:twitter",
+ "camel-quarkus:http",
+ "camel-quarkus:log",
+ "camel-quarkus:mock",
+ "camel-quarkus:twitter",
},
meta.Dependencies.List())
}
@@ -214,9 +214,9 @@ func TestJacksonDependency(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:http",
- "camel:jackson",
- "camel:log",
+ "camel-quarkus:http",
+ "camel-quarkus:jackson",
+ "camel-quarkus:log",
},
meta.Dependencies.List())
}
@@ -242,9 +242,9 @@ func TestJacksonImplicitDependency(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:http",
- "camel:jackson",
- "camel:log",
+ "camel-quarkus:http",
+ "camel-quarkus:jackson",
+ "camel-quarkus:log",
},
meta.Dependencies.List())
}
@@ -275,14 +275,14 @@ func TestLanguageDependencies(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:direct",
- "camel:ognl",
- "camel:saxon",
- "camel:xpath",
- "camel:jsonpath",
- "camel:groovy",
- "camel:xml-jaxp",
- "camel:mvel",
+ "camel-quarkus:direct",
+ "camel-quarkus:mvel",
+ "camel-quarkus:ognl",
+ "camel-quarkus:xpath",
+ "camel-quarkus:jsonpath",
+ "camel-quarkus:groovy",
+ "camel-quarkus:saxon",
+ "camel-quarkus:xml-jaxp",
},
meta.Dependencies.List())
}
@@ -309,10 +309,10 @@ func TestLanguageDependenciesTransformExpression(t
*testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:direct",
- "camel:ognl",
- "camel:xpath",
- "camel:jsonpath",
+ "camel-quarkus:direct",
+ "camel-quarkus:ognl",
+ "camel-quarkus:xpath",
+ "camel-quarkus:jsonpath",
},
meta.Dependencies.List())
}
@@ -339,8 +339,8 @@ func TestCircuitBreakerDependency(t *testing.T) {
assert.ElementsMatch(t,
[]string{
- "camel:http",
- "camel:log",
+ "camel-quarkus:http",
+ "camel-quarkus:log",
},
meta.Dependencies.List())
@@ -370,11 +370,11 @@ func TestRestDependency(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:http",
- "camel:direct",
- "camel:log",
- "mvn:org.apache.camel/camel-rest",
- "mvn:org.apache.camel.k/camel-k-runtime-http",
+ "camel-quarkus:http",
+ "camel-quarkus:direct",
+ "camel-quarkus:log",
+ "mvn:org.apache.camel.quarkus/camel-quarkus-rest",
+
"mvn:org.apache.camel.quarkus/camel-quarkus-platform-http",
},
meta.Dependencies.List())
}
@@ -401,11 +401,11 @@ func TestRestWithPathDependency(t *testing.T) {
assert.ElementsMatch(
t, []string{
- "camel:http",
- "camel:direct",
- "camel:log",
- "mvn:org.apache.camel/camel-rest",
- "mvn:org.apache.camel.k/camel-k-runtime-http",
+ "camel-quarkus:http",
+ "camel-quarkus:direct",
+ "camel-quarkus:log",
+ "mvn:org.apache.camel.quarkus/camel-quarkus-rest",
+
"mvn:org.apache.camel.quarkus/camel-quarkus-platform-http",
},
meta.Dependencies.List())
}
@@ -416,7 +416,7 @@ func TestRestConfigurationDependency(t *testing.T) {
Name: "Request.groovy",
Content: `
restConfiguration()
- .component("undertow")
+ .component("netty-http")
from("http:test")
.to("log:info")
`,
@@ -431,10 +431,10 @@ func TestRestConfigurationDependency(t *testing.T) {
assert.ElementsMatch(
t, []string{
- "camel:http",
- "camel:log",
- "mvn:org.apache.camel/camel-rest",
- "mvn:org.apache.camel.k/camel-k-runtime-http",
+ "camel-quarkus:http",
+ "camel-quarkus:log",
+ "mvn:org.apache.camel.quarkus/camel-quarkus-rest",
+
"mvn:org.apache.camel.quarkus/camel-quarkus-platform-http",
},
meta.Dependencies.List())
}
@@ -461,10 +461,10 @@ func TestRestClosureDependencyGroovy(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:http",
- "camel:log",
- "mvn:org.apache.camel/camel-rest",
- "mvn:org.apache.camel.k/camel-k-runtime-http",
+ "camel-quarkus:http",
+ "camel-quarkus:log",
+ "mvn:org.apache.camel.quarkus/camel-quarkus-rest",
+
"mvn:org.apache.camel.quarkus/camel-quarkus-platform-http",
},
meta.Dependencies.List())
}
@@ -491,10 +491,10 @@ func TestRestClosureDependencyKotlin(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:http",
- "camel:log",
- "mvn:org.apache.camel/camel-rest",
- "mvn:org.apache.camel.k/camel-k-runtime-http",
+ "camel-quarkus:http",
+ "camel-quarkus:log",
+ "mvn:org.apache.camel.quarkus/camel-quarkus-rest",
+
"mvn:org.apache.camel.quarkus/camel-quarkus-platform-http",
},
meta.Dependencies.List())
}
@@ -525,9 +525,9 @@ func TestXMLCircuitBreakerDependency(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:direct",
- "camel:kafka",
- "camel:log",
+ "camel-quarkus:direct",
+ "camel-quarkus:kafka",
+ "camel-quarkus:log",
},
meta.Dependencies.List())
@@ -564,8 +564,8 @@ func TestXMLRestDependency(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:direct",
- "camel:mock",
+ "camel-quarkus:direct",
+ "camel-quarkus:mock",
},
meta.Dependencies.List())
@@ -620,15 +620,15 @@ func TestXMLLanguageDependencies(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:core-languages",
- "camel:direct",
- "camel:ognl",
- "camel:saxon",
- "camel:xpath",
- "camel:xml-jaxp",
- "camel:jsonpath",
- "camel:groovy",
- "camel:mvel",
+ "camel-quarkus:core",
+ "camel-quarkus:direct",
+ "camel-quarkus:mvel",
+ "camel-quarkus:ognl",
+ "camel-quarkus:xpath",
+ "camel-quarkus:xml-jaxp",
+ "camel-quarkus:jsonpath",
+ "camel-quarkus:saxon",
+ "camel-quarkus:groovy",
},
meta.Dependencies.List())
}
@@ -661,8 +661,6 @@ const yamlWithLanguages = `
- transform:
simple: "${body.toUpperCase()}"
- transform:
- mvel: "resource:classpath:script.mvel"
- - transform:
xquery: "/ns:foo/bar"
- transform:
xpath: "//foo/bar"
@@ -692,8 +690,8 @@ func TestYAMLRestDependency(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:direct",
- "camel:log",
+ "camel-quarkus:direct",
+ "camel-quarkus:log",
},
meta.Dependencies.List())
@@ -718,7 +716,7 @@ func TestYAMLCircuitBreakerDependency(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:direct",
+ "camel-quarkus:direct",
},
meta.Dependencies.List())
assert.True(t,
meta.RequiredCapabilities.Has(v1.CapabilityCircuitBreaker))
@@ -741,15 +739,14 @@ func TestYAMLLanguageDependencies(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:core-languages",
- "camel:direct",
- "camel:ognl",
- "camel:saxon",
- "camel:xpath",
- "camel:jsonpath",
- "camel:groovy",
- "camel:xml-jaxp",
- "camel:mvel",
+ "camel-quarkus:core",
+ "camel-quarkus:direct",
+ "camel-quarkus:ognl",
+ "camel-quarkus:xpath",
+ "camel-quarkus:jsonpath",
+ "camel-quarkus:groovy",
+ "camel-quarkus:saxon",
+ "camel-quarkus:xml-jaxp",
},
meta.Dependencies.List())
}
diff --git a/pkg/metadata/metadata_http_test.go
b/pkg/metadata/metadata_http_test.go
index 97b4aea..a0ec2bb 100644
--- a/pkg/metadata/metadata_http_test.go
+++ b/pkg/metadata/metadata_http_test.go
@@ -32,7 +32,7 @@ func TestHttpJavaSource(t *testing.T) {
Name: "Request.java",
Content: `
from("telegram:bots/cippa").to("log:stash");
- from("undertow:uri").to("log:stash");
+ from("netty-http:uri").to("log:stash");
from("ine:xistent").to("log:stash");
`,
},
@@ -55,7 +55,7 @@ func TestHttpOnlyJavaSource(t *testing.T) {
Name: "Request.java",
Content: `
from("direct:bots/cippa").to("log:stash");
- from("undertow:uri").to("log:stash");
+ from("netty-http:uri").to("log:stash");
from("seda:path").to("log:stash");
`,
},
@@ -141,7 +141,7 @@ func TestHttpOnlyGroovySource(t *testing.T) {
Name: "Request.groovy",
Content: `
from('direct:bots/cippa').to("log:stash");
- from('undertow:uri').to("log:stash");
+ from('netty-http:uri').to("log:stash");
from('seda:path').to("log:stash");
`,
},
diff --git a/pkg/trait/camel_test.go b/pkg/trait/camel_test.go
index bc078b8..67db6a9 100644
--- a/pkg/trait/camel_test.go
+++ b/pkg/trait/camel_test.go
@@ -61,11 +61,11 @@ func
TestApplyCamelTraitWithoutEnvironmentCatalogAndUnmatchableVersionFails(t *t
trait, environment := createNominalCamelTest()
environment.CamelCatalog = nil
environment.Integration.Status.RuntimeVersion = "Unmatchable version"
- environment.Integration.Status.RuntimeProvider = v1.RuntimeProviderMain
+ environment.Integration.Status.RuntimeProvider =
v1.RuntimeProviderQuarkus
err := trait.Apply(environment)
assert.NotNil(t, err)
- assert.Equal(t, "unable to find catalog matching version requirement:
runtime=Unmatchable version, provider=main", err.Error())
+ assert.Equal(t, "unable to find catalog matching version requirement:
runtime=Unmatchable version, provider=quarkus", err.Error())
}
func createNominalCamelTest() (*camelTrait, *Environment) {
diff --git a/pkg/trait/container_probes_test.go
b/pkg/trait/container_probes_test.go
index 2f9e3c6..4d4e5f7 100644
--- a/pkg/trait/container_probes_test.go
+++ b/pkg/trait/container_probes_test.go
@@ -37,7 +37,7 @@ func newTestProbesEnv(t *testing.T, provider
v1.RuntimeProvider) Environment {
switch provider {
case v1.RuntimeProviderMain:
- catalog, err = camel.DefaultCatalog()
+ catalog, err = camel.MainCatalog()
case v1.RuntimeProviderQuarkus:
catalog, err = camel.QuarkusCatalog()
}
diff --git a/pkg/trait/cron_test.go b/pkg/trait/cron_test.go
index 7e705d9..c228dbe 100644
--- a/pkg/trait/cron_test.go
+++ b/pkg/trait/cron_test.go
@@ -287,7 +287,7 @@ func TestCronDeps(t *testing.T) {
assert.NotNil(t, ct)
assert.Nil(t, ct.Fallback)
assert.True(t,
util.StringSliceExists(environment.Integration.Status.Capabilities,
v1.CapabilityCron))
- assert.Contains(t, environment.Integration.Status.Dependencies,
"mvn:org.apache.camel.k/camel-k-runtime-cron")
+ assert.Contains(t, environment.Integration.Status.Dependencies,
"mvn:org.apache.camel.k/camel-k-quarkus-cron")
}
func TestCronDepsFallback(t *testing.T) {
@@ -361,8 +361,8 @@ func TestCronDepsFallback(t *testing.T) {
assert.NotNil(t, ct)
assert.NotNil(t, ct.Fallback)
assert.True(t,
util.StringSliceExists(environment.Integration.Status.Capabilities,
v1.CapabilityCron))
- assert.Contains(t, environment.Integration.Status.Dependencies,
"camel:quartz")
- assert.Contains(t, environment.Integration.Status.Dependencies,
"mvn:org.apache.camel.k/camel-k-runtime-cron")
+ assert.Contains(t, environment.Integration.Status.Dependencies,
"camel-quarkus:quartz")
+ assert.Contains(t, environment.Integration.Status.Dependencies,
"mvn:org.apache.camel.k/camel-k-quarkus-cron")
}
func TestCronWithMain(t *testing.T) {
diff --git a/pkg/trait/dependencies_test.go b/pkg/trait/dependencies_test.go
index a7384ad..183d01e 100644
--- a/pkg/trait/dependencies_test.go
+++ b/pkg/trait/dependencies_test.go
@@ -83,10 +83,10 @@ func TestIntegrationDefaultDeps(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:direct",
- "camel:log",
- "mvn:org.apache.camel.k/camel-k-loader-java",
- "mvn:org.apache.camel.k/camel-k-runtime-main"},
+ "camel-quarkus:direct",
+ "camel-quarkus:log",
+ "mvn:org.apache.camel.k/camel-k-quarkus-loader-java",
+ "mvn:org.apache.camel.k/camel-k-runtime-quarkus"},
e.Integration.Status.Dependencies,
)
}
@@ -101,7 +101,7 @@ func TestIntegrationCustomDeps(t *testing.T) {
Integration: &v1.Integration{
Spec: v1.IntegrationSpec{
Dependencies: []string{
- "camel:undertow",
+ "camel:netty-http",
"org.foo:bar",
},
Sources: []v1.SourceSpec{
@@ -129,12 +129,12 @@ func TestIntegrationCustomDeps(t *testing.T) {
assert.Nil(t, err)
assert.ElementsMatch(t,
[]string{
- "camel:direct",
- "camel:log",
- "camel:undertow",
+ "camel-quarkus:direct",
+ "camel-quarkus:log",
+ "camel:netty-http",
"org.foo:bar",
- "mvn:org.apache.camel.k/camel-k-loader-java",
- "mvn:org.apache.camel.k/camel-k-runtime-main"},
+ "mvn:org.apache.camel.k/camel-k-quarkus-loader-java",
+ "mvn:org.apache.camel.k/camel-k-runtime-quarkus"},
e.Integration.Status.Dependencies,
)
}
@@ -187,13 +187,13 @@ func TestIntegrationAutoGeneratedDeps(t *testing.T) {
assert.ElementsMatch(
t,
[]string{
- "camel:direct",
- "camel:log",
- "mvn:org.apache.camel/camel-rest",
- "mvn:org.apache.camel.k/camel-k-loader-java",
- "mvn:org.apache.camel.k/camel-k-loader-xml",
- "mvn:org.apache.camel.k/camel-k-runtime-main",
- "mvn:org.apache.camel.k/camel-k-runtime-http"},
+ "camel-quarkus:direct",
+ "camel-quarkus:log",
+ "mvn:org.apache.camel.quarkus/camel-quarkus-rest",
+ "mvn:org.apache.camel.k/camel-k-quarkus-loader-java",
+ "mvn:org.apache.camel.k/camel-k-quarkus-loader-xml",
+ "mvn:org.apache.camel.k/camel-k-runtime-quarkus",
+
"mvn:org.apache.camel.quarkus/camel-quarkus-platform-http"},
e.Integration.Status.Dependencies,
)
}
@@ -236,10 +236,10 @@ func TestIntegrationCustomLoader(t *testing.T) {
assert.Nil(t, err)
assert.ElementsMatch(t,
[]string{
- "camel:direct",
- "camel:log",
- "mvn:org.apache.camel.k/camel-k-loader-yaml",
- "mvn:org.apache.camel.k/camel-k-runtime-main"},
+ "camel-quarkus:direct",
+ "camel-quarkus:log",
+ "mvn:org.apache.camel.k/camel-k-quarkus-loader-yaml",
+ "mvn:org.apache.camel.k/camel-k-runtime-quarkus"},
e.Integration.Status.Dependencies,
)
}
@@ -280,8 +280,8 @@ func TestRestDeps(t *testing.T) {
t,
e.Integration.Status.Dependencies,
[]string{
- "mvn:org.apache.camel/camel-rest",
- "mvn:org.apache.camel.k/camel-k-runtime-http",
+ "mvn:org.apache.camel.quarkus/camel-quarkus-rest",
+
"mvn:org.apache.camel.quarkus/camel-quarkus-platform-http",
},
)
}
diff --git a/pkg/trait/jvm_test.go b/pkg/trait/jvm_test.go
index df97459..2a20bc2 100644
--- a/pkg/trait/jvm_test.go
+++ b/pkg/trait/jvm_test.go
@@ -104,11 +104,11 @@ func TestApplyJvmTraitWithDeploymentResource(t
*testing.T) {
cp := strset.New("/etc/camel/resources", "./resources",
"/mount/path").List()
sort.Strings(cp)
- assert.Equal(t, d.Spec.Template.Spec.Containers[0].Args, []string{
+ assert.Equal(t, []string{
"-cp",
"./resources:/etc/camel/resources:/mount/path",
- "org.apache.camel.k.main.Application",
- })
+ "io.quarkus.runner.GeneratedMain",
+ }, d.Spec.Template.Spec.Containers[0].Args)
}
func TestApplyJvmTraitWithKNativeResource(t *testing.T) {
@@ -136,11 +136,11 @@ func TestApplyJvmTraitWithKNativeResource(t *testing.T) {
cp := strset.New("/etc/camel/resources", "./resources",
"/mount/path").List()
sort.Strings(cp)
- assert.Equal(t, s.Spec.Template.Spec.Containers[0].Args, []string{
+ assert.Equal(t, []string{
"-cp",
"./resources:/etc/camel/resources:/mount/path",
- "org.apache.camel.k.main.Application",
- })
+ "io.quarkus.runner.GeneratedMain",
+ }, s.Spec.Template.Spec.Containers[0].Args)
}
func TestApplyJvmTraitWithDebugEnabled(t *testing.T) {
diff --git a/pkg/trait/knative_test.go b/pkg/trait/knative_test.go
index c74e716..63586c9 100644
--- a/pkg/trait/knative_test.go
+++ b/pkg/trait/knative_test.go
@@ -298,8 +298,6 @@ func TestKnativePlatformHttpConfig(t *testing.T) {
assert.Nil(t, err)
assert.Contains(t,
environment.Integration.Status.Capabilities, v1.CapabilityPlatformHTTP)
- assert.Equal(t, "true",
environment.ApplicationProperties["customizer.platform-http.enabled"])
- assert.Equal(t, "8080",
environment.ApplicationProperties["customizer.platform-http.bind-port"])
})
}
}
@@ -347,7 +345,7 @@ func TestKnativePlatformHttpDepdencies(t *testing.T) {
assert.Nil(t, err)
assert.Contains(t,
environment.Integration.Status.Capabilities, v1.CapabilityPlatformHTTP)
- assert.Contains(t,
environment.Integration.Status.Dependencies,
"mvn:org.apache.camel.k/camel-k-runtime-http")
+ assert.Contains(t,
environment.Integration.Status.Dependencies,
"mvn:org.apache.camel.quarkus/camel-quarkus-platform-http")
})
}
}
diff --git a/pkg/trait/prometheus_test.go b/pkg/trait/prometheus_test.go
index 6fb6e92..4b78d62 100644
--- a/pkg/trait/prometheus_test.go
+++ b/pkg/trait/prometheus_test.go
@@ -173,7 +173,7 @@ func createNominalPrometheusTest() (*prometheusTrait,
*Environment) {
enabled := true
trait.Enabled = &enabled
- camelCatalog, err := camel.DefaultCatalog()
+ camelCatalog, err := camel.MainCatalog()
if err != nil {
panic(err)
}
diff --git a/pkg/trait/quarkus.go b/pkg/trait/quarkus.go
index bdd1d09..7723ef2 100644
--- a/pkg/trait/quarkus.go
+++ b/pkg/trait/quarkus.go
@@ -25,7 +25,7 @@ import (
// The Quarkus trait activates the Quarkus runtime.
//
-// It's disabled by default.
+// It's enabled by default.
//
// +camel-k:trait=quarkus
type quarkusTrait struct {
@@ -41,7 +41,7 @@ func newQuarkusTrait() Trait {
}
func (t *quarkusTrait) isEnabled() bool {
- return t.Enabled != nil && *t.Enabled
+ return t.Enabled == nil || *t.Enabled
}
func (t *quarkusTrait) Configure(e *Environment) (bool, error) {
diff --git a/pkg/trait/service_test.go b/pkg/trait/service_test.go
index 372dc2f..e68f482 100644
--- a/pkg/trait/service_test.go
+++ b/pkg/trait/service_test.go
@@ -43,7 +43,7 @@ func TestServiceWithDefaults(t *testing.T) {
traitCatalog := NewCatalog(context.TODO(), nil)
- compressedRoute, err :=
gzip.CompressBase64([]byte(`from("undertow:test").log("hello")`))
+ compressedRoute, err :=
gzip.CompressBase64([]byte(`from("netty-http:test").log("hello")`))
assert.NoError(t, err)
environment := Environment{
@@ -132,7 +132,7 @@ func TestService(t *testing.T) {
traitCatalog := NewCatalog(context.TODO(), nil)
- compressedRoute, err :=
gzip.CompressBase64([]byte(`from("undertow:test").log("hello")`))
+ compressedRoute, err :=
gzip.CompressBase64([]byte(`from("netty-http:test").log("hello")`))
assert.NoError(t, err)
environment := Environment{
@@ -300,7 +300,7 @@ func TestServiceWithNodePort(t *testing.T) {
traitCatalog := NewCatalog(context.TODO(), nil)
- compressedRoute, err :=
gzip.CompressBase64([]byte(`from("undertow:test").log("hello")`))
+ compressedRoute, err :=
gzip.CompressBase64([]byte(`from("netty-http:test").log("hello")`))
assert.NoError(t, err)
environment := Environment{
diff --git a/pkg/trait/trait_test.go b/pkg/trait/trait_test.go
index d936c56..a4c24ea 100644
--- a/pkg/trait/trait_test.go
+++ b/pkg/trait/trait_test.go
@@ -58,7 +58,7 @@ func TestOpenShiftTraits(t *testing.T) {
}
func TestOpenShiftTraitsWithWeb(t *testing.T) {
- env := createTestEnv(t, v1.IntegrationPlatformClusterOpenShift,
"from('undertow:http').to('log:info')")
+ env := createTestEnv(t, v1.IntegrationPlatformClusterOpenShift,
"from('netty-http:http').to('log:info')")
res := processTestEnv(t, env)
assert.NotNil(t, env.GetTrait("deployment"))
assert.NotNil(t, env.GetTrait("service"))
@@ -79,7 +79,7 @@ func TestOpenShiftTraitsWithWeb(t *testing.T) {
}
func TestOpenShiftTraitsWithWebAndConfig(t *testing.T) {
- env := createTestEnv(t, v1.IntegrationPlatformClusterOpenShift,
"from('undertow:http').to('log:info')")
+ env := createTestEnv(t, v1.IntegrationPlatformClusterOpenShift,
"from('netty-http:http').to('log:info')")
env.Integration.Spec.Traits = make(map[string]v1.TraitSpec)
env.Integration.Spec.Traits["service"] = test.TraitSpecFromMap(t,
map[string]interface{}{
"port": 7071,
@@ -93,7 +93,7 @@ func TestOpenShiftTraitsWithWebAndConfig(t *testing.T) {
}
func TestOpenShiftTraitsWithWebAndDisabledTrait(t *testing.T) {
- env := createTestEnv(t, v1.IntegrationPlatformClusterOpenShift,
"from('undertow:http').to('log:info')")
+ env := createTestEnv(t, v1.IntegrationPlatformClusterOpenShift,
"from('netty-http:http').to('log:info')")
env.Integration.Spec.Traits = make(map[string]v1.TraitSpec)
env.Integration.Spec.Traits["service"] = test.TraitSpecFromMap(t,
map[string]interface{}{
"enabled": false,
diff --git a/pkg/util/camel/catalog.go b/pkg/util/camel/catalog.go
index c78d1e8..4909e22 100644
--- a/pkg/util/camel/catalog.go
+++ b/pkg/util/camel/catalog.go
@@ -37,6 +37,11 @@ import (
// DefaultCatalog --
func DefaultCatalog() (*RuntimeCatalog, error) {
+ return QuarkusCatalog()
+}
+
+// MainCatalog --
+func MainCatalog() (*RuntimeCatalog, error) {
return catalogForRuntimeProvider(v1.RuntimeProviderMain)
}
diff --git a/pkg/util/source/inspector_yaml_test.go
b/pkg/util/source/inspector_yaml_test.go
index 2d5db00..c7ed024 100644
--- a/pkg/util/source/inspector_yaml_test.go
+++ b/pkg/util/source/inspector_yaml_test.go
@@ -99,7 +99,7 @@ func TestYAMLRestDSL(t *testing.T) {
err := inspector.Extract(code, &meta)
assert.Nil(t, err)
assert.True(t,
meta.RequiredCapabilities.Has(v1.CapabilityRest))
- assert.True(t, meta.Dependencies.Has("camel:log"))
+ assert.True(t,
meta.Dependencies.Has("camel-quarkus:log"))
assert.True(t, meta.ExposesHTTPServices)
})
}
diff --git a/script/travis_build.sh b/script/travis_build.sh
index 6fb4763..d3f50b3 100755
--- a/script/travis_build.sh
+++ b/script/travis_build.sh
@@ -77,7 +77,7 @@ export IMAGE=docker.io/apache/camel-k:$(make version)
docker build -t "${IMAGE}" -f build/Dockerfile .
echo "installing camel k cluster resources"
-export
KAMEL_INSTALL_MAVEN_REPOSITORIES=https://repository.apache.org/content/repositories/snapshots@id=apache-snapshots@snapshots
+export KAMEL_INSTALL_MAVEN_REPOSITORIES=$(make get-staging-repo)
./kamel install --cluster-setup
oc login -u developer
