Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions cli/cmd/release_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -485,8 +485,13 @@ Prepared to create release with defaults:
}
log.FinishSpinner()

// ignore error since operation was successful
log.ChildActionWithoutSpinner("Channel %s successfully set to release %d\n", promoteChanID, release.Sequence)
if len(promoteResp.Warnings) > 0 {
for _, w := range promoteResp.Warnings {
log.ChildActionWithoutSpinner("Warning: %s", w)
}
} else {
log.ChildActionWithoutSpinner("Channel %s successfully set to release %d", promoteChanID, release.Sequence)
}

if r.appType == "kots" && r.args.createReleasePromoteWaitForAirgap {
if err := r.waitForAirgapBuilds(promoteResp, r.args.createReleasePromoteWaitForAirgapTimeout, log); err != nil {
Expand Down
20 changes: 16 additions & 4 deletions cli/cmd/release_promote.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,21 +108,33 @@ func (r *runners) releasePromote(cmd *cobra.Command, args []string) (err error)
log.Silence()

out := struct {
Channel string `json:"channel"`
ReleaseSequence int64 `json:"release_sequence"`
VersionLabel string `json:"version_label"`
Channel string `json:"channel"`
ReleaseSequence int64 `json:"release_sequence"`
VersionLabel string `json:"version_label"`
Warnings []string `json:"warnings,omitempty"`
}{
Channel: newID,
ReleaseSequence: seq,
VersionLabel: r.args.releaseVersion,
}

if promoteResp != nil && len(promoteResp.Warnings) > 0 {
out.Warnings = promoteResp.Warnings
}

enc := json.NewEncoder(r.w)
enc.SetIndent("", " ")
if err := enc.Encode(out); err != nil {
return errors.Wrap(err, "encode json output")
}
} else {
fmt.Fprintf(r.w, "Channel %s successfully set to release %d\n", channelName, seq)
if len(promoteResp.Warnings) > 0 {
for _, w := range promoteResp.Warnings {
fmt.Fprintf(r.w, "Warning: %s\n", w)
}
} else {
fmt.Fprintf(r.w, "Channel %s successfully set to release %d\n", channelName, seq)
}
Comment thread
nvanthao marked this conversation as resolved.
}

if r.appType == "kots" && r.args.releasePromoteWaitForAirgap {
Expand Down
1 change: 1 addition & 0 deletions pkg/types/release.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ type AirgapBuildSummary struct {
type PromoteReleaseResponse struct {
Release KotsAppRelease `json:"release"`
AirgapBuilds []AirgapBuildSummary `json:"airgapBuilds"`
Warnings []string `json:"warnings,omitempty"`
}

type KotsAppRelease struct {
Expand Down