rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-04-27 19:25:44 +00:00
Code Issues Releases Wiki Activity

remove support for default versioned templates

Browse Source
This commit is contained in:
kinarashah 2019-08-13 13:34:49 -07:00 committed by Alena Prokharchyk
parent 44e6adda29
commit 734c651f16
7 changed files with 35 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/coredns.go
View File

@ -1,10 +0,0 @@
package addons
import (
rkeData "github.com/rancher/kontainer-driver-metadata/rke/templates"
"github.com/rancher/rke/templates"
)
func GetCoreDNSManifest(CoreDNSConfig interface{}, data map[string]interface{}) (string, error) {
return templates.CompileTemplateFromMap(templates.GetDefaultVersionedTemplate(rkeData.CoreDNS, data), CoreDNSConfig)
}

10
addons/ingress.go
View File

@ -1,10 +0,0 @@
package addons
import (
rkeData "github.com/rancher/kontainer-driver-metadata/rke/templates"
"github.com/rancher/rke/templates"
)
func GetNginxIngressManifest(IngressConfig interface{}, data map[string]interface{}) (string, error) {
return templates.CompileTemplateFromMap(templates.GetDefaultVersionedTemplate(rkeData.NginxIngress, data), IngressConfig)
}

10
addons/kubedns.go
View File

@ -1,10 +0,0 @@
package addons
import (
rkeData "github.com/rancher/kontainer-driver-metadata/rke/templates"
"github.com/rancher/rke/templates"
)
func GetKubeDNSManifest(KubeDNSConfig interface{}, data map[string]interface{}) (string, error) {
return templates.CompileTemplateFromMap(templates.GetDefaultVersionedTemplate(rkeData.KubeDNS, data), KubeDNSConfig)
}

11
addons/metrics.go
View File

@ -1,11 +0,0 @@
package addons
import (
rkeData "github.com/rancher/kontainer-driver-metadata/rke/templates"
"github.com/rancher/rke/templates"
)
func GetMetricsServerManifest(MetricsServerConfig interface{}, data map[string]interface{}) (string, error) {
return templates.CompileTemplateFromMap(templates.GetDefaultVersionedTemplate(rkeData.MetricsServer, data), MetricsServerConfig)
}

27
cluster/addons.go
View File

@ -4,6 +4,8 @@ import (
"bytes"
"context"
"fmt"
rkeData "github.com/rancher/kontainer-driver-metadata/rke/templates"
"github.com/rancher/rke/templates"
"os"
"os/exec"
"time"
@ -263,7 +265,11 @@ func (c *Cluster) deployKubeDNS(ctx context.Context, data map[string]interface{}
StubDomains: c.DNS.StubDomains,
NodeSelector: c.DNS.NodeSelector,
}
kubeDNSYaml, err := addons.GetKubeDNSManifest(KubeDNSConfig, data)
tmplt, err := templates.GetVersionedTemplates(rkeData.KubeDNS, data, c.Version)
if err != nil {
return err
}
kubeDNSYaml, err := templates.CompileTemplateFromMap(tmplt, KubeDNSConfig)
if err != nil {
return err
}
@ -286,7 +292,11 @@ func (c *Cluster) deployCoreDNS(ctx context.Context, data map[string]interface{}
ReverseCIDRs: c.DNS.ReverseCIDRs,
NodeSelector: c.DNS.NodeSelector,
}
coreDNSYaml, err := addons.GetCoreDNSManifest(CoreDNSConfig, data)
tmplt, err := templates.GetVersionedTemplates(rkeData.CoreDNS, data, c.Version)
if err != nil {
return err
}
coreDNSYaml, err := templates.CompileTemplateFromMap(tmplt, CoreDNSConfig)
if err != nil {
return err
}
@ -325,7 +335,11 @@ func (c *Cluster) deployMetricServer(ctx context.Context, data map[string]interf
Options: c.Monitoring.Options,
Version: util.GetTagMajorVersion(versionTag),
}
metricsYaml, err := addons.GetMetricsServerManifest(MetricsServerConfig, data)
tmplt, err := templates.GetVersionedTemplates(rkeData.MetricsServer, data, c.Version)
if err != nil {
return err
}
metricsYaml, err := templates.CompileTemplateFromMap(tmplt, MetricsServerConfig)
if err != nil {
return err
}
@ -483,9 +497,12 @@ func (c *Cluster) deployIngress(ctx context.Context, data map[string]interface{}
ingressConfig.AlpineImage = c.SystemImages.Alpine
}
}
tmplt, err := templates.GetVersionedTemplates(rkeData.NginxIngress, data, c.Version)
if err != nil {
return err
}
// Currently only deploying nginx ingress controller
ingressYaml, err := addons.GetNginxIngressManifest(ingressConfig, data)
ingressYaml, err := templates.CompileTemplateFromMap(tmplt, ingressConfig)
if err != nil {
return err
}

