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.

Sign up for GitHub

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

Jump to bottom

Fix #557: fix generated images #560

Merged
merged 1 commit into from
Mar 15, 2019
Merged

Fix #557: fix generated images #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion pkg/controller/integrationcontext/initialize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ func (action *initializeAction) Handle(ctx context.Context, ictx *v1alpha1.Integ
return err
}

// Updating the whole integration context as it may have changed
action.L.Info("Updating IntegrationContext")
if err := action.client.Update(ctx, target); err != nil {
return err
}

if target.Spec.Image == "" {
// by default the context should be build
target.Status.Phase = v1alpha1.IntegrationContextPhaseBuildSubmitted
Expand All @@ -76,6 +82,5 @@ func (action *initializeAction) Handle(ctx context.Context, ictx *v1alpha1.Integ
target.Status.Digest = dgst

action.L.Info("IntegrationContext state transition", "phase", target.Status.Phase)

return action.client.Status().Update(ctx, target)
}
2 changes: 2 additions & 0 deletions pkg/platform/images/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ var StandardDependencies = map[string]bool{
"camel:core": true,
"runtime:jvm": true,
"runtime:yaml": true,
"mvn:org.apache.camel.k:camel-k-adapter-camel-2:" + defaults.RuntimeVersion: true,
Copy link
Contributor

Choose a reason for hiding this comment

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

this seems a little bit of an hack but should work :)

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, I plan to remove support for predefined images in 0.3.2..

"camel:camel-netty4-http": true,
}

// LookupPredefinedImage is used to find a suitable predefined image if available
Expand Down