kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-04 16:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ Use sprig instead of helm

Browse Source 
This alleviates luet build dependency graph while it simplifies template
logic too.
This commit is contained in:
Ettore Di Giacinto
2022-01-27 16:37:42 +01:00
parent 8bcdf6bc28
commit 6f77fa2b3a
1032 changed files with 150 additions and 496038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/compiler/compiler.go
View File

@@ -32,6 +32,7 @@ import (
bus "github.com/mudler/luet/pkg/api/core/bus"
"github.com/mudler/luet/pkg/api/core/context"
"github.com/mudler/luet/pkg/api/core/image"
"github.com/mudler/luet/pkg/api/core/template"
"github.com/mudler/luet/pkg/api/core/types"
artifact "github.com/mudler/luet/pkg/api/core/types/artifact"
"github.com/mudler/luet/pkg/compiler/backend"
@@ -45,7 +46,6 @@ import (
"github.com/imdario/mergo"
"github.com/pkg/errors"
"gopkg.in/yaml.v2"
"helm.sh/helm/v3/pkg/chart"
)
const BuildFile = "build.yaml"
@@ -1294,9 +1294,9 @@ type templatedata map[string]interface{}
func (cs *LuetCompiler) templatePackage(vals []map[string]interface{}, pack *types.Package, dst templatedata) ([]byte, error) {
// Grab shared templates first
var chartFiles []*chart.File
var chartFiles []string
if len(cs.Options.TemplatesFolder) != 0 {
c, err := helpers.ChartFiles(cs.Options.TemplatesFolder)
c, err := template.FilesInDir(cs.Options.TemplatesFolder)
if err == nil {
chartFiles = c
}
@@ -1338,7 +1338,7 @@ func (cs *LuetCompiler) templatePackage(vals []map[string]interface{}, pack *typ
return nil, errors.Wrap(err, "merging values maps")
}
dat, err := helpers.RenderHelm(append(chartFiles, helpers.ChartFileB(dataBuild)...), td, dst)
dat, err := template.Render(append(template.ReadFiles(chartFiles...), string(dataBuild)), td, dst)
if err != nil {
return nil, errors.Wrap(err, "rendering file "+pack.Rel(BuildFile))
}
@@ -1365,12 +1365,7 @@ func (cs *LuetCompiler) templatePackage(vals []map[string]interface{}, pack *typ
}
}
raw, err := ioutil.ReadFile(pack.Rel(BuildFile))
if err != nil {
return nil, err
}
out, err := helpers.RenderFiles(append(chartFiles, helpers.ChartFileB(raw)...), val, bv...)
out, err := template.RenderWithValues(append(chartFiles, pack.Rel(BuildFile)), val, bv...)
if err != nil {
return nil, errors.Wrap(err, "rendering file "+pack.Rel(BuildFile))
}
@@ -1417,7 +1412,7 @@ func (cs *LuetCompiler) FromPackage(p *types.Package) (*compilerspec.LuetCompila
}
// Update processed build values
dst, err := helpers.UnMarshalValues(cs.Options.BuildValuesFile)
dst, err := template.UnMarshalValues(cs.Options.BuildValuesFile)
if err != nil {
return nil, errors.Wrap(err, "unmarshalling values")
}