Merge pull request #7013 from SimonAlling/isChartInstallable

Simplify chart installable check
pull/8414/head
Matthew Fisher 5 years ago committed by GitHub
commit bf9c64f48e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -200,8 +200,7 @@ func runInstall(args []string, client *action.Install, valueOpts *values.Options
return nil, err
}
validInstallableChart, err := isChartInstallable(chartRequested)
if !validInstallableChart {
if err := checkIfInstallable(chartRequested); err != nil {
return nil, err
}
@ -242,15 +241,15 @@ func runInstall(args []string, client *action.Install, valueOpts *values.Options
return client.Run(chartRequested, vals)
}
// isChartInstallable validates if a chart can be installed
// checkIfInstallable validates if a chart can be installed
//
// Application chart type is only installable
func isChartInstallable(ch *chart.Chart) (bool, error) {
func checkIfInstallable(ch *chart.Chart) error {
switch ch.Metadata.Type {
case "", "application":
return true, nil
return nil
}
return false, errors.Errorf("%s charts are not installable", ch.Metadata.Type)
return errors.Errorf("%s charts are not installable", ch.Metadata.Type)
}
// Provide dynamic auto-completion for the install and template commands

Loading…
Cancel
Save