Migrate to apiVersion v1 from v1aplha1

fixes apache#1562

* CRDs move apiVersion from camel.apache.org/v1alpha1 to
camel.apache.org/v1
* Migrate from KameletBinding to Pipe
** Rename kind in CRDs
** Renamed KameletBinding examples by changing suffix -bing to -pipe
** Renamed folder and file names having binding
* Updated doc
* Updated Yaks tests

Signed-off-by: Aurélien Pupier <apupier@redhat.com>

README.md

@@ -2,7 +2,7 @@
 
 This repository contains the default Kamelet catalog used by Apache Camel and its sub-projects.
 
-Kamelets in this repository can be used natively in Camel K, Camel, Camel-Quarkus and Camel-spring-boot integrations, without additional configuration steps. Users just need to reference the Kamelets by name in the URI (e.g. `kamelet:timer-source?message=Hello`), or use them in a `KameletBinding`, for Camel K, in particular.
+Kamelets in this repository can be used natively in Camel K, Camel, Camel-Quarkus and Camel-spring-boot integrations, without additional configuration steps. Users just need to reference the Kamelets by name in the URI (e.g. `kamelet:timer-source?message=Hello`), or use them in a `Pipe`, for Camel K, in particular.
 
 **NOTE**: Camel K (and other sub-projects) will only use a specific version of this Kamelet catalog. Refer to the release notes of the sub-project for more information.
 
@@ -59,7 +59,7 @@ All Kamelets present in this repository **MUST** have the *annotation* `camel.ap
 We provide an example of Kamelet to give more context to the following sections:
 
 ```yaml
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: timer-source
@@ -162,11 +162,11 @@ Kamelets submitted with tests that verify their correctness **MUST** be labeled
 
 **NOTE**: there's no way at the moment to inject credentials for external systems into the CI in order to write more advanced tests, but we can expect we'll find an usable strategy in the long run
 
-### Kamelet Binding Examples
+### Pipe Examples
 
-Binding examples are highly encouraged to be added under `templates/bindings/camel-k` directory for Kamelet Binding and `templates/bindings/core` for the YAML routes.
+Pipe examples are highly encouraged to be added under `templates/pipes/camel-k` directory for Pipe and `templates/pipes/core` for the YAML routes.
 
-When the Kamelet Catalog documentation is generated, the examples in each Kamelet documentation page are automatically generated, but the generator code is not wise enough and it may generate a Kamelet Binding that doesn't work, requiring additional steps. In this case, the binding example should be added to the above mentioned directories, and add the comment marker at the first line `"# example_for_kamelet_doc"` only in the Camel K Kamelet Binding example (in `templates/bindings/camel-k`). When the documentation mechanism runs, it will source this binding example into the kamelet documentation page as example.
+When the Kamelet Catalog documentation is generated, the examples in each Kamelet documentation page are automatically generated, but the generator code is not wise enough and it may generate a Pipe that doesn't work, requiring additional steps. In this case, the pipe example should be added to the above mentioned directories, and add the comment marker at the first line `"# example_for_kamelet_doc"` only in the Camel K Pipe example (in `templates/pipes/camel-k`). When the documentation mechanism runs, it will source this pipe example into the kamelet documentation page as example.
 
 ## Releasing
 

docs/modules/ROOT/examples/js/kamelets.js

@@ -28,8 +28,8 @@ const QUOTE_REPLACEMENTS = {
   '\\': '\\\\',
 }
 
-// marker added to the first line of kamelet binding files in templates/bindings/camel-k
-// generator will not generate a kamelet binding example and will source this kamelet binding file into the generated doc
+// marker added to the first line of pipe files in templates/pipes/camel-k
+// generator will not generate a pipe example and will source this pipe file into the generated doc
 const EXAMPLE_KAMELET_DOC_MARKER = "example_for_kamelet_doc"
 
 // regex to replace the sink type
