Skip to content

Wait timeout fix #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dramich merged 2 commits into from
Jul 25, 2019
Merged

Wait timeout fix #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca2aeaa
Update types
rmweir Jul 20, 2019
05449f4
Add wait, timeout, and show-notes flags
rmweir Jul 17, 2019
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
71 changes: 46 additions & 25 deletions cmd/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,15 @@ func AppCommand() cli.Command {
Name: "no-prompt",
Copy link
Contributor

@cbron cbron Jul 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could add an example in description that includes these flags

Usage: "Suppress asking questions and use the default values when required answers are not provided",
},
cli.IntFlag{
Name: "timeout",
Usage: "Amount of time to wait for k8s commands (default is 300 secs). Example: --timeout 600",
Value: 300,
},
cli.BoolFlag{
Name: "wait",
Usage: "Wait, as long as timeout value, for installed resources to be ready (pods, PVCs, deployments, etc.). Example: --wait",
},
},
},
cli.Command{
Expand Down Expand Up @@ -253,6 +262,12 @@ func AppCommand() cli.Command {
formatFlag,
},
},
cli.Command{
Name: "show-notes",
Usage: "Show contents of apps notes.txt",
Action: appNotes,
ArgsUsage: "[APP_NAME/APP_ID]",
},
},
}
}
Expand Down Expand Up @@ -658,38 +673,44 @@ func templateInstall(ctx *cli.Context) error {
app.TargetNamespace = namespace
}

app.Wait = ctx.Bool("wait")
Copy link
Contributor

@luthermonson luthermonson Jul 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should wait boolflag have a default of true? false? what happens if you set app.Wait to nil or whatever comes through from the not setting BoolFlag Value?

Copy link
Contributor Author

@rmweir rmweir Jul 23, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

default on bool flags is false, which is intended. I tested without using wait.

Copy link
Contributor

@luthermonson luthermonson Jul 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

then we're good

app.Timeout = ctx.Int64("timeout")

madeApp, err := c.ProjectClient.App.Create(app)
if err != nil {
return err
}

// wait for the app to be installed to print the notes
var (
timeout int
installed bool
)
for !installed {
if timeout == 60 {
return errors.New("timed out waiting for app to install. Run 'rancher apps' to verify status")
}
timeout++
time.Sleep(2 * time.Second)
madeApp, err = c.ProjectClient.App.ByID(madeApp.ID)
if err != nil {
return err
}
for _, condition := range madeApp.Conditions {
condType := strings.ToLower(condition.Type)
condStatus := strings.ToLower(condition.Status)
if condType == "installed" && condStatus == "true" {
installed = true
break
}
}
fmt.Printf("run \"app show-notes %s\" to view app notes once app is ready\n", madeApp.Name)

return nil
}

// appNotes prints notes from app's notes.txt file
func appNotes(ctx *cli.Context) error {
c, err := GetClient(ctx)
if err != nil {
return err
}

if ctx.NArg() < 1 {
return cli.ShowSubcommandHelp(ctx)
}

resource, err := Lookup(c, ctx.Args().First(), "app")
if err != nil {
return err
}

if len(madeApp.Notes) != 0 {
fmt.Println(madeApp.Notes)
app, err := c.ProjectClient.App.ByID(resource.ID)
if err != nil {
return err
}

if len(app.Notes) > 0 {
fmt.Println(app.Notes)
} else {
fmt.Println("no notes to print")
}

return nil
Expand Down
2 changes: 1 addition & 1 deletion vendor.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ github.com/pmezard/go-difflib v1.0.0
github.com/stretchr/testify v1.2.2

github.com/rancher/norman 457c15b94acae52afb5290aa315452c7621d452a
github.com/rancher/types ee87bbdceacff5c566f901bdc57eec8330e7ed13
github.com/rancher/types 830a7b6821e671ee072464138af6ef2b44114a48 https://github.com/rmweir/types
30 changes: 22 additions & 8 deletions vendor/github.com/rancher/types/.drone.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/github.com/rancher/types/Dockerfile.dapper
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions vendor/github.com/rancher/types/client/management/v3/zz_generated_azure_cloud_provider.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions ...or/github.com/rancher/types/client/management/v3/zz_generated_catalog_template_version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions vendor/github.com/rancher/types/client/management/v3/zz_generated_cert_expiration.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions vendor/github.com/rancher/types/client/management/v3/zz_generated_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions .../github.com/rancher/types/client/management/v3/zz_generated_cloudflare_provider_config.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading