upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-05-21 17:41:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge 1bbfadd74a into fcdf3854b0

Browse source
This commit is contained in:
John Lin 2026-05-20 19:16:37 +05:30 committed by GitHub
commit b65d5aed84
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/cmd/install.go
View file

@ -38,6 +38,7 @@ import (
"helm.sh/helm/v4/pkg/cmd/require"
"helm.sh/helm/v4/pkg/downloader"
"helm.sh/helm/v4/pkg/getter"
"helm.sh/helm/v4/pkg/kube"
release "helm.sh/helm/v4/pkg/release/v1"
)
@ -344,6 +345,8 @@ func runInstall(args []string, client *action.Install, valueOpts *values.Options
cancel()
}()
printWaitMessage(out, client.WaitStrategy, client.Timeout)
ri, err := client.RunWithContext(ctx, chartRequested, vals)
rel, rerr := releaserToV1Release(ri)
if rerr != nil {
@ -365,6 +368,13 @@ func checkIfInstallable(ch chart.Accessor) error {
return fmt.Errorf("%s charts are not installable", meta["Type"])
}
func printWaitMessage(out io.Writer, strategy kube.WaitStrategy, timeout time.Duration) {
if strategy == kube.HookOnlyStrategy {
return
}
fmt.Fprintf(out, "Waiting for resources to become ready (timeout: %s)\n", timeout)
}
// Provide dynamic auto-completion for the install and template commands
func compInstall(args []string, toComplete string, client *action.Install) ([]string, cobra.ShellCompDirective) {
requiredArgs := 1

1
pkg/cmd/testdata/output/install-with-wait-for-jobs.txt vendored
View file

@ -1,3 +1,4 @@
Waiting for resources to become ready (timeout: 5m0s)
NAME: apollo
LAST DEPLOYED: Fri Sep 2 22:04:05 1977
NAMESPACE: default

1
pkg/cmd/testdata/output/install-with-wait.txt vendored
View file

@ -1,3 +1,4 @@
Waiting for resources to become ready (timeout: 5m0s)
NAME: apollo
LAST DEPLOYED: Fri Sep 2 22:04:05 1977
NAMESPACE: default

1
pkg/cmd/testdata/output/upgrade-with-wait-for-jobs.txt vendored
View file

@ -1,3 +1,4 @@
Waiting for resources to become ready (timeout: 5m0s)
Release "crazy-bunny" has been upgraded. Happy Helming!
NAME: crazy-bunny
LAST DEPLOYED: Fri Sep 2 22:04:05 1977

1
pkg/cmd/testdata/output/upgrade-with-wait.txt vendored
View file

@ -1,3 +1,4 @@
Waiting for resources to become ready (timeout: 5m0s)
Release "crazy-bunny" has been upgraded. Happy Helming!
NAME: crazy-bunny
LAST DEPLOYED: Fri Sep 2 22:04:05 1977

4
pkg/cmd/upgrade.go
View file

@ -250,6 +250,10 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
cancel()
}()
if outfmt == output.Table {
printWaitMessage(out, client.WaitStrategy, client.Timeout)
}
rel, err := client.RunWithContext(ctx, args[0], ch, vals)
if err != nil {
return fmt.Errorf("UPGRADE FAILED: %w", err)