This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 7e8c81ce1cf0633259b219b2fc3ec21855f5bd6f
Author: nferraro <ni.ferr...@gmail.com>
AuthorDate: Fri Jan 4 15:29:11 2019 +0100
Fix #237: fix bug in context lookup
---
pkg/controller/integration/deploy.go | 4 ++--
pkg/controller/integration/initialize.go | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/pkg/controller/integration/deploy.go
b/pkg/controller/integration/deploy.go
index 924ef89..1ea1096 100644
--- a/pkg/controller/integration/deploy.go
+++ b/pkg/controller/integration/deploy.go
@@ -49,11 +49,11 @@ func (action *deployAction) Handle(ctx context.Context,
integration *v1alpha1.In
if ictxName == "" {
return errors.Errorf("no context set on integration %s",
integration.Name)
}
+ ictx := v1alpha1.NewIntegrationContext(integration.Namespace, ictxName)
ictxKey := k8sclient.ObjectKey{
Namespace: integration.Namespace,
- Name: integration.Name,
+ Name: ictxName,
}
- ictx := v1alpha1.NewIntegrationContext(integration.Namespace, ictxName)
if err := action.client.Get(ctx, ictxKey, &ictx); err != nil {
return errors.Wrapf(err, "unable to find integration context
%s, %s", ictxName, err)
diff --git a/pkg/controller/integration/initialize.go
b/pkg/controller/integration/initialize.go
index a772f51..d99c8c5 100644
--- a/pkg/controller/integration/initialize.go
+++ b/pkg/controller/integration/initialize.go
@@ -71,7 +71,6 @@ func (action *initializeAction) Handle(ctx context.Context,
integration *v1alpha
target.Status.Phase = v1alpha1.IntegrationPhaseBuildingContext
target.Status.Digest = dgst
target.Status.Context = integration.Spec.Context
- target.Status.Dependencies = integration.Spec.Dependencies
target.Status.Image = ""
logrus.Info("Integration ", target.Name, " transitioning to state ",
target.Status.Phase)
