linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always use forward-slash when interacting with the VFS (#3284) 

* Always use forward-slash when interacting with the VFS

Fixes #3283

Our VFS implementation relies on `net.http.FileSystem` which always
expects `/` regardless of the OS.

Signed-off-by: Alejandro Pedraza <alejandro@buoyant.io>
This commit is contained in:
Alejandro Pedraza 2019-08-19 11:10:21 -05:00 committed by GitHub
parent f9c956b91e
commit 99ddc66461
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/cmd/install.go
View File

@ -6,7 +6,6 @@ import (
"io"
"io/ioutil"
"os"
"path/filepath"
"strconv"
"strings"
"time"
@ -157,7 +156,7 @@ Otherwise, you can use the --ignore-cluster flag to overwrite the existing globa
// persisted in Linkerd's control plane configuration to be used at
// injection-time.
func newInstallOptionsWithDefaults() (*installOptions, error) {
chartDir := fmt.Sprintf("%s%s", helmDefaultChartDir, string(filepath.Separator))
chartDir := fmt.Sprintf("%s/", helmDefaultChartDir)
defaults, err := charts.ReadDefaults(chartDir, false)
if err != nil {
return nil, err
@ -549,7 +548,7 @@ func (options *installOptions) validate() error {
func (options *installOptions) buildValuesWithoutIdentity(configs *pb.All) (*installValues, error) {
// install values that can't be overridden by CLI options will be assigned
// defaults from the values.yaml and values-ha.yaml files
chartDir := fmt.Sprintf("%s%s", helmDefaultChartDir, string(filepath.Separator))
chartDir := fmt.Sprintf("%s/", helmDefaultChartDir)
defaults, err := charts.ReadDefaults(chartDir, options.highAvailability)
if err != nil {
return nil, err

1
pkg/charts/defaults.go
View File

@ -63,6 +63,7 @@ type DefaultValues struct {
// ReadDefaults read all the default variables from the values.yaml file.
// If ha is true, values-ha.yaml will be merged into values.yaml.
// chartDir is the root directory of the Helm chart where values.yaml is.
// chartDir should use `/` as a dir separator regardless of the OS.
func ReadDefaults(chartDir string, ha bool) (*DefaultValues, error) {
valuesFiles := []*chartutil.BufferedFile{
{Name: helmDefaultValuesFile},