You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by "gansheer (via GitHub)" <gi...@apache.org> on 2024/02/09 14:36:07 UTC
[PR] fix(core): Externally built Integrations run command configuration from jvm trait [camel-k]
gansheer opened a new pull request, #5151:
URL: https://github.com/apache/camel-k/pull/5151
Closes #5112
* change the check to evaluate if the kit is external or not instead of 'camel-k-kit' naming convention
* let the possibility for the user to explicitly enable the trait jvm and add a condition to inform the user that it is disabled by default
<!-- Description -->
<!--
Enter your extended release note in the below block. If the PR requires
additional action from users switching to the new release, include the string
"action required". If no release note is required, write "NONE".
You can (optionally) mark this PR with labels "kind/bug" or "kind/feature" to make sure
the text is added to the right section of the release notes.
-->
**Release Note**
```release-note
fix(core): Externally built Integrations run command configuration from jvm trait
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(core): Externally built Integrations run command configuration from jvm trait [camel-k]
Posted by "gansheer (via GitHub)" <gi...@apache.org>.
gansheer commented on code in PR #5151:
URL: https://github.com/apache/camel-k/pull/5151#discussion_r1487792970
##########
pkg/cmd/promote.go:
##########
@@ -468,6 +469,12 @@ func (o *promoteCmdOptions) editIntegration(it *v1.Integration) *v1.Integration
dst.Spec.Traits.Container = &traitv1.ContainerTrait{}
}
dst.Spec.Traits.Container.Image = contImage
+ if dst.Spec.Traits.JVM == nil {
Review Comment:
It is not a flacky test in this case, the promote command run the "promoted" integration with the trait `Container.Image`, so it becomes an external kit. The alternative would be to add support for the traits on the comand options.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(core): Externally built Integrations run command configuration from jvm trait [camel-k]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #5151:
URL: https://github.com/apache/camel-k/pull/5151#issuecomment-1938223842
:heavy_check_mark: Unit test coverage report - coverage increased from 35.6% to 35.7% (**+0.1%**)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(core): Externally built Integrations run command configuration from jvm trait [camel-k]
Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez merged PR #5151:
URL: https://github.com/apache/camel-k/pull/5151
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(core): Externally built Integrations run command configuration from jvm trait [camel-k]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #5151:
URL: https://github.com/apache/camel-k/pull/5151#issuecomment-1938712671
:heavy_check_mark: Unit test coverage report - coverage increased from 35.6% to 35.7% (**+0.1%**)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(core): Externally built Integrations run command configuration from jvm trait [camel-k]
Posted by "gansheer (via GitHub)" <gi...@apache.org>.
gansheer commented on code in PR #5151:
URL: https://github.com/apache/camel-k/pull/5151#discussion_r1487792970
##########
pkg/cmd/promote.go:
##########
@@ -468,6 +469,12 @@ func (o *promoteCmdOptions) editIntegration(it *v1.Integration) *v1.Integration
dst.Spec.Traits.Container = &traitv1.ContainerTrait{}
}
dst.Spec.Traits.Container.Image = contImage
+ if dst.Spec.Traits.JVM == nil {
Review Comment:
It is not a flacky test in this case, the promote command run the "promoted" integration with the trait `Container.Image`, so it becomes an external kit and does not start correctly. Since the trait was not explicilty set in the original integration, we are relying on default behavior, which will be different for original and promoted integration. This aims to fix this issue.
The alternative would be to add support for the traits on the comand options or add the copy of the integration kit created for the image.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(core): Externally built Integrations run command configuration from jvm trait [camel-k]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #5151:
URL: https://github.com/apache/camel-k/pull/5151#issuecomment-1936064620
:heavy_check_mark: Unit test coverage report - coverage increased from 35.6% to 35.7% (**+0.1%**)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(core): Externally built Integrations run command configuration from jvm trait [camel-k]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #5151:
URL: https://github.com/apache/camel-k/pull/5151#issuecomment-1941124272
:heavy_check_mark: Unit test coverage report - coverage increased from 35.7% to 35.8% (**+0.1%**)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(core): Externally built Integrations run command configuration from jvm trait [camel-k]
Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez commented on code in PR #5151:
URL: https://github.com/apache/camel-k/pull/5151#discussion_r1487884184
##########
pkg/cmd/promote.go:
##########
@@ -468,6 +469,12 @@ func (o *promoteCmdOptions) editIntegration(it *v1.Integration) *v1.Integration
dst.Spec.Traits.Container = &traitv1.ContainerTrait{}
}
dst.Spec.Traits.Container.Image = contImage
+ if dst.Spec.Traits.JVM == nil {
Review Comment:
I see. We can proceed then.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(core): Externally built Integrations run command configuration from jvm trait [camel-k]
Posted by "gansheer (via GitHub)" <gi...@apache.org>.
gansheer commented on PR #5151:
URL: https://github.com/apache/camel-k/pull/5151#issuecomment-1938441867
Could someone trigger the failing test again please :pray:
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(core): Externally built Integrations run command configuration from jvm trait [camel-k]
Posted by "squakez (via GitHub)" <gi...@apache.org>.
squakez commented on code in PR #5151:
URL: https://github.com/apache/camel-k/pull/5151#discussion_r1487753213
##########
pkg/cmd/promote.go:
##########
@@ -468,6 +469,12 @@ func (o *promoteCmdOptions) editIntegration(it *v1.Integration) *v1.Integration
dst.Spec.Traits.Container = &traitv1.ContainerTrait{}
}
dst.Spec.Traits.Container.Image = contImage
+ if dst.Spec.Traits.JVM == nil {
Review Comment:
I don't think we need this check. We know the promote tests are kind of flaky, no need to add anything in the command IMO. The container has to be initialized because it could raise a nil exception, but not the JVM trait, for which, we must keep the default setting.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(core): Externally built Integrations run command configuration from jvm trait [camel-k]
Posted by "gansheer (via GitHub)" <gi...@apache.org>.
gansheer commented on PR #5151:
URL: https://github.com/apache/camel-k/pull/5151#issuecomment-1941386764
I think the PR is good except for known flacky tests.
Additionnaly, I explicitly set the jvm as enabled in promote command when not defined.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(core): Externally built Integrations run command configuration from jvm trait [camel-k]
Posted by "gansheer (via GitHub)" <gi...@apache.org>.
gansheer commented on code in PR #5151:
URL: https://github.com/apache/camel-k/pull/5151#discussion_r1487792970
##########
pkg/cmd/promote.go:
##########
@@ -468,6 +469,12 @@ func (o *promoteCmdOptions) editIntegration(it *v1.Integration) *v1.Integration
dst.Spec.Traits.Container = &traitv1.ContainerTrait{}
}
dst.Spec.Traits.Container.Image = contImage
+ if dst.Spec.Traits.JVM == nil {
Review Comment:
It is not a flacky test in this case, the promote command run the "promoted" integration with the trait `Container.Image`, so it becomes an external kit and does not start correctly. The alternative would be to add support for the traits on the comand options.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(core): Externally built Integrations run command configuration from jvm trait [camel-k]
Posted by "gansheer (via GitHub)" <gi...@apache.org>.
gansheer commented on code in PR #5151:
URL: https://github.com/apache/camel-k/pull/5151#discussion_r1487792970
##########
pkg/cmd/promote.go:
##########
@@ -468,6 +469,12 @@ func (o *promoteCmdOptions) editIntegration(it *v1.Integration) *v1.Integration
dst.Spec.Traits.Container = &traitv1.ContainerTrait{}
}
dst.Spec.Traits.Container.Image = contImage
+ if dst.Spec.Traits.JVM == nil {
Review Comment:
It is not a flacky test in this case, the promote command run the "promoted" integration with the trait `Container.Image`, so it becomes an external kit and does not start correctly. The alternative would be to add support for the traits on the comand options or add the copy of the integration kit created for the image.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org