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

honor kubernetes_version setting

Browse Source
This commit is contained in:
Jason Greathouse
2019-01-24 13:20:22 -06:00
committed by Alena Prokharchyk
parent dad34d4da2
commit a64e8f64fb
4 changed files with 78 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cluster/defaults.go
View File

@@ -11,6 +11,7 @@ import (
"github.com/rancher/rke/log"
"github.com/rancher/rke/services"
"github.com/rancher/rke/templates"
"github.com/rancher/rke/util"
"github.com/rancher/types/apis/management.cattle.io/v3"
)
@@ -75,7 +76,7 @@ func setDefaultIfEmpty(varName *string, defaultValue string) {
}
}
func (c *Cluster) setClusterDefaults(ctx context.Context) {
func (c *Cluster) setClusterDefaults(ctx context.Context) error {
if len(c.SSHKeyPath) == 0 {
c.SSHKeyPath = DefaultClusterSSHKeyPath
}
@@ -144,10 +145,15 @@ func (c *Cluster) setClusterDefaults(ctx context.Context) {
}
c.PrivateRegistriesMap[pr.URL] = pr
}
c.setClusterImageDefaults()
err := c.setClusterImageDefaults()
if err != nil {
return err
}
c.setClusterServicesDefaults()
c.setClusterNetworkDefaults()
c.setClusterAuthnDefaults()
return nil
}
func (c *Cluster) setClusterServicesDefaults() {
@@ -200,13 +206,17 @@ func (c *Cluster) setClusterServicesDefaults() {
}
}
func (c *Cluster) setClusterImageDefaults() {
func (c *Cluster) setClusterImageDefaults() error {
var privRegURL string
imageDefaults, ok := v3.K8sVersionToRKESystemImages[c.Version]
if !ok {
imageDefaults = v3.K8sVersionToRKESystemImages[DefaultK8sVersion]
// Version Check
err := util.ValidateVersion(c.Version)
if err != nil {
return err
}
imageDefaults := v3.AllK8sVersions[c.Version]
for _, privReg := range c.PrivateRegistries {
if privReg.IsDefault {
privRegURL = privReg.URL
@@ -243,6 +253,8 @@ func (c *Cluster) setClusterImageDefaults() {
for k, v := range systemImagesDefaultsMap {
setDefaultIfEmpty(k, v)
}
return nil
}
func (c *Cluster) setClusterNetworkDefaults() {