Skip to content
This repository was archived by the owner on Mar 16, 2024. It is now read-only.

Support re-pull through --image flag (issue #948) #954

Merged
merged 2 commits into from
Dec 1, 2022
Merged

Support re-pull through --image flag (issue #948) #954

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3b7839
Support re-pull through --image flag #948
cjellick Dec 1, 2022
0a69cfd
Update pkg/cli/update.go
cjellick Dec 1, 2022
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
18 changes: 9 additions & 9 deletions pkg/cli/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,14 @@ func (s *Update) Run(cmd *cobra.Command, args []string) error {
}
}

if s.Pull {
if image != "" {
return fmt.Errorf("cannot set an image (%v) and try to re-pull at the same time", image)
app, err := c.AppGet(cmd.Context(), name)
if err != nil {
return err
}

if s.Pull || image == app.Spec.Image {
if s.Pull && image != "" && image != app.Spec.Image {
return fmt.Errorf("cannot change image (%v) and specify --pull at the same time", image)
}

err := c.AppPullImage(cmd.Context(), name)
Expand All @@ -68,11 +73,6 @@ func (s *Update) Run(cmd *cobra.Command, args []string) error {

imageForFlags := image
if imageForFlags == "" {
app, err := c.AppGet(cmd.Context(), name)
if err != nil {
return err
}

imageForFlags = app.Spec.Image

if _, isPattern := autoupgrade.AutoUpgradePattern(imageForFlags); isPattern {
Expand Down Expand Up @@ -116,7 +116,7 @@ func (s *Update) Run(cmd *cobra.Command, args []string) error {
return outputApp(s.out, s.Output, app)
}

app, err := rulerequest.PromptUpdate(cmd.Context(), c, s.Dangerous, name, opts)
app, err = rulerequest.PromptUpdate(cmd.Context(), c, s.Dangerous, name, opts)
if err != nil {
return err
}
Expand Down