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 13:00:36 UTC
[camel-k] branch master updated: chore(release): restore catalog
naming and fix test
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 9b37384 chore(release): restore catalog naming and fix test
9b37384 is described below
commit 9b373845400863cff26cd3e474d0d7ecc85c1748
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Wed Nov 13 14:00:16 2019 +0100
chore(release): restore catalog naming and fix test
---
deploy/camel-catalog-quarkus-0.3.1-1.0.7.yaml | 2 +-
deploy/resources.go | 2 +-
pkg/controller/integrationplatform/create_test.go | 8 +++++++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/deploy/camel-catalog-quarkus-0.3.1-1.0.7.yaml b/deploy/camel-catalog-quarkus-0.3.1-1.0.7.yaml
index 1c77541..c7ea5ad 100644
--- a/deploy/camel-catalog-quarkus-0.3.1-1.0.7.yaml
+++ b/deploy/camel-catalog-quarkus-0.3.1-1.0.7.yaml
@@ -18,7 +18,7 @@
apiVersion: camel.apache.org/v1alpha1
kind: CamelCatalog
metadata:
- name: camel-catalog-quarkus-0.3.1-1.0.7
+ name: camel-quarkus-catalog-0.3.1-1.0.7
labels:
app: camel-k
camel.apache.org/catalog.version: 3.0.0-RC3
diff --git a/deploy/resources.go b/deploy/resources.go
index 4607011..c531fb9 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -9199,7 +9199,7 @@ spec:
apiVersion: camel.apache.org/v1alpha1
kind: CamelCatalog
metadata:
- name: camel-catalog-quarkus-0.3.1-1.0.7
+ name: camel-quarkus-catalog-0.3.1-1.0.7
labels:
app: camel-k
camel.apache.org/catalog.version: 3.0.0-RC3
diff --git a/pkg/controller/integrationplatform/create_test.go b/pkg/controller/integrationplatform/create_test.go
index abb7198..4a92f17 100644
--- a/pkg/controller/integrationplatform/create_test.go
+++ b/pkg/controller/integrationplatform/create_test.go
@@ -63,7 +63,13 @@ func TestCreate(t *testing.T) {
n := strings.TrimSuffix(k, ".yaml")
n = strings.ToLower(n)
- if c.Name == n {
+ name := c.Name
+ // TODO can be safely removed when catalog naming is fixed in runtime maven plugin
+ if strings.HasPrefix(name,"camel-quarkus-catalog") {
+ name = "camel-catalog-quarkus" + strings.TrimPrefix(name, "camel-quarkus-catalog")
+ }
+
+ if name == n {
found = true
}
}