Skip to content

Commit

Permalink
fix(nelm): "werf converge" panics on first release
Browse files Browse the repository at this point in the history
Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
  • Loading branch information
ilya-lesikov committed Apr 4, 2024
1 parent 1b6c019 commit 4272ea6
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 9 deletions.
9 changes: 6 additions & 3 deletions cmd/werf/bundle/apply/apply.go
Expand Up @@ -491,9 +491,12 @@ func runApply(ctx context.Context) error {
}
}

releaseUpToDate, err := rlsdiff.ReleaseUpToDate(prevRelease, newRel)
if err != nil {
return fmt.Errorf("error checking if release is up to date: %w", err)
var releaseUpToDate bool
if prevReleaseFound {
releaseUpToDate, err = rlsdiff.ReleaseUpToDate(prevRelease, newRel)
if err != nil {
return fmt.Errorf("error checking if release is up to date: %w", err)
}
}

planUseless, err := plan.Useless()
Expand Down
9 changes: 6 additions & 3 deletions cmd/werf/converge/converge.go
Expand Up @@ -756,9 +756,12 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
}
}

releaseUpToDate, err := rlsdiff.ReleaseUpToDate(prevRelease, newRel)
if err != nil {
return fmt.Errorf("error checking if release is up to date: %w", err)
var releaseUpToDate bool
if prevReleaseFound {
releaseUpToDate, err = rlsdiff.ReleaseUpToDate(prevRelease, newRel)
if err != nil {
return fmt.Errorf("error checking if release is up to date: %w", err)
}
}

planUseless, err := plan.Useless()
Expand Down
9 changes: 6 additions & 3 deletions cmd/werf/plan/plan.go
Expand Up @@ -659,9 +659,12 @@ func run(ctx context.Context, containerBackend container_backend.ContainerBacken
prevRelFailed,
)

releaseUpToDate, err := rlsdiff.ReleaseUpToDate(prevRelease, newRel)
if err != nil {
return fmt.Errorf("error checking if release is up to date: %w", err)
var releaseUpToDate bool
if prevReleaseFound {
releaseUpToDate, err = rlsdiff.ReleaseUpToDate(prevRelease, newRel)
if err != nil {
return fmt.Errorf("error checking if release is up to date: %w", err)
}
}

resrcchanglog.LogPlannedChanges(
Expand Down

0 comments on commit 4272ea6

Please sign in to comment.