You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/08/10 12:10:54 UTC
[camel] branch main updated: CAMEL-19733 - update apiVersion in CRDs for Kamelet (#11066)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new d07017efa2d CAMEL-19733 - update apiVersion in CRDs for Kamelet (#11066)
d07017efa2d is described below
commit d07017efa2dac02b29628bdc5aef92613cf5e04e
Author: Aurélien Pupier <ap...@redhat.com>
AuthorDate: Thu Aug 10 14:10:47 2023 +0200
CAMEL-19733 - update apiVersion in CRDs for Kamelet (#11066)
Camel K 2.0.0 has changed the api version from camel.apache.org/v1alpha1
to camel.apache.org/v1 for Kamelet kind
Signed-off-by: Aurélien Pupier <ap...@redhat.com>
---
.../resources/templates/kamelet-action.yaml.tmpl | 2 +-
.../resources/templates/kamelet-sink.yaml.tmpl | 2 +-
.../resources/templates/kamelet-source.yaml.tmpl | 2 +-
.../resources/templates/step-kamelet.yaml.tmpl | 2 +-
.../camel/dsl/yaml/KameletBindingLoaderTest.groovy | 22 +++++++++++-----------
.../dsl/yaml/KameletLoaderDependenciesTest.groovy | 2 +-
.../apache/camel/dsl/yaml/KameletLoaderTest.groovy | 8 ++++----
.../dsl/yaml/issues/KameletTemplatingTest.groovy | 2 +-
.../resources/kamelets/error-handler.kamelet.yaml | 2 +-
.../resources/kamelets/log-action.kamelet.yaml | 2 +-
.../test/resources/kamelets/log-sink.kamelet.yaml | 2 +-
.../test/resources/kamelets/mySetBody.kamelet.yaml | 2 +-
.../resources/kamelets/prefix-action.kamelet.yaml | 2 +-
.../kamelets/route-timer-source.kamelet.yaml | 2 +-
.../resources/kamelets/timer-source.kamelet.yaml | 2 +-
15 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/kamelet-action.yaml.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/kamelet-action.yaml.tmpl
index 9e55fcb70c6..243d688c3ad 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/kamelet-action.yaml.tmpl
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/kamelet-action.yaml.tmpl
@@ -1,4 +1,4 @@
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: {{ .Name }}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/kamelet-sink.yaml.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/kamelet-sink.yaml.tmpl
index 94e131729e6..8d73cf27605 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/kamelet-sink.yaml.tmpl
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/kamelet-sink.yaml.tmpl
@@ -1,4 +1,4 @@
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: {{ .Name }}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/kamelet-source.yaml.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/kamelet-source.yaml.tmpl
index f89270bec31..a876236d527 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/kamelet-source.yaml.tmpl
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/kamelet-source.yaml.tmpl
@@ -1,4 +1,4 @@
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: {{ .Name }}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/step-kamelet.yaml.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/step-kamelet.yaml.tmpl
index 3a6e0783c47..38f3214fbff 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/step-kamelet.yaml.tmpl
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/step-kamelet.yaml.tmpl
@@ -1,5 +1,5 @@
- ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: {{ .Name }}
{{ .StepProperties }}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
index 30454f5c188..5437768777e 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
@@ -135,20 +135,20 @@ class KameletBindingLoaderTest extends YamlTestSupport {
source:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: timer-source
properties:
message: "Camel"
steps:
- ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: prefix-action
properties:
prefix: "Apache"
- ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: prefix-action
properties:
prefix: "Hello"
@@ -189,14 +189,14 @@ class KameletBindingLoaderTest extends YamlTestSupport {
source:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: timer-source
properties:
message: "Camel"
steps:
- ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: prefix-action
properties:
prefix: "Apache"
@@ -234,7 +234,7 @@ class KameletBindingLoaderTest extends YamlTestSupport {
source:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: timer-source
properties:
message: "Camel"
@@ -330,14 +330,14 @@ class KameletBindingLoaderTest extends YamlTestSupport {
sink:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: log-sink
errorHandler:
sink:
endpoint:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: error-handler
properties:
log-message: "ERROR!"
@@ -396,7 +396,7 @@ class KameletBindingLoaderTest extends YamlTestSupport {
sink:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: log-sink
errorHandler:
sink:
@@ -446,7 +446,7 @@ class KameletBindingLoaderTest extends YamlTestSupport {
sink:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: log-sink
errorHandler:
log:
@@ -496,7 +496,7 @@ class KameletBindingLoaderTest extends YamlTestSupport {
sink:
ref:
kind: Kamelet
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
name: log-sink
errorHandler:
none:
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderDependenciesTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderDependenciesTest.groovy
index e010761350a..3bb3544bf69 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderDependenciesTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderDependenciesTest.groovy
@@ -38,7 +38,7 @@ class KameletLoaderDependenciesTest extends YamlTestSupport {
def "kamelet dependencies"() {
when:
loadKamelets('''
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: myDependency
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderTest.groovy
index 39f1662d1b4..6e3e5294671 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletLoaderTest.groovy
@@ -30,7 +30,7 @@ class KameletLoaderTest extends YamlTestSupport {
def "kamelet with flow"() {
when:
loadKamelets('''
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: aws-s3-sink
@@ -118,7 +118,7 @@ class KameletLoaderTest extends YamlTestSupport {
def "kamelet with template"() {
when:
loadKamelets('''
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: aws-s3-sink
@@ -192,7 +192,7 @@ class KameletLoaderTest extends YamlTestSupport {
def "kamelet with template and optional parameters"() {
setup:
loadKamelets """
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: myTemplate
@@ -275,7 +275,7 @@ class KameletLoaderTest extends YamlTestSupport {
def "kamelet with filter and flow"() {
setup:
loadKamelets '''
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: filter-action
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/issues/KameletTemplatingTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/issues/KameletTemplatingTest.groovy
index 0df43ad821f..8d5557c0298 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/issues/KameletTemplatingTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/issues/KameletTemplatingTest.groovy
@@ -35,7 +35,7 @@ class KameletTemplatingTest extends YamlTestSupport {
'''.stripIndent().bytes)
loadKamelets """
- apiVersion: camel.apache.org/v1alpha1
+ apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: mustache-template-action
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/error-handler.kamelet.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/error-handler.kamelet.yaml
index 81ea00bfe24..58ee36405f7 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/error-handler.kamelet.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/error-handler.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: error-handler
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-action.kamelet.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-action.kamelet.yaml
index 0107a2d6977..401efb0772e 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-action.kamelet.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-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: log-action
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-sink.kamelet.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-sink.kamelet.yaml
index 0b4e94675d5..ec2458bfcab 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-sink.kamelet.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/log-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: log-sink
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/mySetBody.kamelet.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/mySetBody.kamelet.yaml
index 53e62d3560d..f7d38a10406 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/mySetBody.kamelet.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/mySetBody.kamelet.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-apiVersion: camel.apache.org/v1alpha1
+apiVersion: camel.apache.org/v1
kind: Kamelet
metadata:
name: mySetBody
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/prefix-action.kamelet.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/prefix-action.kamelet.yaml
index 6a0e6b7627f..d8aad1b5ab1 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/prefix-action.kamelet.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/prefix-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: prefix-action
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/route-timer-source.kamelet.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/route-timer-source.kamelet.yaml
index 29cae2e5551..0608d771e6d 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/route-timer-source.kamelet.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/route-timer-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: route-timer-source
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/timer-source.kamelet.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/timer-source.kamelet.yaml
index 627bb64237a..5ad42e4107f 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/timer-source.kamelet.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/kamelets/timer-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: timer-source