You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2023/04/04 23:47:39 UTC

[camel-k] branch main updated (acf284ab7 -> 68bac8bae)

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git


    from acf284ab7 chore/keystore_test file path change
     new aa929dfa5 chore: changelog automatic update
     new 68bac8bae chore: nightly resource refresh

The 2 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:
 CHANGELOG.md                                               |  3 +++
 .../strimzi/duck/client/internalclientset/fake/register.go | 14 +++++++-------
 .../duck/client/internalclientset/scheme/register.go       | 14 +++++++-------
 pkg/client/camel/clientset/versioned/fake/register.go      | 14 +++++++-------
 pkg/client/camel/clientset/versioned/scheme/register.go    | 14 +++++++-------
 pkg/resources/resources.go                                 |  4 ++--
 6 files changed, 33 insertions(+), 30 deletions(-)


[camel-k] 01/02: chore: changelog automatic update

Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit aa929dfa5f1006bddc87fba5996e4b9741066790
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Tue Apr 4 23:42:06 2023 +0000

    chore: changelog automatic update
---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee2cd98e7..9e3eb68f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,10 @@
 
 **Closed issues:**
 
+- duplicate routeId issue [\#4225](https://github.com/apache/camel-k/issues/4225)
 - `KameletBinding` should own the related `Integration` [\#4219](https://github.com/apache/camel-k/issues/4219)
 - `kamel rebuild` does not rebuild integrations correctly [\#4218](https://github.com/apache/camel-k/issues/4218)
+- Local file in unit test leftover [\#4217](https://github.com/apache/camel-k/issues/4217)
 - Validate error [\#4214](https://github.com/apache/camel-k/issues/4214)
 - `kamel rebuild` does not rebuild KameletBindings [\#4208](https://github.com/apache/camel-k/issues/4208)
 - Creation of monitoring resources fail in a new GKE cluster [\#4191](https://github.com/apache/camel-k/issues/4191)
@@ -24,6 +26,7 @@
 - How to use JVM classpaths in Native mode? [\#4124](https://github.com/apache/camel-k/issues/4124)
 - Private Registry With TLS  Can Not Work [\#3672](https://github.com/apache/camel-k/issues/3672)
 - Move from release nightly to Continuous Delivery [\#3260](https://github.com/apache/camel-k/issues/3260)
+- Default to using Micrometer for integration monitoring [\#1773](https://github.com/apache/camel-k/issues/1773)
 
 ## [2.0.0-nightly](https://github.com/apache/camel-k/tree/2.0.0-nightly) (2023-03-22)
 


[camel-k] 02/02: chore: nightly resource refresh

Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 68bac8baedad89e9e5d3b78a7c02aa6e0b3e5829
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Tue Apr 4 23:47:35 2023 +0000

    chore: nightly resource refresh
---
 .../strimzi/duck/client/internalclientset/fake/register.go | 14 +++++++-------
 .../duck/client/internalclientset/scheme/register.go       | 14 +++++++-------
 pkg/client/camel/clientset/versioned/fake/register.go      | 14 +++++++-------
 pkg/client/camel/clientset/versioned/scheme/register.go    | 14 +++++++-------
 pkg/resources/resources.go                                 |  4 ++--
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/addons/strimzi/duck/client/internalclientset/fake/register.go b/addons/strimzi/duck/client/internalclientset/fake/register.go
index e6ac15499..53a4309e7 100644
--- a/addons/strimzi/duck/client/internalclientset/fake/register.go
+++ b/addons/strimzi/duck/client/internalclientset/fake/register.go
@@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
 // of clientsets, like in:
 //
-//	import (
-//	  "k8s.io/client-go/kubernetes"
-//	  clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-//	  aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-//	)
+//   import (
+//     "k8s.io/client-go/kubernetes"
+//     clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+//     aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+//   )
 //
-//	kclientset, _ := kubernetes.NewForConfig(c)
-//	_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   kclientset, _ := kubernetes.NewForConfig(c)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
diff --git a/addons/strimzi/duck/client/internalclientset/scheme/register.go b/addons/strimzi/duck/client/internalclientset/scheme/register.go
index 6abeca247..11f233b92 100644
--- a/addons/strimzi/duck/client/internalclientset/scheme/register.go
+++ b/addons/strimzi/duck/client/internalclientset/scheme/register.go
@@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
 // of clientsets, like in:
 //
-//	import (
-//	  "k8s.io/client-go/kubernetes"
-//	  clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-//	  aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-//	)
+//   import (
+//     "k8s.io/client-go/kubernetes"
+//     clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+//     aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+//   )
 //
-//	kclientset, _ := kubernetes.NewForConfig(c)
-//	_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   kclientset, _ := kubernetes.NewForConfig(c)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
diff --git a/pkg/client/camel/clientset/versioned/fake/register.go b/pkg/client/camel/clientset/versioned/fake/register.go
index d55e6d595..249a2b9e3 100644
--- a/pkg/client/camel/clientset/versioned/fake/register.go
+++ b/pkg/client/camel/clientset/versioned/fake/register.go
@@ -40,14 +40,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
 // of clientsets, like in:
 //
-//	import (
-//	  "k8s.io/client-go/kubernetes"
-//	  clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-//	  aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-//	)
+//   import (
+//     "k8s.io/client-go/kubernetes"
+//     clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+//     aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+//   )
 //
-//	kclientset, _ := kubernetes.NewForConfig(c)
-//	_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   kclientset, _ := kubernetes.NewForConfig(c)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
diff --git a/pkg/client/camel/clientset/versioned/scheme/register.go b/pkg/client/camel/clientset/versioned/scheme/register.go
index 493d56e4c..9366fb20c 100644
--- a/pkg/client/camel/clientset/versioned/scheme/register.go
+++ b/pkg/client/camel/clientset/versioned/scheme/register.go
@@ -40,14 +40,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
 // of clientsets, like in:
 //
-//	import (
-//	  "k8s.io/client-go/kubernetes"
-//	  clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-//	  aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-//	)
+//   import (
+//     "k8s.io/client-go/kubernetes"
+//     clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+//     aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+//   )
 //
-//	kclientset, _ := kubernetes.NewForConfig(c)
-//	_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   kclientset, _ := kubernetes.NewForConfig(c)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index ae517e797..b340307ee 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -625,9 +625,9 @@ var assets = func() http.FileSystem {
 		"/traits.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "traits.yaml",
 			modTime:          time.Time{},
-			uncompressedSize: 64902,
+			uncompressedSize: 64965,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xfd\x77\x1b\x37\x92\xe0\xef\xfe\x2b\xf0\xb8\xb7\x4f\x92\x8f\x1f\x72\x66\x33\x9b\xd5\x9d\x77\x4e\x71\x9c\x8c\xe2\x2f\x9d\xa5\x64\x76\x9e\xcf\x6f\x08\x76\x83\x24\xcc\x26\xd0\x03\xa0\x25\x33\x37\xf7\xbf\xdf\x43\x55\xe1\xa3\x9b\x4d\x89\xb2\xad\xec\x68\x27\x33\xef\xc5\x22\xd9\x5d\x28\x14\x0a\x85\x42\x7d\x3a\xc3\xa5\xb3\x27\x8f\x46\x4c\xf1\xb5\x38\x61\xbf\xb3\x05\xaf\xc4\x23\xc6\xea\x8a\xbb\xb9\x36\xeb\x13\x36\xe7\x [...]
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6b\x73\x1c\x37\x92\xe0\x77\xfd\x0a\x44\xef\x6d\x90\xd4\xf5\x83\xf2\xac\x67\xbd\xbc\xd3\xce\xd1\xb2\xec\xa1\xf5\xe2\x89\xb4\x67\x27\x74\x8a\x69\x74\x15\xba\x1b\xea\x6a\xa0\x06\x40\x91\x6a\xdf\xdc\x7f\xbf\x40\x66\xe2\x51\xd5\xd5\x64\x53\x12\xbd\xc3\x1d\xef\x46\x8c\x45\xb2\x90\x48\x24\x12\x89\x44\x3e\x9d\xe1\xd2\xd9\x93\x47\x23\xa6\xf8\x5a\x9c\xb0\xdf\xd9\x82\x57\xe2\x11\x63\x75\xc5\xdd\x5c\x9b\xf5\x09\x9b\xf3\x [...]
 		},
 	}
 	fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{