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/26 08:51:18 UTC
[camel-k] 02/18: fix(olm): bundles
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 0c41d301f5c5b90f6f7f63f34925a7ef5aa09ce3
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri Mar 24 16:48:45 2023 +0100
fix(olm): bundles
---
.../manifests/bases/camel-k.clusterserviceversion.yaml | 4 ++--
...amel_v1_kameletbinding.yaml => camel_v1_binding.yaml} | 0
.../pages/kamelets/kameletbindings-error-handler.adoc | 2 +-
docs/modules/ROOT/pages/kamelets/kamelets-user.adoc | 2 +-
docs/modules/ROOT/pages/kamelets/kamelets.adoc | 2 +-
e2e/common/traits/service_binding_test.go | 2 +-
e2e/commonwithcustominstall/promote_test.go | 4 ++--
e2e/native/native_binding_test.go | 2 +-
pkg/cmd/bind.go | 4 ++--
pkg/cmd/reset.go | 2 +-
pkg/resources/resources.go | 16 ++++++++--------
pkg/util/bindings/api.go | 2 +-
12 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index 603cfacb1..560bb6bfc 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -23,7 +23,7 @@ metadata:
categories: Integration & Delivery
certified: "false"
containerImage: docker.io/apache/camel-k:2.0.0-SNAPSHOT
- createdAt: 2023-03-24T09:36:48Z
+ createdAt: 2023-03-24T15:48:09Z
description: Apache Camel K is a lightweight integration platform, born on Kubernetes,
with serverless superpowers.
operators.operatorframework.io/builder: operator-sdk-v1.16.0
@@ -63,7 +63,7 @@ spec:
kind: Integration
name: integrations.camel.apache.org
version: v1
- - description: Binding is the Schema for the kamelets binding API
+ - description: Binding is the Schema for the binding API
displayName: Binding
kind: Binding
name: bindings.camel.apache.org
diff --git a/config/samples/bases/camel_v1_kameletbinding.yaml b/config/samples/bases/camel_v1_binding.yaml
similarity index 100%
rename from config/samples/bases/camel_v1_kameletbinding.yaml
rename to config/samples/bases/camel_v1_binding.yaml
diff --git a/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc b/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc
index cbdcb7b52..48b827e08 100644
--- a/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc
+++ b/docs/modules/ROOT/pages/kamelets/kameletbindings-error-handler.adoc
@@ -1,7 +1,7 @@
[[bindings-error-handler]]
=Bindings Error Handler
-Kamelet Binding`s offer a mechanism to specify an error policy to adopt in case an event produced by a `source` or consumed by a `sink`. Through the definition of an `errorHandler` you will be able to apply certain logic to the failing event, such as simply logging, ignoring the event or posting the event to a `Sink`.
+Bindings offer a mechanism to specify an error policy to adopt in case an event produced by a `source` or consumed by a `sink`. Through the definition of an `errorHandler` you will be able to apply certain logic to the failing event, such as simply logging, ignoring the event or posting the event to a `Sink`.
[source,yaml]
----
diff --git a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc
index 5fe4f2d77..b179fb29a 100644
--- a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc
+++ b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc
@@ -390,7 +390,7 @@ To comply with the Knative specifications, in case an "http" or "https" URI is u
=== Error Handling
-You can configure an error handler in order to specify what to do when some event ends up with failure. See xref:kamelets/bindings-error-handler.adoc[Kamelet Bindings Error Handler User Guide] for more detail.
+You can configure an error handler in order to specify what to do when some event ends up with failure. See xref:kamelets/bindings-error-handler.adoc[Bindings Error Handler User Guide] for more detail.
=== Trait via annotations
diff --git a/docs/modules/ROOT/pages/kamelets/kamelets.adoc b/docs/modules/ROOT/pages/kamelets/kamelets.adoc
index a4622c7c8..26f339389 100644
--- a/docs/modules/ROOT/pages/kamelets/kamelets.adoc
+++ b/docs/modules/ROOT/pages/kamelets/kamelets.adoc
@@ -4,5 +4,5 @@
This section of the documentation contains information about Kamelets from both a user and a developer point of view:
- The xref:kamelets/kamelets-user.adoc[Kamelets User Guide] is for users that want to use Kamelets for connecting systems with their applications
-- The xref:kamelets/bindings-error-handler.adoc[Kamelet Bindings Error Handler User Guide] explains how to configure an error handler on a `Kamelet Binding`
+- The xref:kamelets/bindings-error-handler.adoc[Bindings Error Handler User Guide] explains how to configure an error handler on a `Binding`
- The xref:kamelets/kamelets-dev.adoc[Kamelets Developer Guide] is a reference for developers that want to create new Kamelets and share them with users
diff --git a/e2e/common/traits/service_binding_test.go b/e2e/common/traits/service_binding_test.go
index 4d56157d7..bfbcc7726 100644
--- a/e2e/common/traits/service_binding_test.go
+++ b/e2e/common/traits/service_binding_test.go
@@ -74,7 +74,7 @@ func TestServiceBindingTrait(t *testing.T) {
Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring(fmt.Sprintf("%s:%s", host, port)))
})
- t.Run("Kamelet Binding Service Binding", func(t *testing.T) {
+ t.Run("Binding Service Binding", func(t *testing.T) {
// Create our mock service config
message := "hello"
service := &corev1.ConfigMap{
diff --git a/e2e/commonwithcustominstall/promote_test.go b/e2e/commonwithcustominstall/promote_test.go
index 942603bca..38489d37b 100644
--- a/e2e/commonwithcustominstall/promote_test.go
+++ b/e2e/commonwithcustominstall/promote_test.go
@@ -69,7 +69,7 @@ func TestKamelCLIPromote(t *testing.T) {
Eventually(IntegrationLogs(nsDev, "timer-kamelet-usage"), TestTimeoutShort).Should(ContainSubstring("Hello world"))
})
- t.Run("kamelet binding dev", func(t *testing.T) {
+ t.Run("binding dev", func(t *testing.T) {
Expect(CreateTimerKamelet(nsDev, "kb-timer-source")()).To(Succeed())
Expect(KamelBindWithID(operatorDevID, nsDev, "kb-timer-source", "log:info", "-p", "source.message=my-kamelet-binding-rocks").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(nsDev, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
@@ -152,7 +152,7 @@ func TestKamelCLIPromote(t *testing.T) {
Expect(Kamel("promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).NotTo(Succeed())
})
- t.Run("kamelet binding promotion", func(t *testing.T) {
+ t.Run("binding promotion", func(t *testing.T) {
Expect(CreateTimerKamelet(nsProd, "kb-timer-source")()).To(Succeed())
Expect(Kamel("promote", "-n", nsDev, "kb-timer-source-to-log", "--to", nsProd).Execute()).To(Succeed())
Eventually(IntegrationPodPhase(nsProd, "kb-timer-source-to-log"), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
diff --git a/e2e/native/native_binding_test.go b/e2e/native/native_binding_test.go
index d7f654bff..cd4a08ab3 100644
--- a/e2e/native/native_binding_test.go
+++ b/e2e/native/native_binding_test.go
@@ -57,7 +57,7 @@ func TestNativeBinding(t *testing.T) {
}
message := "Magicstring!"
- t.Run("kamelet binding with native build", func(t *testing.T) {
+ t.Run("binding with native build", func(t *testing.T) {
bindingName := "native-binding"
Expect(BindKameletTo(ns, bindingName,
map[string]string{"trait.camel.apache.org/quarkus.package-type": "native"},
diff --git a/pkg/cmd/bind.go b/pkg/cmd/bind.go
index a2cd8979c..9632bdd01 100644
--- a/pkg/cmd/bind.go
+++ b/pkg/cmd/bind.go
@@ -273,9 +273,9 @@ func (o *bindCmdOptions) run(cmd *cobra.Command, args []string) error {
}
if !replaced {
- fmt.Fprintln(cmd.OutOrStdout(), `kamelet binding "`+name+`" created`)
+ fmt.Fprintln(cmd.OutOrStdout(), `binding "`+name+`" created`)
} else {
- fmt.Fprintln(cmd.OutOrStdout(), `kamelet binding "`+name+`" updated`)
+ fmt.Fprintln(cmd.OutOrStdout(), `binding "`+name+`" updated`)
}
return nil
}
diff --git a/pkg/cmd/reset.go b/pkg/cmd/reset.go
index c91c5cf27..e24480b4e 100644
--- a/pkg/cmd/reset.go
+++ b/pkg/cmd/reset.go
@@ -67,7 +67,7 @@ func (o *resetCmdOptions) reset(cmd *cobra.Command, _ []string) {
fmt.Fprint(cmd.ErrOrStderr(), err)
return
}
- fmt.Fprintln(cmd.OutOrStdout(), n, "kamelet bindings deleted from namespace", o.Namespace)
+ fmt.Fprintln(cmd.OutOrStdout(), n, "bindings deleted from namespace", o.Namespace)
}
if !o.SkipIntegrations {
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index fca200371..384056d34 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -486,6 +486,13 @@ var assets = func() http.FileSystem {
name: "bases",
modTime: time.Time{},
},
+ "/samples/bases/camel_v1_binding.yaml": &vfsgen۰CompressedFileInfo{
+ name: "camel_v1_binding.yaml",
+ modTime: time.Time{},
+ uncompressedSize: 1277,
+
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xc1\xae\xdb\x36\x10\xbc\xf3\x2b\x06\xd6\x25\x01\x1c\xb9\xe9\xd1\x3d\x39\x8e\x8d\x08\x49\x6d\xe0\xc9\x69\x90\xe3\x5a\x5a\x4b\x0b\x53\x24\x4b\x52\xd6\xf3\xdf\x17\x94\xec\xc6\x46\x8b\xa2\x87\xf0\x44\x51\xcb\x9d\x99\x9d\x61\x86\x77\x3f\x6f\xa9\x0c\x5f\xa4\x62\x13\xb8\x46\xb4\x88\x2d\x63\xe5\xa8\x6a\x19\xa5\x3d\xc5\x81\x3c\x63\x6b\x7b\x53\x53\x14\x6b\xf0\x66\x55\x6e\xdf\xa2\x37\x35\x7b\x58\xc3\xb0\x1e\x9d\xf5\xac\x [...]
+ },
"/samples/bases/camel_v1_build.yaml": &vfsgen۰CompressedFileInfo{
name: "camel_v1_build.yaml",
modTime: time.Time{},
@@ -528,13 +535,6 @@ var assets = func() http.FileSystem {
compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x54\x4d\x6f\xe3\x46\x0c\xbd\xeb\x57\x3c\x58\x97\x5d\x20\x76\x92\x1e\xd5\x93\x9b\x75\x50\x63\xb7\xf6\x22\xf2\x76\xb1\x47\x5a\xa2\x65\xc2\xd2\xcc\x74\x86\x8a\xe2\x7f\x5f\x8c\x3e\x62\x27\x45\x6f\xd1\x6d\x38\x1c\xf2\x3d\xbe\x47\xa5\x98\x7f\xdc\x97\xa4\xf8\x26\x05\x9b\xc0\x25\xd4\x42\x8f\x8c\xa5\xa3\xe2\xc8\xc8\xed\x41\x3b\xf2\x8c\x47\xdb\x9a\x92\x54\xac\xc1\xa7\x65\xfe\xf8\x19\xad\x29\xd9\xc3\x1a\x86\xf5\x68\xac\xe7\x [...]
},
- "/samples/bases/camel_v1_kameletbinding.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel_v1_kameletbinding.yaml",
- modTime: time.Time{},
- uncompressedSize: 1277,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xc1\xae\xdb\x36\x10\xbc\xf3\x2b\x06\xd6\x25\x01\x1c\xb9\xe9\xd1\x3d\x39\x8e\x8d\x08\x49\x6d\xe0\xc9\x69\x90\xe3\x5a\x5a\x4b\x0b\x53\x24\x4b\x52\xd6\xf3\xdf\x17\x94\xec\xc6\x46\x8b\xa2\x87\xf0\x44\x51\xcb\x9d\x99\x9d\x61\x86\x77\x3f\x6f\xa9\x0c\x5f\xa4\x62\x13\xb8\x46\xb4\x88\x2d\x63\xe5\xa8\x6a\x19\xa5\x3d\xc5\x81\x3c\x63\x6b\x7b\x53\x53\x14\x6b\xf0\x66\x55\x6e\xdf\xa2\x37\x35\x7b\x58\xc3\xb0\x1e\x9d\xf5\xac\x [...]
- },
"/samples/patch-integration-platform.yaml": &vfsgen۰CompressedFileInfo{
name: "patch-integration-platform.yaml",
modTime: time.Time{},
@@ -742,13 +742,13 @@ var assets = func() http.FileSystem {
fs["/samples/patch-integration-platform.yaml"].(os.FileInfo),
}
fs["/samples/bases"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
+ fs["/samples/bases/camel_v1_binding.yaml"].(os.FileInfo),
fs["/samples/bases/camel_v1_build.yaml"].(os.FileInfo),
fs["/samples/bases/camel_v1_camelcatalog.yaml"].(os.FileInfo),
fs["/samples/bases/camel_v1_integration.yaml"].(os.FileInfo),
fs["/samples/bases/camel_v1_integrationkit.yaml"].(os.FileInfo),
fs["/samples/bases/camel_v1_integrationplatform.yaml"].(os.FileInfo),
fs["/samples/bases/camel_v1_kamelet.yaml"].(os.FileInfo),
- fs["/samples/bases/camel_v1_kameletbinding.yaml"].(os.FileInfo),
}
fs["/templates"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
fs["/templates/groovy.tmpl"].(os.FileInfo),
diff --git a/pkg/util/bindings/api.go b/pkg/util/bindings/api.go
index 6d6b5666f..4b05fae94 100644
--- a/pkg/util/bindings/api.go
+++ b/pkg/util/bindings/api.go
@@ -44,7 +44,7 @@ type Binding struct {
ApplicationProperties map[string]string
}
-// BindingProvider maps a KameletBinding endpoint into Camel K resources.
+// BindingProvider maps a Binding endpoint into Camel K resources.
type BindingProvider interface {
// ID returns the name of the binding provider
ID() string