Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix(trait): error handler ref in camel 3.20 #4012

Merged
merged 3 commits into from
Jan 26, 2023
Merged

fix(trait): error handler ref in camel 3.20 #4012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5117c0f
fix(trait): error handler ref in camel 3.20
squakez Jan 26, 2023
e049523
fix(trait): error handler test
squakez Jan 26, 2023
60e9ca4
chore: resource autogen
squakez Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions docs/antora.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ asciidoc:
camel-kamelets-docs-version: 0.10.x
camel-k-runtime-version: 1.17.0-SNAPSHOT
camel-api-versions: camel.apache.org/v1 camel.apache.org/v1alpha1 # from Makefile BUNDLE_CAMEL_APIS
camel-version: 3.19.0
camel-docs-version: 3.19.x
camel-quarkus-version: 2.14.0
camel-quarkus-docs-version: 2.14.x
quarkus-version: 2.14.0.Final
camel-version: 3.20.1
camel-docs-version: 3.20.x
camel-quarkus-version: 2.16.0
camel-quarkus-docs-version: 2.16.x
quarkus-version: 2.16.0.Final
buildah-version: 1.23.3
kaniko-version: 0.17.1
kustomize-version: 4.5.4
Expand Down
4 changes: 2 additions & 2 deletions pkg/resources/resources.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/trait/error_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func (t *errorHandlerTrait) addErrorHandlerDependencies(e *Environment, uri stri
func (t *errorHandlerTrait) addErrorHandlerAsSource(e *Environment) error {
flowErrorHandler := map[string]interface{}{
"error-handler": map[string]string{
"ref": t.ErrorHandlerRef,
"ref-error-handler": t.ErrorHandlerRef,
},
}
encodedFlowErrorHandler, err := yaml.Marshal([]map[string]interface{}{flowErrorHandler})
Expand Down
2 changes: 1 addition & 1 deletion pkg/trait/error_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func TestErrorHandlerApplySource(t *testing.T) {
err = trait.Apply(e)
assert.Nil(t, err)
assert.Equal(t, `- error-handler:
ref: defaultErrorHandler
ref-error-handler: defaultErrorHandler
`, e.Integration.Status.GeneratedSources[0].Content)
}

Expand Down
23 changes: 18 additions & 5 deletions resources/camel-catalog-1.17.0-SNAPSHOT.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ metadata:
name: camel-catalog-1.17.0-snapshot
labels:
app: camel-k
camel.apache.org/catalog.loader.version: 3.19.0
camel.apache.org/catalog.version: 3.19.0
camel.apache.org/catalog.loader.version: 3.20.1
camel.apache.org/catalog.version: 3.20.1
camel.apache.org/runtime.version: 1.17.0-SNAPSHOT
spec:
runtime:
version: 1.17.0-SNAPSHOT
provider: quarkus
applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint
metadata:
camel-quarkus.version: 2.14.0
camel.version: 3.19.0
camel-quarkus.version: 2.16.0
camel.version: 3.20.1
quarkus.native-builder-image: quay.io/quarkus/ubi-quarkus-mandrel:22.2.0.0-Final-java11
quarkus.version: 2.14.0.Final
quarkus.version: 2.16.0.Final
dependencies:
- groupId: org.apache.camel.k
artifactId: camel-k-runtime
Expand Down Expand Up @@ -882,6 +882,15 @@ spec:
passive: false
javaTypes:
- org.apache.camel.component.elasticsearch.ElasticsearchComponent
camel-quarkus-etcd3:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-etcd3
schemes:
- id: etcd3
http: false
passive: false
javaTypes:
- org.apache.camel.component.etcd3.Etcd3Component
camel-quarkus-exec:
groupId: org.apache.camel.quarkus
artifactId: camel-quarkus-exec
Expand Down Expand Up @@ -1642,6 +1651,9 @@ spec:
- id: kubernetes-deployments
http: false
passive: false
- id: kubernetes-events
http: false
passive: false
- id: kubernetes-hpa
http: false
passive: false
Expand Down Expand Up @@ -1691,6 +1703,7 @@ spec:
- org.apache.camel.component.kubernetes.config_maps.KubernetesConfigMapsComponent
- org.apache.camel.component.kubernetes.customresources.KubernetesCustomResourcesComponent
- org.apache.camel.component.kubernetes.deployments.KubernetesDeploymentsComponent
- org.apache.camel.component.kubernetes.events.KubernetesEventsComponent
- org.apache.camel.component.kubernetes.hpa.KubernetesHPAComponent
- org.apache.camel.component.kubernetes.job.KubernetesJobComponent
- org.apache.camel.component.kubernetes.namespaces.KubernetesNamespacesComponent
Expand Down