@@ -38,11 +38,11 @@ const regex = new RegExp(`(  sink:\\n\\s*ref:\\n)(\\s*kind:)(.*)(\\n\\s*apiVersi
 const svgb64Prefix = 'data:image/svg+xml;base64,'
 
 module.exports = {
-  binding: (binding, apiVersion, kind, metadata_, spec_, refKind, refApiVersion, refName) => {
+  pipe: (pipe, apiVersion, kind, metadata_, spec_, refKind, refApiVersion, refName) => {
       const name = metadata_.name
-      const metadata = {name: `${name}-binding`}
+      const metadata = {name: `${name}-pipe`}
 
-      genExample = shouldGenerateKameletBindingExample(metadata.name)
+      genExample = shouldGeneratePipeExample(metadata.name)
       if (genExample) {
         const kamelet = {
           ref: {
@@ -61,19 +61,19 @@ module.exports = {
         }
         const base = {
           apiVersion,
-          kind: 'KameletBinding',
+          kind: 'Pipe',
           metadata,
         }
-        const fn = kameletBindings[binding] || (() => `unrecognized binding ${binding}`)
+        const fn = pipes[pipe] || (() => `unrecognized pipe ${pipe}`)
         return fn(base, kamelet, platform)
       } else {
-        content = readKameletBindingExample(metadata.name, refApiVersion, refKind, refName)
+        content = readPipeExample(metadata.name, refApiVersion, refKind, refName)
         return content
       }
   },
 
-  bindingCommand: (binding, name, definition, topic) => {
-    const namePrefix = { action: 'step-0', sink: 'sink', source: 'source' }[binding]
+  pipeCommand: (pipe, name, definition, topic) => {
+    const namePrefix = { action: 'step-0', sink: 'sink', source: 'source' }[pipe]
     const quote = (string) => (typeof string === 'String')
       ? string.replace(QUOTED_CHARS, (m) => QUOTE_REPLACEMENTS[m])
       : string
@@ -144,25 +144,25 @@ function kameletPropertyList (definition) {
   )
 }
 
-// verify if the existing kamelet binding example should be automatically generated
+// verify if the existing pipe example should be automatically generated
 // by checking if there is a comment marker in the first line
-function shouldGenerateKameletBindingExample(file) {
-  f = "../camel-kamelets/templates/bindings/camel-k/" + file + ".yaml"
+function shouldGeneratePipeExample(file) {
+  f = "../camel-kamelets/templates/pipes/camel-k/" + file + ".yaml"
   try {
     bufContent = fs.readFileSync(f)
     content = bufContent.toString()
     line = content.split(/\r?\n/)[0]
     return line.indexOf(EXAMPLE_KAMELET_DOC_MARKER) < 0
   } catch (err) {
-    // in case there is no kamelet binding example file, assume the example should be generated
+    // in case there is no pipe example file, assume the example should be generated
     return true
   }
 }
 
-// source the kamelet binding example from the example file
+// source the pipe example from the example file
 // skip the first line and replace the sink kind when the kind is a knative channel
-function readKameletBindingExample(file, apiVersion, kind, name) {
-  f = "../camel-kamelets/templates/bindings/camel-k/" + file + ".yaml"
+function readPipeExample(file, apiVersion, kind, name) {
+  f = "../camel-kamelets/templates/pipes/camel-k/" + file + ".yaml"
   try {
     bufContent = fs.readFileSync(f)
     content = bufContent.toString()
@@ -177,19 +177,19 @@ function readKameletBindingExample(file, apiVersion, kind, name) {
     yamlDoc = yaml.load(klbContent);
     return yamlDoc
   } catch (err) {
-    console.log("Error reading kamelet binding example file " + file + ": " +  err)
+    console.log("Error reading pipe example file " + file + ": " +  err)
     return err
   }
 }
 
 
-const kameletBindings = {
+const pipes = {
   action: (base, kamelet, platform) => Object.assign(base, {
       spec: {
         source: {
           ref: {
             kind: 'Kamelet',
-            apiVersion: 'camel.apache.org/v1alpha1',
+            apiVersion: 'camel.apache.org/v1',
             name: 'kafka-source',
             properties: {
               bootstrapServers: 'localhost:9092',

docs/modules/ROOT/examples/template/kamelet-options.adoc

@@ -81,10 +81,10 @@ endif::[]
 :ref-kind: Channel
 :ref-name: mychannel
 
-.{name}-binding.yaml
+.{name}-pipe.yaml
 [source,yaml,subs='+attributes,macros']
 ----
-jsonpathExpression::example$yaml/${basename}.kamelet.yaml[query='$', format='kamelets.binding("{type}", apiVersion, kind, metadata, spec, "{ref-kind}", "{ref-api-version}", "{ref-name}")', outputFormat=yml, requires={requires}]
+jsonpathExpression::example$yaml/${basename}.kamelet.yaml[query='$', format='kamelets.pipe("{type}", apiVersion, kind, metadata, spec, "{ref-kind}", "{ref-api-version}", "{ref-name}")', outputFormat=yml, requires={requires}]
 ----
 
 ==== *Prerequisite*
@@ -93,13 +93,13 @@ You have xref:{camel-k-docs-version}@camel-k::installation/installation.adoc[Cam
 
 ==== *Procedure for using the cluster CLI*
 
-. Save the \`{name}-binding.yaml\` file to your local drive, and then edit it as needed for your configuration.
+. Save the \`{name}-pipe.yaml\` file to your local drive, and then edit it as needed for your configuration.
 
 . Run the {type} by using the following command:
 +
 [source,shell,subs=+attributes]
 ----
-kubectl apply -f {name}-binding.yaml
+kubectl apply -f {name}-pipe.yaml
 ----
 
 ==== *Procedure for using the Kamel CLI*
@@ -108,10 +108,10 @@ Configure and run the {type} by using the following command:
 
 [source,shell,subs='+attributes,macros']
 ----
-jsonpathExpression:example$yaml/${basename}.kamelet.yaml[query='$.spec', format='kamelets.bindingCommand("{type}", "{name}", definition, "channel:mychannel")', requires={requires}]
+jsonpathExpression:example$yaml/${basename}.kamelet.yaml[query='$.spec', format='kamelets.pipeCommand("{type}", "{name}", definition, "channel:mychannel")', requires={requires}]
 ----
 
-This command creates the KameletBinding in the current namespace on the cluster.
+This command creates the Pipe in the current namespace on the cluster.
 
 === Kafka {type}
 
@@ -126,10 +126,10 @@ endif::[]
 :ref-kind: KafkaTopic
 :ref-name: my-topic
 
-.{name}-binding.yaml
+.{name}-pipe.yaml
 [source,yaml,subs='+attributes,macros']
 ----
-jsonpathExpression::example$yaml/${basename}.kamelet.yaml[query='$', format='kamelets.binding("{type}", apiVersion, kind, metadata, spec, "{ref-kind}", "{ref-api-version}", "{ref-name}")', outputFormat=yml, requires={requires}]
+jsonpathExpression::example$yaml/${basename}.kamelet.yaml[query='$', format='kamelets.pipe("{type}", apiVersion, kind, metadata, spec, "{ref-kind}", "{ref-api-version}", "{ref-name}")', outputFormat=yml, requires={requires}]
 ----
 
 ==== *Prerequisites*
@@ -140,13 +140,13 @@ jsonpathExpression::example$yaml/${basename}.kamelet.yaml[query='$', format='kam
 
 ==== *Procedure for using the cluster CLI*
 
-. Save the \`{name}-binding.yaml\` file to your local drive, and then edit it as needed for your configuration.
+. Save the \`{name}-pipe.yaml\` file to your local drive, and then edit it as needed for your configuration.
 
 . Run the {type} by using the following command:
 +
 [source,shell,subs=+attributes]
 ----
-kubectl apply -f {name}-binding.yaml
+kubectl apply -f {name}-pipe.yaml
 ----
 
 ==== *Procedure for using the Kamel CLI*
@@ -155,10 +155,10 @@ Configure and run the {type} by using the following command:
 
 [source,shell,subs='+attributes,macros']
 ----
-jsonpathExpression::example$yaml/${basename}.kamelet.yaml[query='$.spec', format='kamelets.bindingCommand("{type}", "{name}", definition, "kafka.strimzi.io/v1beta1:KafkaTopic:my-topic")', requires={requires}]
+jsonpathExpression::example$yaml/${basename}.kamelet.yaml[query='$.spec', format='kamelets.pipeCommand("{type}", "{name}", definition, "kafka.strimzi.io/v1beta1:KafkaTopic:my-topic")', requires={requires}]
 ----
 
-This command creates the KameletBinding in the current namespace on the cluster.
+This command creates the Pipe in the current namespace on the cluster.
 
 == Kamelet source file
 

kamelets/avro-deserialize-action.kamelet.yaml

@@ -15,7 +15,7 @@
 # limitations under the License.
 # ---------------------------------------------------------------------------
 
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: avro-deserialize-action

kamelets/avro-serialize-action.kamelet.yaml

@@ -15,7 +15,7 @@
 # limitations under the License.
 # ---------------------------------------------------------------------------
 
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: avro-serialize-action

kamelets/aws-cloudtrail-source.kamelet.yaml

@@ -1,4 +1,4 @@
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-cloudtrail-source

kamelets/aws-cloudwatch-sink.kamelet.yaml

@@ -15,7 +15,7 @@
 # limitations under the License.
 # ---------------------------------------------------------------------------
 
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-cloudwatch-sink

kamelets/aws-ddb-sink.kamelet.yaml

@@ -15,7 +15,7 @@
 # limitations under the License.
 # ---------------------------------------------------------------------------
 
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-ddb-sink

kamelets/aws-ddb-streams-source.kamelet.yaml

@@ -15,7 +15,7 @@
 # limitations under the License.
 # ---------------------------------------------------------------------------
 
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-ddb-streams-source

kamelets/aws-ec2-sink.kamelet.yaml

@@ -15,7 +15,7 @@
 # limitations under the License.
 # ---------------------------------------------------------------------------
 
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-ec2-sink

kamelets/aws-eventbridge-sink.kamelet.yaml

@@ -15,7 +15,7 @@
 # limitations under the License.
 # ---------------------------------------------------------------------------
 
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-eventbridge-sink

kamelets/aws-kinesis-firehose-sink.kamelet.yaml

@@ -15,7 +15,7 @@
 # limitations under the License.
 # ---------------------------------------------------------------------------
 
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-kinesis-firehose-sink

kamelets/aws-kinesis-sink.kamelet.yaml

@@ -15,7 +15,7 @@
 # limitations under the License.
 # ---------------------------------------------------------------------------
 
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-kinesis-sink

kamelets/aws-kinesis-source.kamelet.yaml

@@ -15,7 +15,7 @@
 # limitations under the License.
 # ---------------------------------------------------------------------------
 
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-kinesis-source

kamelets/aws-lambda-sink.kamelet.yaml

@@ -15,7 +15,7 @@
 # limitations under the License.
 # ---------------------------------------------------------------------------
 
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-lambda-sink

kamelets/aws-redshift-sink.kamelet.yaml

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-redshift-sink

kamelets/aws-redshift-source.kamelet.yaml

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-redshift-source

kamelets/aws-s3-cdc-source.kamelet.yaml

@@ -1,4 +1,4 @@
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-s3-cdc-source

kamelets/aws-s3-sink.kamelet.yaml

@@ -15,7 +15,7 @@
 # limitations under the License.
 # ---------------------------------------------------------------------------
 
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-s3-sink

kamelets/aws-s3-source.kamelet.yaml

@@ -1,4 +1,4 @@
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-s3-source

kamelets/aws-s3-streaming-upload-sink.kamelet.yaml

@@ -15,7 +15,7 @@
 # limitations under the License.
 # ---------------------------------------------------------------------------
 
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-s3-streaming-upload-sink

kamelets/aws-secrets-manager-sink.kamelet.yaml

@@ -15,7 +15,7 @@
 # limitations under the License.
 # ---------------------------------------------------------------------------
 
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-secrets-manager-sink

kamelets/aws-ses-sink.kamelet.yaml

@@ -15,7 +15,7 @@
 # limitations under the License.
 # ---------------------------------------------------------------------------
 
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
 kind: Kamelet
 metadata:
   name: aws-ses-sink