You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/03/02 11:02:10 UTC
[camel-k] branch master updated (1c55792 -> 1894e57)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 1c55792 Workaround. Labels are not supported on ProjectRequest
new 4daad1f Catalog generation does not take into account the runtime provider to determine the catalog name #1312
new 1894e57 Regen
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:
deploy/resources.go | 8 --------
pkg/trait/camel.go | 11 ++++++-----
2 files changed, 6 insertions(+), 13 deletions(-)
[camel-k] 01/02: Catalog generation does not take into account the
runtime provider to determine the catalog name #1312
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 4daad1f9dea291a0797debb44d85806ca6b356f8
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Fri Feb 28 18:09:02 2020 +0100
Catalog generation does not take into account the runtime provider to determine the catalog name #1312
---
pkg/trait/camel.go | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/pkg/trait/camel.go b/pkg/trait/camel.go
index a28e418..b532c07 100644
--- a/pkg/trait/camel.go
+++ b/pkg/trait/camel.go
@@ -23,8 +23,6 @@ import (
"github.com/pkg/errors"
- k8serrors "k8s.io/apimachinery/pkg/api/errors"
-
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/maven"
@@ -109,7 +107,7 @@ func (t *camelTrait) loadOrCreateCatalog(e *Environment, runtimeVersion string)
}
// sanitize catalog name
- catalogName := "camel-catalog-" + strings.ToLower(runtimeVersion) + "-main"
+ catalogName := "camel-catalog-" + strings.ToLower(runtimeVersion) + "-" + string(runtime.Provider)
cx := v1.NewCamelCatalogWithSpecs(ns, catalogName, catalog.CamelCatalogSpec)
cx.Labels = make(map[string]string)
@@ -119,8 +117,11 @@ func (t *camelTrait) loadOrCreateCatalog(e *Environment, runtimeVersion string)
cx.Labels["camel.apache.org/catalog.generated"] = True
err = e.Client.Create(e.C, &cx)
- if err != nil && !k8serrors.IsAlreadyExists(err) {
- return err
+ if err != nil {
+ return errors.Wrapf(err, "unable to create catalog runtime=%s, provider=%s, name=%s",
+ runtime.Version,
+ runtime.Provider,
+ catalogName)
}
}
}
[camel-k] 02/02: Regen
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1894e573961ae111d1df9698e3b361985f5e9c1d
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Fri Feb 28 18:13:03 2020 +0100
Regen
---
deploy/resources.go | 8 --------
1 file changed, 8 deletions(-)
diff --git a/deploy/resources.go b/deploy/resources.go
index 2049299..d17d2dd 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -214,13 +214,6 @@ var assets = func() http.FileSystem {
compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x6f\x9b\x40\x14\xbc\xef\xaf\x18\x99\x4b\x22\xf9\xa3\xed\xd1\x3d\xd1\xc4\x56\x51\x23\x5b\x0a\x4e\xa3\x1c\x9f\xe1\x19\x9e\x02\xfb\xe8\xee\x12\xe2\x7f\x5f\x2d\xb6\x9b\x44\xbd\x66\x6f\x88\x61\x3e\x76\x86\x04\xb3\xcf\x3b\x26\xc1\x9d\x14\x6c\x3d\x97\x08\x8a\x50\x33\xd2\x8e\x8a\x9a\x91\xeb\x21\x0c\xe4\x18\x6b\xed\x6d\x49\x41\xd4\xe2\x2a\xcd\xd7\xd7\xe8\x6d\xc9\x0e\x6a\x19\xea\xd0\xaa\x63\x93\xa0\x50\x1b\x9c\xec\x [...]
},
- "/operator.yaml": &vfsgen۰CompressedFileInfo{
- name: "operator.yaml",
- modTime: time.Time{},
- uncompressedSize: 2106,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x54\xc1\x6e\xe3\x36\x10\xbd\xeb\x2b\x1e\xac\xcb\x2e\x10\xdb\x49\x8f\xea\x49\x4d\x1c\xc4\x68\x2a\x19\x96\xb7\xc1\x9e\x8a\x09\x35\x92\x88\x50\xa4\x4a\x52\xd1\xea\xef\x0b\xca\x76\x62\x67\xb7\x69\x0f\xc1\xf2\x24\x69\x66\xde\xbc\x37\xf3\xc4\x18\xf3\x8f\x3b\x51\x8c\x7b\x29\x58\x3b\x2e\xe1\x0d\x7c\xc3\x48\x3b\x12\x0d\xa3\x30\x95\x1f\xc8\x32\x6e\x4d\xaf\x4b\xf2\xd2\x68\x7c\x4a\x8b\xdb\xcf\xe8\x75\xc9\x16\x46\x33\x8c\x45\x [...]
- },
"/platform-cr.yaml": &vfsgen۰CompressedFileInfo{
name: "platform-cr.yaml",
modTime: time.Time{},
@@ -369,7 +362,6 @@ var assets = func() http.FileSystem {
fs["/operator-role-olm.yaml"].(os.FileInfo),
fs["/operator-role-openshift.yaml"].(os.FileInfo),
fs["/operator-service-account.yaml"].(os.FileInfo),
- fs["/operator.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),