Skip to content

Commit

Permalink
Move waiting for platform to controller apache#797 (fix PR review)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lburgazzoli @ipolyzos
lburgazzoli authored and ipolyzos committed Jul 31, 2019
1 parent 87710d5 commit 6e83179
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 59 deletions.
2 changes: 1 addition & 1 deletion pkg/apis/camel/v1alpha1/build_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const (
// BuildPhaseNone --
BuildPhaseNone BuildPhase = ""
// BuildPhaseInitialization --
BuildPhaseInitialization BuildPhase = "initialization"
BuildPhaseInitialization BuildPhase = "Initialization"
// BuildPhaseWaitingForPlatform --
BuildPhaseWaitingForPlatform BuildPhase = "Waiting For Platform"
// BuildPhaseScheduling --
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/camel/v1alpha1/integration_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ const (
// IntegrationPhaseNone --
IntegrationPhaseNone IntegrationPhase = ""
// IntegrationPhaseInitialization --
IntegrationPhaseInitialization IntegrationPhase = "initialization"
IntegrationPhaseInitialization IntegrationPhase = "Initialization"
// IntegrationPhaseWaitingForPlatform --
IntegrationPhaseWaitingForPlatform IntegrationPhase = "Waiting For Platform"
// IntegrationPhaseBuildingKit --
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/camel/v1alpha1/integrationkit_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const (
// IntegrationKitPhaseNone --
IntegrationKitPhaseNone IntegrationKitPhase = ""
// IntegrationKitPhaseInitialization --
IntegrationKitPhaseInitialization IntegrationKitPhase = "initialization"
IntegrationKitPhaseInitialization IntegrationKitPhase = "Initialization"
// IntegrationKitPhaseWaitingForPlatform --
IntegrationKitPhaseWaitingForPlatform IntegrationKitPhase = "Waiting For Platform"
// IntegrationKitPhaseBuildSubmitted --
Expand Down
35 changes: 17 additions & 18 deletions pkg/controller/build/build_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import (
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/builder"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/util/log"
)

// Add creates a new Build Controller and adds it to the Manager. The Manager will set fields on the Controller
Expand Down Expand Up @@ -178,13 +179,7 @@ func (r *ReconcileBuild) Reconcile(request reconcile.Request) (reconcile.Result,
}

if instance.Status.Phase != target.Status.Phase {
err = r.update(ctx, target)
if err != nil {
if k8serrors.IsConflict(err) {
targetLog.Error(err, "conflict")
err = nil
}
}
return r.update(ctx, targetLog, target)
}

return reconcile.Result{}, err
Expand Down Expand Up @@ -213,15 +208,8 @@ func (r *ReconcileBuild) Reconcile(request reconcile.Request) (reconcile.Result,
}

if newTarget != nil {
if err := r.update(ctx, newTarget); err != nil {
if k8serrors.IsConflict(err) {
targetLog.Error(err, "conflict")
return reconcile.Result{
Requeue: true,
}, nil
}

return reconcile.Result{}, err
if r, err := r.update(ctx, targetLog, newTarget); err != nil {
return r, err
}

if newTarget.Status.Phase != target.Status.Phase {
Expand Down Expand Up @@ -252,6 +240,17 @@ func (r *ReconcileBuild) Reconcile(request reconcile.Request) (reconcile.Result,
}

// Update --
func (r *ReconcileBuild) update(ctx context.Context, target *v1alpha1.Build) error {
return r.client.Status().Update(ctx, target)
func (r *ReconcileBuild) update(ctx context.Context, log log.Logger, target *v1alpha1.Build) (reconcile.Result, error) {
err := r.client.Status().Update(ctx, target)
if err != nil {
if k8serrors.IsConflict(err) {
log.Error(err, "conflict")

return reconcile.Result{
Requeue: true,
}, nil
}
}

return reconcile.Result{}, err
}
36 changes: 17 additions & 19 deletions pkg/controller/integration/integration_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,13 +247,7 @@ func (r *ReconcileIntegration) Reconcile(request reconcile.Request) (reconcile.R
}

if instance.Status.Phase != target.Status.Phase {
err = r.update(ctx, target)
if err != nil {
if k8serrors.IsConflict(err) {
targetLog.Error(err, "conflict")
err = nil
}
}
return r.update(ctx, targetLog, target)
}

return reconcile.Result{}, err
Expand Down Expand Up @@ -281,15 +275,8 @@ func (r *ReconcileIntegration) Reconcile(request reconcile.Request) (reconcile.R
}

if newTarget != nil {
if err := r.update(ctx, newTarget); err != nil {
if k8serrors.IsConflict(err) {
targetLog.Error(err, "conflict")
return reconcile.Result{
Requeue: true,
}, nil
}

return reconcile.Result{}, err
if r, err := r.update(ctx, targetLog, newTarget); err != nil {
return r, err
}

if newTarget.Status.Phase != target.Status.Phase {
Expand All @@ -311,13 +298,24 @@ func (r *ReconcileIntegration) Reconcile(request reconcile.Request) (reconcile.R
}

// Update --
func (r *ReconcileIntegration) update(ctx context.Context, target *v1alpha1.Integration) error {
func (r *ReconcileIntegration) update(ctx context.Context, log log.Logger, target *v1alpha1.Integration) (reconcile.Result, error) {
dgst, err := digest.ComputeForIntegration(target)
if err != nil {
return err
return reconcile.Result{}, err
}

target.Status.Digest = dgst

return r.client.Status().Update(ctx, target)
err = r.client.Status().Update(ctx, target)
if err != nil {
if k8serrors.IsConflict(err) {
log.Error(err, "conflict")

return reconcile.Result{
Requeue: true,
}, nil
}
}

return reconcile.Result{}, err
}
37 changes: 18 additions & 19 deletions pkg/controller/integrationkit/integrationkit_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"github.com/apache/camel-k/pkg/platform"

"github.com/apache/camel-k/pkg/util/digest"
"github.com/apache/camel-k/pkg/util/log"

"k8s.io/apimachinery/pkg/api/errors"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down Expand Up @@ -159,13 +160,7 @@ func (r *ReconcileIntegrationKit) Reconcile(request reconcile.Request) (reconcil
}

if instance.Status.Phase != target.Status.Phase {
err = r.update(ctx, target)
if err != nil {
if k8serrors.IsConflict(err) {
targetLog.Error(err, "conflict")
err = nil
}
}
return r.update(ctx, targetLog, target)
}

return reconcile.Result{}, err
Expand All @@ -191,15 +186,8 @@ func (r *ReconcileIntegrationKit) Reconcile(request reconcile.Request) (reconcil
}

if newTarget != nil {
if err := r.update(ctx, newTarget); err != nil {
if k8serrors.IsConflict(err) {
targetLog.Error(err, "conflict")
return reconcile.Result{
Requeue: true,
}, nil
}

return reconcile.Result{}, err
if r, err := r.update(ctx, targetLog, newTarget); err != nil {
return r, err
}

if newTarget.Status.Phase != target.Status.Phase {
Expand All @@ -221,13 +209,24 @@ func (r *ReconcileIntegrationKit) Reconcile(request reconcile.Request) (reconcil
}

// Update --
func (r *ReconcileIntegrationKit) update(ctx context.Context, target *v1alpha1.IntegrationKit) error {
func (r *ReconcileIntegrationKit) update(ctx context.Context, log log.Logger, target *v1alpha1.IntegrationKit) (reconcile.Result, error) {
dgst, err := digest.ComputeForIntegrationKit(target)
if err != nil {
return err
return reconcile.Result{}, err
}

target.Status.Digest = dgst

return r.client.Status().Update(ctx, target)
err = r.client.Status().Update(ctx, target)
if err != nil {
if k8serrors.IsConflict(err) {
log.Error(err, "conflict")

return reconcile.Result{
Requeue: true,
}, nil
}
}

return reconcile.Result{}, err
}

0 comments on commit 6e83179

Please sign in to comment.