Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

fix(service): Create k8s service when knative-service trait is disabled (1.10.x) #3870

Merged

Conversation

claudio4j
Copy link
Contributor

#3849

When knative-service and k8s service traits are enabled, the priority is to use knative-service in knative profile

(cherry picked from commit 0756354)

Release Note

NONE

@claudio4j
Copy link
Contributor Author

@christophd for review

@claudio4j claudio4j changed the title fix(service): Create normal service when knative-service trait is disabled (1.10.x) fix(service): Create k8s service when knative-service trait is disabled (1.10.x) Dec 2, 2022
Copy link
Contributor

@christophd christophd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Found two minor things and the validate job complains about comments formatting.

Thanks Claudio, especially for the excellent test coverage!

e2e/global/knative/knative_test.go Show resolved Hide resolved
e2e/global/knative/knative_test.go Show resolved Hide resolved
Copy link
Contributor

@squakez squakez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall it could be fine. However there are some consideration I'd like you to ponder before merging.

pkg/trait/service.go Outdated Show resolved Hide resolved
pkg/trait/service.go Show resolved Hide resolved
@christophd christophd mentioned this pull request Dec 5, 2022
…abled

apache#3849

When knative-service and k8s service traits are enabled, the priority is
to use knative-service in knative profile
@claudio4j claudio4j merged commit ff92034 into apache:release-1.10.x Dec 5, 2022
@claudio4j claudio4j deleted the fix_knativeservice_1.10.x branch December 5, 2022 18:34
squakez pushed a commit to jboss-fuse/camel-k that referenced this pull request Dec 12, 2022
fix(service): Create k8s service when knative-service trait is disabled (1.10.x)
squakez pushed a commit to jboss-fuse/camel-k that referenced this pull request Dec 12, 2022
fix(service): Create k8s service when knative-service trait is disabled (1.10.x)

Conflict fixed manually

(cherry picked from commit apache/camel-k@ff92034e4)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants