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/12/19 16:25:17 UTC
(camel-k) branch main updated (011bf47a5 -> c06e4786d)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 011bf47a5 Updating source checks for native builds (#4987)
new 7448c0a0d chore(ci): bump default runtime to 3.6.0
new 3526fcfc4 fix(ci): don't stop on single Kamelet error
new aff598cc5 fix(ci): quarkus native build still legacy way in 3.6.0
new 877997681 fix(dsl): kotlin support back
new c06e4786d fix(camel): file components does not like .
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../bases/camel-k.clusterserviceversion.yaml | 2 +-
e2e/common/languages/kotlin_test.go | 2 --
e2e/common/misc/registry_maven_wagon_test.go | 2 +-
pkg/builder/runtime_support.go | 7 ++++--
pkg/install/kamelets.go | 9 ++++++--
pkg/util/defaults/defaults.go | 2 +-
...catalog-3.2.0.yaml => camel-catalog-3.6.0.yaml} | 27 +++++++++++++++-------
script/Makefile | 7 +++---
8 files changed, 38 insertions(+), 20 deletions(-)
rename resources/{camel-catalog-3.2.0.yaml => camel-catalog-3.6.0.yaml} (99%)
(camel-k) 01/05: chore(ci): bump default runtime to 3.6.0
Posted by pc...@apache.org.
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 7448c0a0dfdfbbe2b2748cbc3e1e34fa12d89f73
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Dec 15 11:13:34 2023 +0100
chore(ci): bump default runtime to 3.6.0
---
.../bases/camel-k.clusterserviceversion.yaml | 2 +-
e2e/builder/build_test.go | 2 +-
pkg/util/defaults/defaults.go | 2 +-
...catalog-3.2.0.yaml => camel-catalog-3.6.0.yaml} | 27 +++++++++++++++-------
script/Makefile | 5 ++--
5 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index db02c16a4..9a63dfe93 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -23,7 +23,7 @@ metadata:
categories: Integration & Delivery
certified: "false"
containerImage: docker.io/apache/camel-k:2.2.0-SNAPSHOT
- createdAt: 2023-10-24T07:48:33Z
+ createdAt: 2023-12-15T10:08:46Z
description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
with serverless superpowers.
operators.operatorframework.io/builder: operator-sdk-v1.16.0
diff --git a/e2e/builder/build_test.go b/e2e/builder/build_test.go
index f449f0ef2..0dbc54d81 100644
--- a/e2e/builder/build_test.go
+++ b/e2e/builder/build_test.go
@@ -305,7 +305,7 @@ func TestKitKnativeFullBuild(t *testing.T) {
}
func TestKitTimerToLogFullNativeBuild(t *testing.T) {
- doKitFullBuild(t, "timer-to-log", "15m0s", TestTimeoutLong*3, kitOptions{
+ doKitFullBuild(t, "timer-to-log", "30m0s", TestTimeoutLong*3, kitOptions{
dependencies: []string{
"camel:timer", "camel:log",
},
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 7adfd5e57..cbc823e01 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -26,7 +26,7 @@ const (
Version = "2.2.0-SNAPSHOT"
// DefaultRuntimeVersion --
- DefaultRuntimeVersion = "3.2.0"
+ DefaultRuntimeVersion = "3.6.0"
// BuildahVersion --
BuildahVersion = "1.30.0"
diff --git a/resources/camel-catalog-3.2.0.yaml b/resources/camel-catalog-3.6.0.yaml
similarity index 99%
rename from resources/camel-catalog-3.2.0.yaml
rename to resources/camel-catalog-3.6.0.yaml
index 6841a342e..6f6b5ce5b 100644
--- a/resources/camel-catalog-3.2.0.yaml
+++ b/resources/camel-catalog-3.6.0.yaml
@@ -18,22 +18,24 @@
apiVersion: camel.apache.org/v1
kind: CamelCatalog
metadata:
- name: camel-catalog-3.2.0
+ name: camel-catalog-3.6.0
labels:
app: camel-k
- camel.apache.org/catalog.loader.version: 4.0.0
- camel.apache.org/catalog.version: 4.0.0
- camel.apache.org/runtime.version: 3.2.0
+ camel.apache.org/catalog.loader.version: 4.2.0
+ camel.apache.org/catalog.version: 4.2.0
+ camel.apache.org/runtime.version: 3.6.0
spec:
runtime:
- version: 3.2.0
+ version: 3.6.0
provider: quarkus
applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint
metadata:
- camel-quarkus.version: 3.2.0
- camel.version: 4.0.0
+ camel-quarkus.version: 3.6.0
+ camel.version: 4.2.0
+ jib.layer-filter-extension-maven.version: 0.3.0
+ jib.maven-plugin.version: 3.4.0
quarkus.native-builder-image: quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.0-jdk-17
- quarkus.version: 3.2.6.Final
+ quarkus.version: 3.6.0
dependencies:
- groupId: org.apache.camel.k
artifactId: camel-k-runtime
@@ -2402,6 +2404,15 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.springrabbit.SpringRabbitMQComponent
+ camel-quarkus-spring-redis:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-spring-redis
+ schemes:
+ - id: spring-redis
+ http: false
+ passive: false
+ javaTypes:
+ - org.apache.camel.component.redis.RedisComponent
camel-quarkus-sql:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-sql
diff --git a/script/Makefile b/script/Makefile
index 62b6292c6..c0a25a37f 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -23,7 +23,7 @@ VERSIONFILE := pkg/util/defaults/defaults.go
VERSION ?= 2.2.0-SNAPSHOT
LAST_RELEASED_IMAGE_NAME := camel-k-operator
LAST_RELEASED_VERSION ?= 2.1.0
-DEFAULT_RUNTIME_VERSION := 3.2.0
+DEFAULT_RUNTIME_VERSION := 3.6.0
BUILDAH_VERSION := 1.30.0
KANIKO_VERSION := 1.9.1
CONTROLLER_GEN_VERSION := v0.6.1
@@ -153,7 +153,8 @@ update-default-camel:
bump-replace:
@# Bump version and replace with the variables provided by the user
@sed -i 's/^VERSION ?= .*$//VERSION ?= $(VERSION)/' ./script/Makefile
- @mvn -f java/pom.xml versions:set -DgenerateBackupPoms=false -DnewVersion=$(VERSION)
+ @mvn -f java/crds/pom.xml versions:set -DgenerateBackupPoms=false -DnewVersion=$(VERSION)
+ @mvn -f java/maven-logging/pom.xml versions:set -DgenerateBackupPoms=false -DnewVersion=$(VERSION)
@sed -i 's/^LAST_RELEASED_VERSION ?= .*$//LAST_RELEASED_VERSION ?= $(LAST_RELEASED_VERSION)/' ./script/Makefile
@sed -i 's/^STAGING_RUNTIME_REPO :=.*$//STAGING_RUNTIME_REPO :=/' ./script/Makefile
(camel-k) 02/05: fix(ci): don't stop on single Kamelet error
Posted by pc...@apache.org.
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 3526fcfc4b3e6d44c48d0e640b1d7fa03ae019b7
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Mon Dec 18 11:54:09 2023 +0100
fix(ci): don't stop on single Kamelet error
---
pkg/install/kamelets.go | 9 +++++++--
script/Makefile | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/pkg/install/kamelets.go b/pkg/install/kamelets.go
index 1a7d41ddf..212ff990f 100644
--- a/pkg/install/kamelets.go
+++ b/pkg/install/kamelets.go
@@ -114,12 +114,17 @@ func KameletCatalog(ctx context.Context, c client.Client, namespace string) erro
return err
}
v := hasServerSideApply.Load()
+ var bundleKamError error
if vb, ok := v.(bool); ok && vb {
if !once {
- return serverSideApply(gCtx, c, kamelet)
+ bundleKamError = serverSideApply(gCtx, c, kamelet)
}
} else {
- return clientSideApply(gCtx, c, kamelet)
+ bundleKamError = clientSideApply(gCtx, c, kamelet)
+ }
+ // We only log the error. If we returned the error, the creation of the ITP would have stopped
+ if bundleKamError != nil {
+ log.Error(bundleKamError, "Error occurred whilst applying bundled kamelet")
}
return nil
})
diff --git a/script/Makefile b/script/Makefile
index c0a25a37f..0fb0f2637 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -86,7 +86,7 @@ STAGING_RUNTIME_REPO :=
INSTALL_DEFAULT_KAMELETS ?= true
KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git
# Make sure to use a released tag or empty if you want to get the latest development bits
-KAMELET_CATALOG_REPO_TAG := v4.0.0
+KAMELET_CATALOG_REPO_TAG := v4.2.0
# When performing integration tests, it is not necessary to always execute build, especially
# in e2e tests when lots of tests are being executed sequentially & the build has already taken place.
(camel-k) 04/05: fix(dsl): kotlin support back
Posted by pc...@apache.org.
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 8779976814dd0ec2ec707bbb836d5cdef17978bb
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Dec 19 10:17:21 2023 +0100
fix(dsl): kotlin support back
Closes #4738
---
e2e/common/languages/kotlin_test.go | 2 --
1 file changed, 2 deletions(-)
diff --git a/e2e/common/languages/kotlin_test.go b/e2e/common/languages/kotlin_test.go
index 39806fd11..da210afc2 100644
--- a/e2e/common/languages/kotlin_test.go
+++ b/e2e/common/languages/kotlin_test.go
@@ -36,8 +36,6 @@ import (
func TestRunSimpleKotlinExamples(t *testing.T) {
RegisterTestingT(t)
- t.Skip("Skipping test. See https://github.com/apache/camel-k/issues/4738")
-
t.Run("run kotlin", func(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns, "files/kotlin.kts").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "kotlin"), TestTimeoutLong).Should(Equal(v1.PodRunning))
(camel-k) 03/05: fix(ci): quarkus native build still legacy way in 3.6.0
Posted by pc...@apache.org.
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 aff598cc5dd12c79ae76c87afc4cf7ce2decb7b4
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Dec 19 10:11:42 2023 +0100
fix(ci): quarkus native build still legacy way in 3.6.0
---
pkg/builder/runtime_support.go | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/pkg/builder/runtime_support.go b/pkg/builder/runtime_support.go
index a230c8882..0fdb6514b 100644
--- a/pkg/builder/runtime_support.go
+++ b/pkg/builder/runtime_support.go
@@ -21,7 +21,7 @@ import "path/filepath"
// QuarkusRuntimeNativeAdapter is used to get the proper Quarkus native configuration which may be different
// in Camel Quarkus version. It is known that before Camel Quarkus 3.5 there was no support to native-source,
-// and using this interface will adapt the configuration to build natively according the previous configuration.
+// and using this interface will adapt the configuration to build natively according each version expected configuration.
type QuarkusRuntimeNativeAdapter interface {
// The commands used to build a native application
BuildCommands() string
@@ -85,7 +85,10 @@ func (n *NativeAdapter) NativeMavenProperty() string {
// QuarkusRuntimeSupport is used to get the proper native configuration based on the Camel Quarkus version.
func QuarkusRuntimeSupport(version string) QuarkusRuntimeNativeAdapter {
- if version < "3.5.0" {
+ // Version 3.6.0 depends on a parameter which is available on JDK-21 based image.
+ // For this reason we fallback to the "legacy" Quarkus native build.
+ // Hopefully this will be solved starting from runtime version 3.7.0.
+ if version < "3.7.0" {
return &NativeAdapter{}
}
return &NativeSourcesAdapter{}
(camel-k) 05/05: fix(camel): file components does not like .
Posted by pc...@apache.org.
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 c06e4786d59cf7f5b6fa48a6a27e6c9b6ae2d196
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue Dec 19 16:02:02 2023 +0100
fix(camel): file components does not like .
---
e2e/builder/build_test.go | 2 +-
e2e/common/misc/registry_maven_wagon_test.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/e2e/builder/build_test.go b/e2e/builder/build_test.go
index 0dbc54d81..f449f0ef2 100644
--- a/e2e/builder/build_test.go
+++ b/e2e/builder/build_test.go
@@ -305,7 +305,7 @@ func TestKitKnativeFullBuild(t *testing.T) {
}
func TestKitTimerToLogFullNativeBuild(t *testing.T) {
- doKitFullBuild(t, "timer-to-log", "30m0s", TestTimeoutLong*3, kitOptions{
+ doKitFullBuild(t, "timer-to-log", "15m0s", TestTimeoutLong*3, kitOptions{
dependencies: []string{
"camel:timer", "camel:log",
},
diff --git a/e2e/common/misc/registry_maven_wagon_test.go b/e2e/common/misc/registry_maven_wagon_test.go
index 8f2217b65..0d54a48af 100644
--- a/e2e/common/misc/registry_maven_wagon_test.go
+++ b/e2e/common/misc/registry_maven_wagon_test.go
@@ -70,7 +70,7 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns, "files/registry/LaughingRoute.java",
"--name", name,
- "-p", "location=.?filename=laugh.txt",
+ "-p", "location=/deployments/?filename=laugh.txt",
"-d", "file://files/registry/laugh.txt",
).Execute()).To(Succeed())