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/04/28 14:00:41 UTC

[camel-k] branch main updated (dde540416 -> 7eb0d25d0)

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 dde540416 chore: minor descriptions
     new cbda43804 fix(operator): do not panic if cannot set GOMAXPROCS
     new 3717043a3 fix(ci): fill kamelets catalog
     new 7eb0d25d0 fix(ci): make update-docs

The 3 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:
 docs/antora.yml                                                     | 2 +-
 pkg/cmd/operator/operator.go                                        | 4 +++-
 ...alog-3.20.1-SNAPSHOT.yaml => camel-catalog-2.16.0-SNAPSHOT.yaml} | 6 +++---
 script/Makefile                                                     | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)
 rename resources/{camel-catalog-3.20.1-SNAPSHOT.yaml => camel-catalog-2.16.0-SNAPSHOT.yaml} (99%)


[camel-k] 01/03: fix(operator): do not panic if cannot set GOMAXPROCS

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 cbda4380498b8613f3eaa1c94b59ca1d31cfbcd7
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Apr 28 12:24:31 2023 +0200

    fix(operator): do not panic if cannot set GOMAXPROCS
    
    Closes #4299
---
 pkg/cmd/operator/operator.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/cmd/operator/operator.go b/pkg/cmd/operator/operator.go
index 8e0028020..862043d5c 100644
--- a/pkg/cmd/operator/operator.go
+++ b/pkg/cmd/operator/operator.go
@@ -126,7 +126,9 @@ func Run(healthPort, monitoringPort int32, leaderElection bool, leaderElectionID
 	klog.SetLogger(log.AsLogger())
 
 	_, err := maxprocs.Set(maxprocs.Logger(func(f string, a ...interface{}) { log.Info(fmt.Sprintf(f, a)) }))
-	exitOnError(err, "failed to set GOMAXPROCS from cgroups")
+	if err != nil {
+		log.Error(err, "failed to set GOMAXPROCS from cgroups")
+	}
 
 	printVersion()
 


[camel-k] 03/03: fix(ci): make update-docs

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 7eb0d25d08f7d5896979cd3b5ca78735c1a19f81
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Apr 28 12:39:36 2023 +0200

    fix(ci): make update-docs
---
 docs/antora.yml                                                     | 2 +-
 ...alog-3.20.1-SNAPSHOT.yaml => camel-catalog-2.16.0-SNAPSHOT.yaml} | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/antora.yml b/docs/antora.yml
index 1008b85db..eabc3cdef 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -32,7 +32,7 @@ asciidoc:
     prerelease: true
     camel-kamelets-version: '3.20.1.1'
     camel-kamelets-docs-version: 3.20.x
-    camel-k-runtime-version: 3.20.1-SNAPSHOT
+    camel-k-runtime-version: 2.16.0-SNAPSHOT
     camel-api-versions: camel.apache.org/v1 camel.apache.org/v1alpha1 # from Makefile BUNDLE_CAMEL_APIS
     camel-version: 3.20.1
     camel-docs-version: 3.20.x
diff --git a/resources/camel-catalog-3.20.1-SNAPSHOT.yaml b/resources/camel-catalog-2.16.0-SNAPSHOT.yaml
similarity index 99%
rename from resources/camel-catalog-3.20.1-SNAPSHOT.yaml
rename to resources/camel-catalog-2.16.0-SNAPSHOT.yaml
index 851dcfb1d..565e17363 100644
--- a/resources/camel-catalog-3.20.1-SNAPSHOT.yaml
+++ b/resources/camel-catalog-2.16.0-SNAPSHOT.yaml
@@ -18,15 +18,15 @@
 apiVersion: camel.apache.org/v1
 kind: CamelCatalog
 metadata:
-  name: camel-catalog-3.20.1-snapshot
+  name: camel-catalog-2.16.0-snapshot
   labels:
     app: camel-k
     camel.apache.org/catalog.loader.version: 3.20.1
     camel.apache.org/catalog.version: 3.20.1
-    camel.apache.org/runtime.version: 3.20.1-SNAPSHOT
+    camel.apache.org/runtime.version: 2.16.0-SNAPSHOT
 spec:
   runtime:
-    version: 3.20.1-SNAPSHOT
+    version: 2.16.0-SNAPSHOT
     provider: quarkus
     applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint
     metadata:


[camel-k] 02/03: fix(ci): fill kamelets catalog

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 3717043a360ec533f23e8c1542ff85e23d417006
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Apr 28 12:37:17 2023 +0200

    fix(ci): fill kamelets catalog
---
 script/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/Makefile b/script/Makefile
index 021f7da95..838481834 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 := 
+KAMELET_CATALOG_REPO_TAG := v3.20.1.1
 
 # 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.