pull/2856/merge
lllsheldon 8 years ago committed by GitHub
commit 18cf9336a6

@ -23,6 +23,8 @@ import (
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"k8s.io/helm/pkg/proto/hapi/chart" "k8s.io/helm/pkg/proto/hapi/chart"
"k8s.io/helm/pkg/version"
) )
const ( const (
@ -230,7 +232,7 @@ func getAliasDependency(charts []*chart.Chart, aliasChart *Dependency) *chart.Ch
if existingChart.Metadata.Name != aliasChart.Name { if existingChart.Metadata.Name != aliasChart.Name {
continue continue
} }
if existingChart.Metadata.Version != aliasChart.Version { if !version.IsCompatibleRange(aliasChart.Version, existingChart.Metadata.Version) {
continue continue
} }
chartFound = *existingChart chartFound = *existingChart
@ -266,7 +268,7 @@ func ProcessRequirementsEnabled(c *chart.Chart, v *chart.Config) error {
for _, existingDependency := range c.Dependencies { for _, existingDependency := range c.Dependencies {
var dependencyFound bool var dependencyFound bool
for _, req := range reqs.Dependencies { for _, req := range reqs.Dependencies {
if existingDependency.Metadata.Name == req.Name && existingDependency.Metadata.Version == req.Version { if existingDependency.Metadata.Name == req.Name && version.IsCompatibleRange(req.Version, existingDependency.Metadata.Version) {
dependencyFound = true dependencyFound = true
break break
} }

Loading…
Cancel
Save