Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor proxy injection to use Helm charts #3195

Closed
wants to merge 4 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Siggy's feedback
Signed-off-by: Alejandro Pedraza <[email protected]>
alpeb committed Aug 6, 2019
commit 4250749a67115fedd57d3bfb911ac63869771ec5
6 changes: 3 additions & 3 deletions pkg/charts/util.go → pkg/charts/charts.go
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ type Chart struct {

// Render returns a bytes buffer with the result of rendering a Helm chart
func (chart *Chart) Render() (bytes.Buffer, error) {
chart.filesReader(chart.Dir+"/", chart.Files)
filesReader(chart.Dir+"/", chart.Files)

// Keep this slice synced with the contents of /charts/partials
partialsFiles := []*chartutil.BufferedFile{
@@ -36,7 +36,7 @@ func (chart *Chart) Render() (bytes.Buffer, error) {
{Name: "charts/partials/templates/_debug.tpl"},
{Name: "charts/partials/templates/_capabilities.tpl"},
}
chart.filesReader("", partialsFiles)
filesReader("", partialsFiles)

// Create chart and render templates
chrt, err := chartutil.LoadFiles(append(chart.Files, partialsFiles...))
@@ -73,7 +73,7 @@ func (chart *Chart) Render() (bytes.Buffer, error) {
return buf, nil
}

func (chart *Chart) filesReader(dir string, files []*chartutil.BufferedFile) error {
func filesReader(dir string, files []*chartutil.BufferedFile) error {
for _, f := range files {
filename := dir + f.Name
if dir == "" {