Merge pull request #306 from rawmind0/clusterupgrade

Fixed rancher timeout on bootstrapping and added monitoring version on rancher2_cluster

Author: rawmind0

CHANGELOG.md

@@ -1,4 +1,17 @@
-## 1.9.0 (Unreleased)
+## 1.8.3 (Unreleased)
+
+FEATURES:
+
+
+
+ENHANCEMENTS:
+
+* Added `version` argument to `cluster_monitoring_input` argument on `rancher2_cluster` and `rancher2_project` resources
+
+BUG FIXES:
+
+* Fixed rancher timeout on bootstrapping
+
 ## 1.8.2 (April 02, 2020)
 
 FEATURES:

rancher2/config.go

@@ -19,6 +19,7 @@ import (
 const (
 	rancher2ReadyAnswer               = "pong"
 	rancher2RetriesWait               = 5
+	rancher2RKEK8sSystemImageVersion  = "2.3.0"
 	rancher2NodeTemplateChangeVersion = "2.3.3"
 	rancher2NodeTemplateNewPrefix     = "cattle-global-nt:nt-"
 )
@@ -53,12 +54,14 @@ func (c *Config) GetRancherVersion() (string, error) {
 		return c.RancherVersion, nil
 	}
 
-	client, err := c.ManagementClient()
-	if err != nil {
-		return "", fmt.Errorf("[ERROR] Getting Rancher version: %s", err)
+	if c.Client.Management == nil {
+		_, err := c.ManagementClient()
+		if err != nil {
+			return "", err
+		}
 	}
 
-	version, err := client.Setting.ByID("server-version")
+	version, err := c.Client.Management.Setting.ByID("server-version")
 	if err != nil {
 		return "", fmt.Errorf("[ERROR] Getting Rancher version: %s", err)
 	}
@@ -69,27 +72,35 @@ func (c *Config) GetRancherVersion() (string, error) {
 
 func (c *Config) isRancherReady() error {
 	var err error
+	var resp []byte
 	url := RootURL(c.URL) + "/ping"
 	for i := 0; i <= c.Retries; i++ {
-		resp, err := DoGet(url, "", "", c.CACerts, c.Insecure)
+		resp, err = DoGet(url, "", "", c.CACerts, c.Insecure)
 		if err == nil && rancher2ReadyAnswer == string(resp) {
 			return nil
 		}
 		time.Sleep(rancher2RetriesWait * time.Second)
 	}
-	return fmt.Errorf("Timeout, Rancher is not ready: %v", err)
+	return fmt.Errorf("Rancher is not ready: %v", err)
 }
 
 func (c *Config) getK8SDefaultVersion() (string, error) {
 	if len(c.K8SDefaultVersion) > 0 {
 		return c.K8SDefaultVersion, nil
 	}
 
-	k8sVer, err := c.GetSettingValue("k8s-version")
+	if c.Client.Management == nil {
+		_, err := c.ManagementClient()
+		if err != nil {
+			return "", err
+		}
+	}
+
+	k8sVer, err := c.Client.Management.Setting.ByID("k8s-version")
 	if err != nil {
 		return "", err
 	}
-	c.K8SDefaultVersion = k8sVer
+	c.K8SDefaultVersion = k8sVer.Value
 	return c.K8SDefaultVersion, nil
 }
 
@@ -98,12 +109,18 @@ func (c *Config) getK8SVersions() ([]string, error) {
 		return c.K8SSupportedVersions, nil
 	}
 
-	client, err := c.ManagementClient()
-	if err != nil {
-		return nil, fmt.Errorf("[ERROR] Getting K8s versions: %s", err)
+	if c.Client.Management == nil {
+		_, err := c.ManagementClient()
+		if err != nil {
+			return nil, err
+		}
 	}
 
-	RKEK8sSystemImageCollection, err := client.RKEK8sSystemImage.ListAll(NewListOpts(nil))
+	if ok, _ := c.IsRancherVersionLessThan(rancher2RKEK8sSystemImageVersion); ok {
+		return nil, nil
+	}
+
+	RKEK8sSystemImageCollection, err := c.Client.Management.RKEK8sSystemImage.ListAll(NewListOpts(nil))
 	if err != nil {
 		return nil, fmt.Errorf("[ERROR] Listing RKE K8s System Images: %s", err)
 	}
@@ -197,6 +214,11 @@ func (c *Config) ManagementClient() (*managementClient.Client, error) {
 		return c.Client.Management, nil
 	}
 
+	err := c.isRancherReady()
+	if err != nil {
+		return nil, err
+	}
+
 	// Setup the management client
 	options := c.CreateClientOpts()
 	mClient, err := managementClient.NewClient(options)
@@ -205,6 +227,15 @@ func (c *Config) ManagementClient() (*managementClient.Client, error) {
 	}
 	c.Client.Management = mClient
 
+	rancher2ClusterRKEK8SDefaultVersion, err = c.getK8SDefaultVersion()
+	if err != nil {
+		return nil, err
+	}
+	rancher2ClusterRKEK8SVersions, err = c.getK8SVersions()
+	if err != nil {
+		return nil, err
+	}
+
 	return c.Client.Management, nil
 }
 
@@ -221,6 +252,11 @@ func (c *Config) ClusterClient(id string) (*clusterClient.Client, error) {
 		return c.Client.Cluster, nil
 	}
 
+	err := c.isRancherReady()
+	if err != nil {
+		return nil, err
+	}
+
 	// Setup the cluster client
 	options := c.CreateClientOpts()
 	options.URL = options.URL + "/clusters/" + id
@@ -247,6 +283,11 @@ func (c *Config) ProjectClient(id string) (*projectClient.Client, error) {
 		return c.Client.Project, nil
 	}
 
+	err := c.isRancherReady()
+	if err != nil {
+		return nil, err
+	}
+
 	// Setup the project client
 	options := c.CreateClientOpts()
 	options.URL = options.URL + "/projects/" + id

rancher2/provider.go

@@ -85,7 +85,7 @@ func Provider() terraform.ResourceProvider {
 				Optional:     true,
 				Default:      5,
 				Description:  descriptions["retries"],
-				ValidateFunc: validation.IntBetween(1, 100),
+				ValidateFunc: validation.IntBetween(1, 1000),
 			},
 		},
 
@@ -218,13 +218,6 @@ func providerValidateConfig(config *Config) (*Config, error) {
 	}
 
 	config.URL = NormalizeURL(config.URL)
-
-	if len(config.URL) > 0 {
-		err := config.isRancherReady()
-		if err != nil {
-			return &Config{}, err
-		}
-	}
 	if config.Bootstrap {
 		// If bootstrap tokenkey accesskey nor secretkey can be provided
 		if config.TokenKey != providerDefaultEmptyString {
@@ -235,17 +228,6 @@ func providerValidateConfig(config *Config) (*Config, error) {
 		if config.TokenKey == providerDefaultEmptyString {
 			return &Config{}, fmt.Errorf("[ERROR] No token_key nor access_key and secret_key are provided")
 		}
-		if len(config.URL) > 0 {
-			var err error
-			rancher2ClusterRKEK8SDefaultVersion, err = config.getK8SDefaultVersion()
-			if err != nil {
-				return &Config{}, err
-			}
-			rancher2ClusterRKEK8SVersions, err = config.getK8SVersions()
-			if err != nil {
-				return &Config{}, err
-			}
-		}
 	}
 
 	return config, nil

rancher2/resource_rancher2_cluster.go

@@ -142,6 +142,7 @@ func resourceRancher2ClusterRead(d *schema.ResourceData, meta interface{}) error
 
 		if monitoringOutput != nil && len(monitoringOutput.Answers) > 0 {
 			monitoringInput.Answers = monitoringOutput.Answers
+			monitoringInput.Version = monitoringOutput.Version
 		}
 	}
 

rancher2/resource_rancher2_project.go

@@ -128,6 +128,7 @@ func resourceRancher2ProjectRead(d *schema.ResourceData, meta interface{}) error
 
 		if monitoringOutput != nil && len(monitoringOutput.Answers) > 0 {
 			monitoringInput.Answers = monitoringOutput.Answers
+			monitoringInput.Version = monitoringOutput.Version
 		}
 	}
 

rancher2/schema_monitoring_input.go

@@ -13,6 +13,11 @@ func monitoringInputFields() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Answers for monitor input",
 		},
+		"version": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Monitoring version",
+		},
 	}
 
 	return s

