rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-06-27 15:59:37 +00:00
Code Issues Releases Wiki Activity

update logic to read addon templates from metadata

Browse Source
This commit is contained in:
kinarashah 2019-08-02 11:28:09 -07:00 committed by Alena Prokharchyk
parent 06e87ebabb
commit 44e6adda29
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/kubedns.go
View File

@ -6,6 +6,5 @@ import (
) )
func GetKubeDNSManifest(KubeDNSConfig interface{}, data map[string]interface{}) (string, error) { func GetKubeDNSManifest(KubeDNSConfig interface{}, data map[string]interface{}) (string, error) {
return templates.CompileTemplateFromMap(templates.GetDefaultVersionedTemplate(rkeData.KubeDNS, data), KubeDNSConfig) return templates.CompileTemplateFromMap(templates.GetDefaultVersionedTemplate(rkeData.KubeDNS, data), KubeDNSConfig)
} }

37
templates/templates.go
View File

@ -3,12 +3,13 @@ package templates
import ( import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"github.com/blang/semver"
"github.com/rancher/kontainer-driver-metadata/rke/templates"
"github.com/sirupsen/logrus"
"text/template" "text/template"
"github.com/rancher/norman/types/convert" "github.com/rancher/norman/types/convert"
"github.com/rancher/rke/metadata" "github.com/rancher/rke/metadata"
"github.com/rancher/rke/util"
) )
func CompileTemplateFromMap(tmplt string, configMap interface{}) (string, error) { func CompileTemplateFromMap(tmplt string, configMap interface{}) (string, error) {
@ -24,11 +25,7 @@ func GetVersionedTemplates(templateName string, data map[string]interface{}, k8s
if template, ok := data[templateName]; ok { if template, ok := data[templateName]; ok {
return convert.ToString(template) return convert.ToString(template)
} }
versionedTemplate := metadata.K8sVersionToTemplates[templateName] return getTemplate(templateName, k8sVersion)
if t, ok := versionedTemplate[util.GetTagMajorVersion(k8sVersion)]; ok {
return t
}
return versionedTemplate["default"]
} }
func GetKubednsStubDomains(stubDomains map[string][]string) string { func GetKubednsStubDomains(stubDomains map[string][]string) string {
@ -40,5 +37,29 @@ func GetDefaultVersionedTemplate(templateName string, data map[string]interface{
if template, ok := data[templateName]; ok { if template, ok := data[templateName]; ok {
return convert.ToString(template) return convert.ToString(template)
} }
return metadata.K8sVersionToTemplates[templateName]["default"] versionData := metadata.K8sVersionToTemplates[templateName]
return metadata.K8sVersionToTemplates[templates.TemplateKeys][versionData["default"]]
}
func getTemplate(templateName, k8sVersion string) string {
versionData := metadata.K8sVersionToTemplates[templateName]
toMatch, err := semver.Make(k8sVersion[1:])
if err != nil {
logrus.Errorf("k8sVersion not sem-ver %s %v", k8sVersion, err)
return metadata.K8sVersionToTemplates[templates.TemplateKeys][versionData["default"]]
}
for k := range versionData {
if k == "default" {
continue
}
testRange, err := semver.ParseRange(k)
if err != nil {
logrus.Errorf("range for %s not sem-ver %v %v", templateName, testRange, err)
continue
}
if testRange(toMatch) {
return metadata.K8sVersionToTemplates[templates.TemplateKeys][versionData[k]]
}
}
return metadata.K8sVersionToTemplates[templates.TemplateKeys][versionData["default"]]
} }