Support for multiple integration definitions #235
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oscerd
approved these changes
Nov 22, 2018
lburgazzoli
force-pushed
the
github-45-multi-integrations
branch
from
77b313e
to
02f5d0d
Compare
nicolaferraro
requested changes
Nov 22, 2018
pkg/client/cmd/run.go
Outdated
|
|
||
| if idx := strings.LastIndexByte(filename, os.PathSeparator); idx > -1 { | ||
| codeName = codeName[idx+1:] | ||
| } else { |
There was a problem hiding this comment.
Maybe we should print a better message saying that if you use multiple sources, the name becomes mandatory. Also, it's dangerous to call the integration "integration" (the old way) when there's no other info, because new integrations override old ones..
pkg/trait/deployment.go
Outdated
| @@ -42,7 +43,7 @@ func (d *deploymentTrait) apply(e *environment) error { | |||
| return nil | |||
| } | |||
|
|
|||
| e.Resources.Add(d.getConfigMapFor(e)) | |||
| e.Resources.AddAll(d.getConfigMapFor(e)) | |||
| // set env vars needed by the runtime | ||
| environment["JAVA_MAIN_CLASS"] = "org.apache.camel.k.jvm.Application" | ||
|
|
||
| // camel-k runtime | ||
| environment["CAMEL_K_ROUTES_URI"] = "inline:" + e.Integration.Spec.Source.Content |
There was a problem hiding this comment.
Appreciate 👍, I didn't like "inline:"!
|
|
||
| for _, s := range e.Integration.Spec.Sources { | ||
| meta := metadata.Extract(s) | ||
| channels = append(channels, knativeutil.ExtractChannelNames(meta.FromURIs)...) |
There was a problem hiding this comment.
Maybe we should consider adding to the meta package some functions to inpect all sources without iterating on them each time.. For the future..
| //l = components.get('log') | ||
| //l.exchangeFormatter = function(e) { | ||
| // return "log - body=" + e.in.body + ", headers=" + e.in.headers | ||
| //} |
There was a problem hiding this comment.
Did you intend to change this?
There was a problem hiding this comment.
no leftover of testing
| public static Reader resolveInline(String uri) { | ||
| if (!uri.startsWith(SCHEME_INLINE)) { | ||
| public static Reader resolveEnv(String uri) { | ||
| if (!uri.startsWith(Constants.SCHEME_ENV)) { | ||
| throw new IllegalArgumentException("The provided content is not inline: " + uri); |
lburgazzoli
force-pushed
the
github-45-multi-integrations
branch
from
74c2061
to
fe80084
Compare
|
@nicolaferraro done |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #45