You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2019/11/13 15:48:08 UTC
[camel-k] branch master updated: chore(release): fix code style
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 c460984 chore(release): fix code style
c460984 is described below
commit c460984a4c412d9a0884948bfdd09e18e958fe39
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Wed Nov 13 16:47:56 2019 +0100
chore(release): fix code style
---
pkg/controller/integrationplatform/create_test.go | 2 +-
pkg/util/camel/catalog.go | 13 -------------
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/pkg/controller/integrationplatform/create_test.go b/pkg/controller/integrationplatform/create_test.go
index 4a92f17..2670eb7 100644
--- a/pkg/controller/integrationplatform/create_test.go
+++ b/pkg/controller/integrationplatform/create_test.go
@@ -65,7 +65,7 @@ func TestCreate(t *testing.T) {
name := c.Name
// TODO can be safely removed when catalog naming is fixed in runtime maven plugin
- if strings.HasPrefix(name,"camel-quarkus-catalog") {
+ if strings.HasPrefix(name, "camel-quarkus-catalog") {
name = "camel-catalog-quarkus" + strings.TrimPrefix(name, "camel-quarkus-catalog")
}
diff --git a/pkg/util/camel/catalog.go b/pkg/util/camel/catalog.go
index 7da219c..4ad5d6b 100644
--- a/pkg/util/camel/catalog.go
+++ b/pkg/util/camel/catalog.go
@@ -42,19 +42,6 @@ func DefaultCatalog() (*RuntimeCatalog, error) {
// QuarkusCatalog --
func QuarkusCatalog() (*RuntimeCatalog, error) {
- catalogs := make([]v1alpha1.CamelCatalog, 0)
-
- for name, content := range deploy.Resources {
- if strings.HasPrefix(name, "camel-catalog-") {
- var c v1alpha1.CamelCatalog
- if err := yaml2.Unmarshal([]byte(content), &c); err != nil {
- return nil, err
- }
-
- catalogs = append(catalogs, c)
- }
- }
-
return catalogForRuntimeProvider(v1alpha1.QuarkusRuntimeProvider{
CamelQuarkusVersion: defaults.CamelQuarkusVersionConstraint,
QuarkusVersion: defaults.DefaultQuarkusVersion,