Skip to content

Commit

Permalink
Merge pull request #249 from jrasell/panic-fix-0.2.5-release
Browse files Browse the repository at this point in the history
Fix panic in deployment due to unsafe count checking on taskgroups
  • Loading branch information
jrasell committed Oct 25, 2018
2 parents 77da5ec + a737a22 commit 0514741
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.2.5 (25 October 2018)

BUG FIXES:
* Fix panic in deployment where count is not specified due to unsafe count checking on task groups [GH-249](https://github.com/jrasell/levant/pull/249)

## 0.2.4 (24 October 2018)

BUG FIXES:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM alpine:latest
LABEL maintainer James Rasell<(jamesrasell@gmail.com)> (@jrasell)
LABEL vendor "jrasell"

ENV LEVANT_VERSION 0.2.4
ENV LEVANT_VERSION 0.2.5

WORKDIR /usr/bin/

Expand Down
4 changes: 3 additions & 1 deletion levant/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,9 @@ func (l *levantDeployment) dynamicGroupCountUpdater() error {

func (l *levantDeployment) isJobZeroCount() bool {
for _, tg := range l.config.Template.Job.TaskGroups {
if *tg.Count > 0 {
if tg.Count == nil {
return false
} else if *tg.Count > 0 {
return false
}
}
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package version
import "fmt"

// Version is the main version number that is being run at the moment.
const Version = "0.2.4"
const Version = "0.2.5"

// VersionPrerelease is a pre-release marker for the version. If this is ""
// (empty string) then it means that it is a final release. Otherwise, this is
Expand Down

0 comments on commit 0514741

Please sign in to comment.