dilim/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-08-08 17:11:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

maintain backwards compatibility in the api for the CRDs function

Browse Source 
Signed-off-by: Mike Tougeron <tougeron@adobe.com>
This commit is contained in:
Mike Tougeron
2020-01-27 14:06:06 -08:00
parent 804e07300b
commit 93adb35af1
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/action/install.go
View File

@@ -168,7 +168,7 @@ func (i *Install) Run(chrt *chart.Chart, vals map[string]interface{}) (*release.
// Pre-install anything in the crd/ directory. We do this before Helm
// contacts the upstream server and builds the capabilities object.
if crds := chrt.CRDs(); !i.ClientOnly && !i.SkipCRDs && len(crds) > 0 {
if crds := chrt.CRDObjects(); !i.ClientOnly && !i.SkipCRDs && len(crds) > 0 {
// On dry run, bail here
if i.DryRun {
i.cfg.Log("WARNING: This chart or one of its subcharts contains CRDs. Rendering may fail or contain inaccuracies.")
@@ -497,7 +497,7 @@ func (c *Configuration) renderResources(ch *chart.Chart, values chartutil.Values
fileWritten := make(map[string]bool)
if includeCrds {
for _, crd := range ch.CRDs() {
for _, crd := range ch.CRDObjects() {
if outputDir == "" {
fmt.Fprintf(b, "---\n# Source: %s\n%s\n", crd.Name, string(crd.File.Data[:]))
} else {

23
pkg/chart/chart.go
View File

@@ -129,8 +129,25 @@ func (ch *Chart) AppVersion() string {
return ch.Metadata.AppVersion
}
// CRDs returns a list of CRD objects in the 'crds/' directory of a Helm chart & subcharts
func (ch *Chart) CRDs() []CRD {
// CRDs returns a list of File objects in the 'crds/' directory of a Helm chart.
// Deprecated: use CRDObjects()
func (ch *Chart) CRDs() []*File {
files := []*File{}
// Find all resources in the crds/ directory
for _, f := range ch.Files {
if strings.HasPrefix(f.Name, "crds/") {
files = append(files, f)
}
}
// Get CRDs from dependencies, too.
for _, dep := range ch.Dependencies() {
files = append(files, dep.CRDs()...)
}
return files
}
// CRDObjects returns a list of CRD objects in the 'crds/' directory of a Helm chart & subcharts
func (ch *Chart) CRDObjects() []CRD {
crds := []CRD{}
// Find all resources in the crds/ directory
for _, f := range ch.Files {
@@ -141,7 +158,7 @@ func (ch *Chart) CRDs() []CRD {
}
// Get CRDs from dependencies, too.
for _, dep := range ch.Dependencies() {
crds = append(crds, dep.CRDs()...)
crds = append(crds, dep.CRDObjects()...)
}
return crds
}