rancher2/schema_scheduled_cluster_scan.go

@@ -45,7 +45,6 @@ func scheduledClusterScanFields() map[string]*schema.Schema {
 		"enabled": {
 			Type:        schema.TypeBool,
 			Optional:    true,
-			Default:     false,
 			Description: "Enable scheduled cluster scan",
 		},
 		"scan_config": {

rancher2/structure_monitoring_input.go

@@ -17,6 +17,10 @@ func flattenMonitoringInput(in *managementClient.MonitoringInput) []interface{}
 		obj["answers"] = toMapInterface(in.Answers)
 	}
 
+	if len(in.Version) > 0 {
+		obj["version"] = in.Version
+	}
+
 	return []interface{}{obj}
 }
 
@@ -33,5 +37,9 @@ func expandMonitoringInput(p []interface{}) *managementClient.MonitoringInput {
 		obj.Answers = toMapString(v)
 	}
 
+	if v, ok := in["version"].(string); ok && len(v) > 0 {
+		obj.Version = v
+	}
+
 	return obj
 }

website/docs/index.html.markdown

@@ -21,8 +21,8 @@ The provider can be configured in 2 modes:
 # Configure the Rancher2 provider to admin
 provider "rancher2" {
   api_url    = "https://rancher.my-domain.com"
-  access_key = "${var.rancher2_access_key}"
-  secret_key = "${var.rancher2_secret_key}"
+  access_key = var.rancher2_access_key
+  secret_key = var.rancher2_secret_key
 }
 ```
 
@@ -56,8 +56,8 @@ resource "rancher2_bootstrap" "admin" {
 provider "rancher2" {
   alias = "admin"
 
-  api_url = "${rancher2_bootstrap.admin.url}"
-  token_key = "${rancher2_bootstrap.admin.token}"
+  api_url = rancher2_bootstrap.admin.url
+  token_key = rancher2_bootstrap.admin.token
   insecure = true
 }
 

website/docs/r/cluster.html.markdown

@@ -96,6 +96,7 @@ resource "rancher2_cluster" "foo-custom" {
       "prometheus.resources.core.requests.memory" = "750Mi"
       "prometheus.retention" = "12h"
     }
+    version = "0.1.0"
   }
 }
 ```
@@ -955,6 +956,7 @@ The following arguments are supported:
 #### Arguments
 
 * `answers` - (Optional/Computed) Key/value answers for monitor input (map)
+* `version` - (Optional) rancher-monitoring chart version (string)
 
 ### `cluster_template_answers`