feat: kubesphere 4.0 (#6115)
* feat: kubesphere 4.0 Signed-off-by: ci-bot <ci-bot@kubesphere.io> * feat: kubesphere 4.0 Signed-off-by: ci-bot <ci-bot@kubesphere.io> --------- Signed-off-by: ci-bot <ci-bot@kubesphere.io> Co-authored-by: ks-ci-bot <ks-ci-bot@example.com> Co-authored-by: joyceliu <joyceliu@yunify.com>
This commit is contained in:
committed by
GitHub
parent
b5015ec7b9
commit
447a51f08b
15
vendor/helm.sh/helm/v3/pkg/engine/files.go
vendored
15
vendor/helm.sh/helm/v3/pkg/engine/files.go
vendored
@@ -99,7 +99,8 @@ func (f files) Glob(pattern string) files {
|
||||
// The output will not be indented, so you will want to pipe this to the
|
||||
// 'indent' template function.
|
||||
//
|
||||
// data:
|
||||
// data:
|
||||
//
|
||||
// {{ .Files.Glob("config/**").AsConfig() | indent 4 }}
|
||||
func (f files) AsConfig() string {
|
||||
if f == nil {
|
||||
@@ -128,8 +129,9 @@ func (f files) AsConfig() string {
|
||||
// The output will not be indented, so you will want to pipe this to the
|
||||
// 'indent' template function.
|
||||
//
|
||||
// data:
|
||||
// {{ .Files.Glob("secrets/*").AsSecrets() }}
|
||||
// data:
|
||||
//
|
||||
// {{ .Files.Glob("secrets/*").AsSecrets() | indent 4 }}
|
||||
func (f files) AsSecrets() string {
|
||||
if f == nil {
|
||||
return ""
|
||||
@@ -155,6 +157,9 @@ func (f files) Lines(path string) []string {
|
||||
if f == nil || f[path] == nil {
|
||||
return []string{}
|
||||
}
|
||||
|
||||
return strings.Split(string(f[path]), "\n")
|
||||
s := string(f[path])
|
||||
if s[len(s)-1] == '\n' {
|
||||
s = s[:len(s)-1]
|
||||
}
|
||||
return strings.Split(s, "\n")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user