You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/11/28 08:36:05 UTC
[camel-k] branch main updated: Fix tests related to recent camel-k-runtime changes
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new e28dc4397 Fix tests related to recent camel-k-runtime changes
e28dc4397 is described below
commit e28dc4397d2a860f782a7e4191b3009328fcc857
Author: Claudio Miranda <cl...@claudius.com.br>
AuthorDate: Wed Nov 23 19:02:49 2022 -0300
Fix tests related to recent camel-k-runtime changes
This PR brought knative from camel-quarkus
https://github.com/apache/camel-k-runtime/pull/927
There is a breaking change related to Yaml dsl, the template keywork was
renamed to routeTemplate
https://camel.apache.org/manual/camel-3x-upgrade-guide-3_19.html#_camel_yaml_dsl
---
docs/modules/traits/pages/container.adoc | 69 ----------------------------
e2e/global/builder/build_test.go | 2 +-
e2e/global/knative/kamelet_test.go | 27 +++++------
pkg/metadata/metadata_dependencies_test.go | 6 +--
pkg/resources/resources.go | 8 ++--
pkg/trait/knative.go | 3 +-
pkg/util/dsl/template.go | 2 +-
pkg/util/dsl/template_test.go | 2 +-
pkg/util/source/inspector_yaml_test.go | 27 +++++------
pkg/util/test/catalog_test.go | 4 +-
resources/camel-catalog-1.16.0-SNAPSHOT.yaml | 44 +++++++-----------
resources/traits.yaml | 56 ----------------------
12 files changed, 56 insertions(+), 194 deletions(-)
diff --git a/docs/modules/traits/pages/container.adoc b/docs/modules/traits/pages/container.adoc
index 918e3255d..a9761107a 100755
--- a/docs/modules/traits/pages/container.adoc
+++ b/docs/modules/traits/pages/container.adoc
@@ -81,75 +81,6 @@ The following configuration options are available:
| PullPolicy
| The pull policy: Always\|Never\|IfNotPresent
-| container.probes-enabled
-| bool
-| DeprecatedProbesEnabled enable/disable probes on the container (default `false`).
-Deprecated: replaced by the health trait.
-
-| container.liveness-scheme
-| string
-| Scheme to use when connecting. Defaults to HTTP. Applies to the liveness probe.
-Deprecated: replaced by the health trait.
-
-| container.liveness-initial-delay
-| int32
-| Number of seconds after the container has started before liveness probes are initiated.
-Deprecated: replaced by the health trait.
-
-| container.liveness-timeout
-| int32
-| Number of seconds after which the probe times out. Applies to the liveness probe.
-Deprecated: replaced by the health trait.
-
-| container.liveness-period
-| int32
-| How often to perform the probe. Applies to the liveness probe.
-Deprecated: replaced by the health trait.
-
-| container.liveness-success-threshold
-| int32
-| Minimum consecutive successes for the probe to be considered successful after having failed.
-Applies to the liveness probe.
-Deprecated: replaced by the health trait.
-
-| container.liveness-failure-threshold
-| int32
-| Minimum consecutive failures for the probe to be considered failed after having succeeded.
-Applies to the liveness probe.
-Deprecated: replaced by the health trait.
-
-| container.readiness-scheme
-| string
-| Scheme to use when connecting. Defaults to HTTP. Applies to the readiness probe.
-Deprecated: replaced by the health trait.
-
-| container.readiness-initial-delay
-| int32
-| Number of seconds after the container has started before readiness probes are initiated.
-Deprecated: replaced by the health trait.
-
-| container.readiness-timeout
-| int32
-| Number of seconds after which the probe times out. Applies to the readiness probe.
-Deprecated: replaced by the health trait.
-
-| container.readiness-period
-| int32
-| How often to perform the probe. Applies to the readiness probe.
-Deprecated: replaced by the health trait.
-
-| container.readiness-success-threshold
-| int32
-| Minimum consecutive successes for the probe to be considered successful after having failed.
-Applies to the readiness probe.
-Deprecated: replaced by the health trait.
-
-| container.readiness-failure-threshold
-| int32
-| Minimum consecutive failures for the probe to be considered failed after having succeeded.
-Applies to the readiness probe.
-Deprecated: replaced by the health trait.
-
|===
// End of autogenerated code - DO NOT EDIT! (configuration)
diff --git a/e2e/global/builder/build_test.go b/e2e/global/builder/build_test.go
index 4e3e197df..b4eb9a5a6 100644
--- a/e2e/global/builder/build_test.go
+++ b/e2e/global/builder/build_test.go
@@ -51,7 +51,7 @@ func TestKitTimerToLogFullBuild(t *testing.T) {
func TestKitKnativeFullBuild(t *testing.T) {
doKitFullBuild(t, "knative", "500Mi", "8m0s", TestTimeoutLong, kitOptions{
dependencies: []string{
- "camel-k-knative",
+ "camel-quarkus-knative",
},
})
}
diff --git a/e2e/global/knative/kamelet_test.go b/e2e/global/knative/kamelet_test.go
index 5c266e0bc..420a791a4 100644
--- a/e2e/global/knative/kamelet_test.go
+++ b/e2e/global/knative/kamelet_test.go
@@ -41,8 +41,9 @@ import (
func TestKameletChange(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
operatorID := "camel-k-kamelet-change"
+ timerSource := "my-timer-source"
Expect(KamelInstallWithID(operatorID, ns).Execute()).To(Succeed())
- Expect(CreateTimerKamelet(ns, "my-timer-source")()).To(Succeed())
+ Expect(CreateTimerKamelet(ns, timerSource)()).To(Succeed())
Expect(CreateKnativeChannel(ns, "messages")()).To(Succeed())
Expect(KamelRunWithID(operatorID, ns, "files/display.groovy", "-w").Execute()).To(Succeed())
@@ -50,7 +51,7 @@ func TestKameletChange(t *testing.T) {
from := corev1.ObjectReference{
Kind: "Kamelet",
APIVersion: v1alpha1.SchemeGroupVersion.String(),
- Name: "my-timer-source",
+ Name: timerSource,
}
to := corev1.ObjectReference{
@@ -59,28 +60,28 @@ func TestKameletChange(t *testing.T) {
APIVersion: messaging.SchemeGroupVersion.String(),
}
- name := "timer-binding"
+ timerBinding := "timer-binding"
annotations := map[string]string{
"trait.camel.apache.org/health.enabled": "true",
"trait.camel.apache.org/health.readiness-initial-delay": "10",
}
- Expect(BindKameletTo(ns, name, annotations, from, to, map[string]string{"message": "message is Hello"}, map[string]string{})()).To(Succeed())
+ Expect(BindKameletTo(ns, timerBinding, annotations, from, to, map[string]string{"message": "message is Hello"}, map[string]string{})()).To(Succeed())
- Eventually(KameletBindingConditionStatus(ns, name, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(KameletBindingCondition(ns, name, v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).Should(And(
+ Eventually(KameletBindingConditionStatus(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(KameletBindingCondition(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).Should(And(
WithTransform(KameletBindingConditionReason, Equal(v1.IntegrationConditionDeploymentProgressingReason)),
WithTransform(KameletBindingConditionMessage, Or(
Equal("0/1 updated replicas"),
Equal("0/1 ready replicas"),
))))
- Eventually(IntegrationPodPhase(ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodPhase(ns, timerBinding), TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, "timer-binding", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, "display"), TestTimeoutShort).Should(ContainSubstring("message is Hello"))
- Eventually(KameletBindingConditionStatus(ns, name, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(KameletBindingCondition(ns, name, v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).Should(And(
+ Eventually(KameletBindingConditionStatus(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(KameletBindingCondition(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).Should(And(
WithTransform(KameletBindingConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
WithTransform(KameletBindingConditionMessage, Equal(fmt.Sprintf("1/1 ready replicas"))),
))
@@ -88,8 +89,8 @@ func TestKameletChange(t *testing.T) {
// Update the KameletBinding
Expect(BindKameletTo(ns, "timer-binding", annotations, from, to, map[string]string{"message": "message is Hi"}, map[string]string{})()).To(Succeed())
- Eventually(KameletBindingConditionStatus(ns, name, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
- Eventually(KameletBindingCondition(ns, name, v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).Should(And(
+ Eventually(KameletBindingConditionStatus(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionFalse))
+ Eventually(KameletBindingCondition(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).Should(And(
WithTransform(KameletBindingConditionReason, Equal(v1.IntegrationConditionDeploymentProgressingReason)),
WithTransform(KameletBindingConditionMessage, Or(
Equal("0/1 updated replicas"),
@@ -100,8 +101,8 @@ func TestKameletChange(t *testing.T) {
Eventually(IntegrationConditionStatus(ns, "timer-binding", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
Eventually(IntegrationLogs(ns, "display"), TestTimeoutShort).Should(ContainSubstring("message is Hi"))
- Eventually(KameletBindingConditionStatus(ns, name, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(KameletBindingCondition(ns, name, v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).
+ Eventually(KameletBindingConditionStatus(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ Eventually(KameletBindingCondition(ns, timerBinding, v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).
Should(And(
WithTransform(KameletBindingConditionReason, Equal(v1.IntegrationConditionDeploymentReadyReason)),
WithTransform(KameletBindingConditionMessage, Equal("1/1 ready replicas")),
diff --git a/pkg/metadata/metadata_dependencies_test.go b/pkg/metadata/metadata_dependencies_test.go
index 674cebdd4..297be6f61 100644
--- a/pkg/metadata/metadata_dependencies_test.go
+++ b/pkg/metadata/metadata_dependencies_test.go
@@ -309,7 +309,7 @@ func TestLanguageDependencies(t *testing.T) {
"camel:jsonpath",
"camel:groovy",
"camel:saxon",
- "camel:xml-jaxp",
+ "camel:stax",
},
meta.Dependencies.List())
}
@@ -662,7 +662,7 @@ func TestXMLLanguageDependencies(t *testing.T) {
"camel:mvel",
"camel:ognl",
"camel:xpath",
- "camel:xml-jaxp",
+ "camel:stax",
"camel:jsonpath",
"camel:saxon",
"camel:groovy",
@@ -787,7 +787,7 @@ func TestYAMLLanguageDependencies(t *testing.T) {
"camel:jsonpath",
"camel:groovy",
"camel:saxon",
- "camel:xml-jaxp",
+ "camel:stax",
},
meta.Dependencies.List())
}
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 081411b69..be62dbca9 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -597,16 +597,16 @@ var assets = func() http.FileSystem {
"/camel-catalog-1.16.0-SNAPSHOT.yaml": &vfsgen۰CompressedFileInfo{
name: "camel-catalog-1.16.0-SNAPSHOT.yaml",
modTime: time.Time{},
- uncompressedSize: 86320,
+ uncompressedSize: 86027,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5b\x77\xdb\x38\xb2\xee\xbb\x7f\x05\x57\xe7\x65\xef\x75\x46\x98\xee\x64\xce\xf4\x5e\x7d\x9e\x6c\x39\x4e\xec\xd8\x8e\x13\x79\xd2\x99\x79\xe9\x05\x91\x90\x04\x8b\x24\x68\x00\x94\xe5\xfc\xfa\xb3\x00\x82\x57\x29\xc5\x8b\x0b\xde\x7e\x30\x29\xa2\xf0\x15\xea\xc3\x85\xb8\xb1\xf0\x26\x98\xe1\xfd\x9d\xbc\x09\xae\x79\xc8\x52\xc5\xa2\x40\x8b\x40\x6f\x58\x70\x9a\xd1\x70\xc3\x82\x85\x58\xe9\x27\x2a\x59\x70\x21\xf2\x34\xa2\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x5d\x77\xdb\x38\xd2\xe6\xbd\x7f\x05\x4f\xe7\xe6\x7d\xcf\x8e\x30\xdd\xe9\xd9\xe9\xdd\xde\x2b\x5b\x8e\x13\x3b\xb6\xe3\x44\x9e\x24\x33\x37\x7d\x20\x12\x92\x60\x91\x04\x0d\x80\xb2\x9c\x5f\xbf\x07\x20\xf8\x29\xa5\xf8\xe1\x82\x5f\x5f\x98\x14\x51\x78\x0a\xf5\x00\xc4\x37\x0b\x6f\x82\x19\xde\xdf\xc9\x9b\xe0\x9a\x87\x2c\x55\x2c\x0a\xb4\x08\xf4\x86\x05\xa7\x19\x0d\x37\x2c\x58\x88\x95\x7e\xa2\x92\x05\x17\x22\x4f\x23\xaa\x [...]
},
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 59349,
+ uncompressedSize: 56636,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xfd\x77\x1b\x37\x92\xe0\xef\xf9\x2b\xf0\xb4\xb7\x4f\x92\x1f\x49\x39\x99\x9d\xd9\xac\xee\xbc\x73\x8a\xed\xcc\x28\xf1\x87\xce\x52\x32\x3b\xcf\xe7\x37\x04\xbb\x41\x12\x66\x37\xd0\x01\xd0\x92\x99\xdb\xfb\xdf\xef\xa1\xaa\xf0\xd1\xcd\xa6\x48\xd9\x52\x6e\x74\x73\x3b\xef\x6d\x2c\xa9\x51\x28\x14\x0a\x85\x42\x7d\x3a\xc3\xa5\xb3\xa7\x5f\x8d\x99\xe2\xb5\x38\x65\xbf\xb3\x05\xaf\xc4\x57\x8c\x35\x15\x77\x73\x6d\xea\x53\x36\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7b\x73\x1b\x39\x92\x20\xfe\x7f\x7f\x0a\x84\xf6\xb7\x21\xc9\x41\x52\xee\x9e\x9d\xd9\x5e\xfd\xce\x3b\xa7\xb6\xdd\x33\xea\xf6\x43\x67\xa9\x7b\x76\xc2\xe7\x18\x82\x55\x20\x09\xb3\x0a\xa8\x06\x50\x92\xd8\x37\xf7\xdd\x2f\x90\x99\x78\x54\xb1\x28\x52\xb6\xd5\x31\xba\xb9\xe9\x88\xb1\x48\x56\x25\x12\x89\x44\x22\x91\x4f\x67\xb8\x74\xf6\xf4\xab\x31\x53\xbc\x16\xa7\xec\x77\xb6\xe0\x95\xf8\x8a\xb1\xa6\xe2\x6e\xae\x4d\x7d\x [...]
},
}
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
diff --git a/pkg/trait/knative.go b/pkg/trait/knative.go
index 146f75506..e0ddcdedf 100644
--- a/pkg/trait/knative.go
+++ b/pkg/trait/knative.go
@@ -183,7 +183,8 @@ func (t *knativeTrait) Configure(e *Environment) (bool, error) {
func (t *knativeTrait) Apply(e *Environment) error {
if pointer.BoolDeref(t.SinkBinding, false) {
- util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.apache.camel.k:camel-k-knative")
+ util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "camel:knative")
+ util.StringSliceUniqueAdd(&e.Integration.Status.Dependencies, "mvn:org.apache.camel.k:camel-k-knative-impl")
}
if len(t.ChannelSources) > 0 || len(t.EndpointSources) > 0 || len(t.EventSources) > 0 {
diff --git a/pkg/util/dsl/template.go b/pkg/util/dsl/template.go
index 7862aae30..32236a43c 100644
--- a/pkg/util/dsl/template.go
+++ b/pkg/util/dsl/template.go
@@ -41,7 +41,7 @@ func TemplateToYamlDSL(template v1.Template, id string) ([]byte, error) {
jsondata["id"] = id
}
templateWrapper := make(map[string]interface{}, 2)
- templateWrapper["template"] = jsondata
+ templateWrapper["routeTemplate"] = jsondata
listWrapper := make([]interface{}, 0, 1)
listWrapper = append(listWrapper, templateWrapper)
yamldata, err := yaml2.Marshal(listWrapper)
diff --git a/pkg/util/dsl/template_test.go b/pkg/util/dsl/template_test.go
index 2098da28a..b52303372 100644
--- a/pkg/util/dsl/template_test.go
+++ b/pkg/util/dsl/template_test.go
@@ -49,7 +49,7 @@ func TestTemplateReadWrite(t *testing.T) {
yamlBytes, err := TemplateToYamlDSL(templateJSON, "myid")
assert.NoError(t, err)
yaml := string(yamlBytes)
- expected := `- template:
+ expected := `- routeTemplate:
beans:
- name: myBean
type: com.acme.MyBean
diff --git a/pkg/util/source/inspector_yaml_test.go b/pkg/util/source/inspector_yaml_test.go
index 1a85b1fd5..212993939 100644
--- a/pkg/util/source/inspector_yaml_test.go
+++ b/pkg/util/source/inspector_yaml_test.go
@@ -111,53 +111,48 @@ func TestYAMLDependencies(t *testing.T) {
missingDependencies []string
}{
{
- name: "consumer",
- source: YAMLRouteConsumer,
- dependencies: []string{`mvn:org.apache.camel.k:camel-k-knative-consumer`},
- missingDependencies: []string{`mvn:org.apache.camel.k:camel-k-knative-producer`},
+ name: "consumer",
+ source: YAMLRouteConsumer,
+ dependencies: []string{`camel:knative`},
},
{
- name: "producer",
- source: YAMLRouteProducer,
- dependencies: []string{`mvn:org.apache.camel.k:camel-k-knative-producer`},
- missingDependencies: []string{`mvn:org.apache.camel.k:camel-k-knative-consumer`},
+ name: "producer",
+ source: YAMLRouteProducer,
+ dependencies: []string{`camel:knative`},
},
{
name: "transformer",
source: YAMLRouteTransformer,
dependencies: []string{
- `mvn:org.apache.camel.k:camel-k-knative-producer`,
- `mvn:org.apache.camel.k:camel-k-knative-consumer`,
+ `camel:knative`,
},
},
{
name: "invalid",
source: YAMLInvalid,
dependencies: []string{
- `mvn:org.apache.camel.k:camel-k-knative-consumer`,
+ `camel:knative`,
},
},
{
name: "in-depth",
source: YAMLInDepthChannel,
dependencies: []string{
- `mvn:org.apache.camel.k:camel-k-knative-producer`,
- `mvn:org.apache.camel.k:camel-k-knative-consumer`,
+ `camel:knative`,
},
},
{
name: "wire-tap-knative",
source: YAMLWireTapKnativeEIP,
dependencies: []string{
- `mvn:org.apache.camel.k:camel-k-knative-producer`,
- `mvn:org.apache.camel.k:camel-k-knative-consumer`,
+ `camel:knative`,
},
},
{
name: "wire-tap-jms",
source: YAMLWireTapJmsEIP,
dependencies: []string{
- `mvn:org.apache.camel.k:camel-k-knative-consumer`,
+ `camel:knative`,
`camel:jms`,
},
},
diff --git a/pkg/util/test/catalog_test.go b/pkg/util/test/catalog_test.go
index 2608344fb..15fb55dd2 100644
--- a/pkg/util/test/catalog_test.go
+++ b/pkg/util/test/catalog_test.go
@@ -34,8 +34,8 @@ func TestRuntimeContainsEmbeddedArtifacts(t *testing.T) {
artifact := catalog.GetArtifactByScheme("knative")
assert.Equal(t, 1, len(artifact.Schemes))
- assert.Equal(t, "org.apache.camel.k", artifact.GroupID)
- assert.Equal(t, "camel-k-knative", artifact.ArtifactID)
+ assert.Equal(t, "org.apache.camel.quarkus", artifact.GroupID)
+ assert.Equal(t, "camel-quarkus-knative", artifact.ArtifactID)
scheme, found := catalog.GetScheme("knative")
assert.True(t, found)
diff --git a/resources/camel-catalog-1.16.0-SNAPSHOT.yaml b/resources/camel-catalog-1.16.0-SNAPSHOT.yaml
index c5c742483..b8ec4c06c 100644
--- a/resources/camel-catalog-1.16.0-SNAPSHOT.yaml
+++ b/resources/camel-catalog-1.16.0-SNAPSHOT.yaml
@@ -21,8 +21,8 @@ metadata:
name: camel-catalog-1.16.0-snapshot
labels:
app: camel-k
- camel.apache.org/catalog.loader.version: 3.18.3
- camel.apache.org/catalog.version: 3.18.3
+ camel.apache.org/catalog.loader.version: 3.19.0
+ camel.apache.org/catalog.version: 3.19.0
camel.apache.org/runtime.version: 1.16.0-SNAPSHOT
spec:
runtime:
@@ -30,9 +30,9 @@ spec:
provider: quarkus
applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint
metadata:
- camel-quarkus.version: 2.13.1
- camel.version: 3.18.3
- quarkus.version: 2.13.4.Final
+ camel-quarkus.version: 2.14.0
+ camel.version: 3.19.0
+ quarkus.version: 2.14.0.Final
dependencies:
- groupId: org.apache.camel.k
artifactId: camel-k-runtime
@@ -75,21 +75,6 @@ spec:
camel-k-cron:
groupId: org.apache.camel.k
artifactId: camel-k-cron
- camel-k-knative:
- groupId: org.apache.camel.k
- artifactId: camel-k-knative
- schemes:
- - id: knative
- http: true
- passive: false
- producer:
- dependencies:
- - groupId: org.apache.camel.k
- artifactId: camel-k-knative-producer
- consumer:
- dependencies:
- - groupId: org.apache.camel.k
- artifactId: camel-k-knative-consumer
camel-k-master:
groupId: org.apache.camel.k
artifactId: camel-k-master
@@ -1630,6 +1615,15 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.kamelet.KameletComponent
+ camel-quarkus-knative:
+ groupId: org.apache.camel.quarkus
+ artifactId: camel-quarkus-knative
+ schemes:
+ - id: knative
+ http: true
+ passive: false
+ javaTypes:
+ - org.apache.camel.component.knative.KnativeComponent
camel-quarkus-kubernetes:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-kubernetes
@@ -2428,8 +2422,11 @@ spec:
- id: stax
http: false
passive: false
+ languages:
+ - xtokenize
javaTypes:
- org.apache.camel.component.stax.StAXComponent
+ - org.apache.camel.language.xtokenizer.XMLTokenizeLanguage
camel-quarkus-stitch:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-stitch
@@ -2673,13 +2670,6 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.xj.XJComponent
- camel-quarkus-xml-jaxp:
- groupId: org.apache.camel.quarkus
- artifactId: camel-quarkus-xml-jaxp
- languages:
- - xtokenize
- javaTypes:
- - org.apache.camel.language.xtokenizer.XMLTokenizeLanguage
camel-quarkus-xmlsecurity:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-xmlsecurity
diff --git a/resources/traits.yaml b/resources/traits.yaml
index 4bc741a2f..88f29b99e 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -228,62 +228,6 @@ traits:
- name: image-pull-policy
type: PullPolicy
description: 'The pull policy: Always|Never|IfNotPresent'
- - name: probes-enabled
- type: bool
- description: 'DeprecatedProbesEnabled enable/disable probes on the container (default
- `false`). Deprecated: replaced by the health trait.'
- - name: liveness-scheme
- type: string
- description: 'Scheme to use when connecting. Defaults to HTTP. Applies to the
- liveness probe. Deprecated: replaced by the health trait.'
- - name: liveness-initial-delay
- type: int32
- description: 'Number of seconds after the container has started before liveness
- probes are initiated. Deprecated: replaced by the health trait.'
- - name: liveness-timeout
- type: int32
- description: 'Number of seconds after which the probe times out. Applies to the
- liveness probe. Deprecated: replaced by the health trait.'
- - name: liveness-period
- type: int32
- description: 'How often to perform the probe. Applies to the liveness probe. Deprecated:
- replaced by the health trait.'
- - name: liveness-success-threshold
- type: int32
- description: 'Minimum consecutive successes for the probe to be considered successful
- after having failed. Applies to the liveness probe. Deprecated: replaced by
- the health trait.'
- - name: liveness-failure-threshold
- type: int32
- description: 'Minimum consecutive failures for the probe to be considered failed
- after having succeeded. Applies to the liveness probe. Deprecated: replaced
- by the health trait.'
- - name: readiness-scheme
- type: string
- description: 'Scheme to use when connecting. Defaults to HTTP. Applies to the
- readiness probe. Deprecated: replaced by the health trait.'
- - name: readiness-initial-delay
- type: int32
- description: 'Number of seconds after the container has started before readiness
- probes are initiated. Deprecated: replaced by the health trait.'
- - name: readiness-timeout
- type: int32
- description: 'Number of seconds after which the probe times out. Applies to the
- readiness probe. Deprecated: replaced by the health trait.'
- - name: readiness-period
- type: int32
- description: 'How often to perform the probe. Applies to the readiness probe.
- Deprecated: replaced by the health trait.'
- - name: readiness-success-threshold
- type: int32
- description: 'Minimum consecutive successes for the probe to be considered successful
- after having failed. Applies to the readiness probe. Deprecated: replaced by
- the health trait.'
- - name: readiness-failure-threshold
- type: int32
- description: 'Minimum consecutive failures for the probe to be considered failed
- after having succeeded. Applies to the readiness probe. Deprecated: replaced
- by the health trait.'
- name: cron
platform: false
profiles: