rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-02 15:34:36 +00:00
Code Issues Releases Wiki Activity

Format user addon YAML before concat

Browse Source
This commit is contained in:
Sebastiaan van Steenis
2019-06-11 14:18:35 +02:00
committed by Alena Prokharchyk
parent 1a1080a234
commit ae44a9510f
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
cluster/addons.go
View File

@@ -157,16 +157,18 @@ func (c *Cluster) deployAddonsInclude(ctx context.Context) error {
log.Infof(ctx, "[addons] Adding addon from url %s", addon) log.Infof(ctx, "[addons] Adding addon from url %s", addon)
logrus.Debugf("URL Yaml: %s", addonYAML) logrus.Debugf("URL Yaml: %s", addonYAML)
// make sure we properly separated manifests
addonYAMLStr := string(addonYAML)
formattedAddonYAML := formatAddonYAML(addonYAMLStr)
addonYAML = []byte(formattedAddonYAML)
logrus.Debugf("Formatted Yaml: %s", addonYAML)
if err := validateUserAddonYAML(addonYAML); err != nil { if err := validateUserAddonYAML(addonYAML); err != nil {
return err return err
} }
// Put 3 dashes (---) at beginning of next YAML if it is not there already so we can append to manifests
dashes := "---\n"
if !strings.HasPrefix(string(addonYAML[:]), dashes) {
addonYAML = append([]byte(dashes), addonYAML...)
}
manifests = append(manifests, addonYAML...) manifests = append(manifests, addonYAML...)
} else if isFilePath(addon) { } else if isFilePath(addon) {
addonYAML, err := ioutil.ReadFile(addon) addonYAML, err := ioutil.ReadFile(addon)
@@ -178,9 +180,12 @@ func (c *Cluster) deployAddonsInclude(ctx context.Context) error {
// make sure we properly separated manifests // make sure we properly separated manifests
addonYAMLStr := string(addonYAML) addonYAMLStr := string(addonYAML)
if !strings.HasPrefix(addonYAMLStr, "---") {
addonYAML = []byte(fmt.Sprintf("%s\n%s", "---", addonYAMLStr)) formattedAddonYAML := formatAddonYAML(addonYAMLStr)
}
addonYAML = []byte(formattedAddonYAML)
logrus.Debugf("Formatted Yaml: %s", addonYAML)
if err := validateUserAddonYAML(addonYAML); err != nil { if err := validateUserAddonYAML(addonYAML); err != nil {
return err return err
} }
@@ -195,6 +200,19 @@ func (c *Cluster) deployAddonsInclude(ctx context.Context) error {
return c.doAddonDeploy(ctx, string(manifests), UserAddonsIncludeResourceName, false) return c.doAddonDeploy(ctx, string(manifests), UserAddonsIncludeResourceName, false)
} }
func formatAddonYAML(addonYAMLStr string) string {
if !strings.HasPrefix(addonYAMLStr, "---") {
logrus.Debug("Yaml does not start with dashes")
addonYAMLStr = fmt.Sprintf("%s\n%s", "---", addonYAMLStr)
}
if !strings.HasSuffix(addonYAMLStr, "\n") {
logrus.Debug("Yaml does not end with newline")
addonYAMLStr = fmt.Sprintf("%s\n", addonYAMLStr)
}
return addonYAMLStr
}
func validateUserAddonYAML(addon []byte) error { func validateUserAddonYAML(addon []byte) error {
yamlContents := make(map[string]interface{}) yamlContents := make(map[string]interface{})