Simplify chart installable check

The error conveys at least as much information as the boolean.

Signed-off-by: Simon Alling <alling.simon@gmail.com>
pull/7013/head
Simon Alling 5 years ago
parent 84de17e7e5
commit 36c9c0e520

@ -176,8 +176,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
}
@ -209,13 +208,13 @@ 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)
}

Loading…
Cancel
Save