Merge pull request #294 from rawmind0/fix

Fix bootstrap

Author: rawmind0

CHANGELOG.md

@@ -1,4 +1,17 @@
-## 1.9.0 (Unreleased)
+## 1.8.1 (Unreleased)
+
+FEATURES:
+
+
+
+ENHANCEMENTS:
+
+
+
+BUG FIXES:
+
+* Fix init provider if api_url is dependent of infra that is not yet deployed
+
 ## 1.8.0 (March 31, 2020)
 
 FEATURES:

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/hashicorp/go-version v1.2.0
 	github.com/hashicorp/terraform-plugin-sdk v1.7.0
 	github.com/rancher/norman v0.0.0-20200321231028-b5f2e33b54fa
+	github.com/rancher/rke v1.1.0
 	github.com/rancher/types v0.0.0-20200326224903-b4612bd96d9b
 	golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708
 	gopkg.in/yaml.v2 v2.2.5

go.sum

@@ -132,6 +132,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)
@@ -162,6 +167,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
@@ -188,6 +198,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/config.go

@@ -13,8 +13,7 @@ const (
 )
 
 var (
-	descriptions                        map[string]string
-	rancher2ClusterRKEK8SDefaultVersion string
+	descriptions map[string]string
 )
 
 // CLIConfig used to store data from file.
@@ -227,16 +226,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")
 		}
-		k8sVer, err := config.getK8SVersion()
-		if err != nil {
-			return &Config{}, fmt.Errorf("[ERROR] Getting default RKE K8S version: %v", err)
-		}
-		rancher2ClusterRKEK8SDefaultVersion = k8sVer
-	}
-
-	err := config.isRancherReady()
-	if err != nil {
-		return &Config{}, err
 	}
 
 	return config, nil

rancher2/provider.go

@@ -1,7 +1,13 @@
 package rancher2
 
 import (
+	"context"
+	"sort"
+
+	"github.com/hashicorp/go-version"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
+	"github.com/rancher/rke/metadata"
 )
 
 const (
@@ -102,6 +108,24 @@ func clusterRKEConfigFields() map[string]*schema.Schema {
 			Optional:    true,
 			Computed:    true,
 			Description: "Optional kubernetes version to deploy",
+			ValidateFunc: validation.StringInSlice(func() []string {
+				metadata.InitMetadata(context.Background())
+				versions := make([]*version.Version, 0, len(metadata.K8sVersionToRKESystemImages))
+				for k := range metadata.K8sVersionToRKESystemImages {
+					v, _ := version.NewVersion(k)
+					versions = append(versions, v)
+				}
+				sort.Sort(sort.Reverse(version.Collection(versions)))
+				keys := make([]string, len(versions))
+				for i := range versions {
+					keys[i] = "v" + versions[i].String()
+				}
+				return keys
+			}(), false),
+			DefaultFunc: func() (interface{}, error) {
+				metadata.InitMetadata(context.Background())
+				return metadata.DefaultK8sVersion, nil
+			},
 		},
 		"monitoring": {
 			Type:        schema.TypeList,

rancher2/schema_cluster_rke_config.go

@@ -236,7 +236,6 @@ func expandClusterRKEConfig(p []interface{}, name string) (*managementClient.Ran
 		obj.Ingress = ingress
 	}
 
-	obj.Version = rancher2ClusterRKEK8SDefaultVersion
 	if v, ok := in["kubernetes_version"].(string); ok && len(v) > 0 {
 		obj.Version = v
 	}