Skip to content

Commit

Permalink
Add FailedGenerate error state, to clarify the type of error
Browse files Browse the repository at this point in the history
  • Loading branch information
kimtore committed Feb 8, 2024
1 parent 6cd8b88 commit 6c9cc83
Showing 4 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ require (
github.com/magiconair/properties v1.8.7
github.com/mitchellh/hashstructure v1.1.0
github.com/mitchellh/mapstructure v1.5.0
github.com/nais/liberator v0.0.0-20240205125318-c0c08480213d
github.com/nais/liberator v0.0.0-20240208114703-a4ddc1dd2ffa
github.com/novln/docker-parser v1.0.0
github.com/prometheus/client_golang v1.17.0
github.com/sirupsen/logrus v1.9.3
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -244,8 +244,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/nais/liberator v0.0.0-20240205125318-c0c08480213d h1:kMrAQK+ugf3y2UJVjvMPcbiQ7wG3o1d6jymZp8pRy5Q=
github.com/nais/liberator v0.0.0-20240205125318-c0c08480213d/go.mod h1:cWThp1WBBbkRFhMI2DQMvBTTEN+6GPzmmh+Xjv8vffE=
github.com/nais/liberator v0.0.0-20240208114703-a4ddc1dd2ffa h1:AkBC8XlZH+VvZRrHHnjiaTl/mkDRYNMRq6qpfZslUlk=
github.com/nais/liberator v0.0.0-20240208114703-a4ddc1dd2ffa/go.mod h1:cWThp1WBBbkRFhMI2DQMvBTTEN+6GPzmmh+Xjv8vffE=
github.com/novln/docker-parser v1.0.0 h1:PjEBd9QnKixcWczNGyEdfUrP6GR0YUilAqG7Wksg3uc=
github.com/novln/docker-parser v1.0.0/go.mod h1:oCeM32fsoUwkwByB5wVjsrsVQySzPWkl3JdlTn1txpE=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
1 change: 1 addition & 0 deletions pkg/synchronizer/rollout.go
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ import (
type Rollout struct {
Source resource.Source
ResourceOperations resource.Operations
Options interface{}
CorrelationID string
SynchronizationHash string
}
15 changes: 10 additions & 5 deletions pkg/synchronizer/synchronizer.go
Original file line number Diff line number Diff line change
@@ -196,6 +196,7 @@ func (n *Synchronizer) Reconcile(ctx context.Context, req ctrl.Request, app reso
}
}

// Prepare configuration
rollout, err := n.Prepare(ctx, app)
if err != nil {
app.GetStatus().SetSynchronizationStateWithCondition(events.FailedPrepare, err.Error())
@@ -218,6 +219,14 @@ func (n *Synchronizer) Reconcile(ctx context.Context, req ctrl.Request, app reso
return ctrl.Result{}, nil
}

// Generate the actual Kubernetes resources that are going out into the cluster
rollout.ResourceOperations, err = n.generator.Generate(rollout.Source, rollout.Options)
if err != nil {
app.GetStatus().SetSynchronizationStateWithCondition(events.FailedGenerate, err.Error())
n.reportError(ctx, app.GetStatus().SynchronizationState, err, app)
return ctrl.Result{}, err
}

logger = *log.WithFields(app.LogFields())
logger.Debugf("Starting synchronization")

@@ -434,11 +443,7 @@ func (n *Synchronizer) Prepare(ctx context.Context, source resource.Source) (*Ro
}

rollout.CorrelationID = source.CorrelationID()
rollout.ResourceOperations, err = n.generator.Generate(source, opts)

if err != nil {
return nil, fmt.Errorf("creating cluster resource operations: %w", err)
}
rollout.Options = opts

return rollout, nil
}

0 comments on commit 6c9cc83

Please sign in to comment.