14
cluster/network.go
View File

@ -249,14 +249,12 @@ func (c *Cluster) doWeaveDeploy(ctx context.Context, data map[string]interface{}
func (c *Cluster) getNetworkPluginManifest(pluginConfig, data map[string]interface{}) (string, error) {
switch c.Network.Plugin {
case FlannelNetworkPlugin:
return templates.CompileTemplateFromMap(templates.GetVersionedTemplates(FlannelNetworkPlugin, data, c.Version), pluginConfig)
case CalicoNetworkPlugin:
return templates.CompileTemplateFromMap(templates.GetVersionedTemplates(CalicoNetworkPlugin, data, c.Version), pluginConfig)
case CanalNetworkPlugin:
return templates.CompileTemplateFromMap(templates.GetVersionedTemplates(CanalNetworkPlugin, data, c.Version), pluginConfig)
case WeaveNetworkPlugin:
return templates.CompileTemplateFromMap(templates.GetVersionedTemplates(WeaveNetworkPlugin, data, c.Version), pluginConfig)
case CanalNetworkPlugin, FlannelNetworkPlugin, CalicoNetworkPlugin, WeaveNetworkPlugin:
tmplt, err := templates.GetVersionedTemplates(c.Network.Plugin, data, c.Version)
if err != nil {
return "", err
}
return templates.CompileTemplateFromMap(tmplt, pluginConfig)
default:
return "", fmt.Errorf("[network] Unsupported network plugin: %s", c.Network.Plugin)
}

25
templates/templates.go
View File

@ -3,6 +3,7 @@ package templates
import (
"bytes"
"encoding/json"
"fmt"
"github.com/blang/semver"
"github.com/rancher/kontainer-driver-metadata/rke/templates"
"github.com/sirupsen/logrus"
@ -21,9 +22,9 @@ func CompileTemplateFromMap(tmplt string, configMap interface{}) (string, error)
return out.String(), nil
}
func GetVersionedTemplates(templateName string, data map[string]interface{}, k8sVersion string) string {
func GetVersionedTemplates(templateName string, data map[string]interface{}, k8sVersion string) (string, error) {
if template, ok := data[templateName]; ok {
return convert.ToString(template)
return convert.ToString(template), nil
}
return getTemplate(templateName, k8sVersion)
}
@ -33,33 +34,21 @@ func GetKubednsStubDomains(stubDomains map[string][]string) string {
return string(json)
}
func GetDefaultVersionedTemplate(templateName string, data map[string]interface{}) string {
if template, ok := data[templateName]; ok {
return convert.ToString(template)
}
versionData := metadata.K8sVersionToTemplates[templateName]
return metadata.K8sVersionToTemplates[templates.TemplateKeys][versionData["default"]]
}
func getTemplate(templateName, k8sVersion string) string {
func getTemplate(templateName, k8sVersion string) (string, error) {
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"]]
return "", fmt.Errorf("k8sVersion not sem-ver %s %v", k8sVersion, err)
}
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[k]], nil
}
}
return metadata.K8sVersionToTemplates[templates.TemplateKeys][versionData["default"]]
return "", fmt.Errorf("no %s template found for k8sVersion %s", templateName, k8sVersion)
}