Merge pull request #166 from joyent/1.0.1-pre1

kusor · web-flow · commit 160bb76e90e4 · 2020-12-22T18:57:03.000+01:00
Update to k8s v1.18.12
diff --git a/cmd/version.go b/cmd/version.go
@@ -21,6 +21,6 @@ var versionCmd = &cobra.Command{
 			fmt.Print("no version set for this build... ")
 			cliVersion = "local"
 		}
-		fmt.Printf("triton-kubernetes 1.0.0-pre1 (%s)\n", cliVersion)
+		fmt.Printf("triton-kubernetes 1.0.1-pre1 (%s)\n", cliVersion)
 	},
 }
diff --git a/cmd/version_test.go b/cmd/version_test.go
@@ -15,7 +15,7 @@ func TestVersion(t *testing.T) {
 		versionCmd.Run(versionCmd, []string{})
 	})
 
-	expected := "triton-kubernetes 1.0.0-pre1 (beta)\n"
+	expected := "triton-kubernetes 1.0.1-pre1 (beta)\n"
 
 	select {
 	case err := <-errch:
diff --git a/create/cluster.go b/create/cluster.go
@@ -371,9 +371,10 @@ func getBaseClusterTerraformConfig(terraformModulePath string) (baseClusterTerra
 			{"v1.12.6", "v1.12.6-rancher1-1"},
 			{"v1.13.4", "v1.13.4-rancher1-1"},
 			{"v1.14.9", "v1.14.9-rancher1-1"},
-			{"v1.15.12", "v1.15.12-rancher1-1"},
-			{"v1.16.10", "v1.16.10-rancher2-1"},
-			{"v1.17.6", "v1.17.6-rancher2-1"},
+			{"v1.15.12", "v1.15.12-rancher2-7"},
+			{"v1.16.15", "v1.16.15-rancher1-3"},
+			{"v1.17.14", "v1.17.14-rancher1-2"},
+			{"v1.18.12", "v1.18.12-rancher1-1"},
 		}
 		prompt := promptui.Select{
 			Label: "Kubernetes Version",
diff --git a/docs/guide/silent-install-yaml.md b/docs/guide/silent-install-yaml.md
@@ -38,7 +38,7 @@ YAML parameters for cluster are:
 | `cluster_manager` | Which cluster manager should manage this new cluster that is going to be created. |
 | `cluster_cloud_provider` | Which cloud should the cluster run on. Options are `triton`, `aws`, `gcp`, or `azure`. |
 | `name` | Cluster name |
-| `k8s_version` | Version of Kubernetes to deploy for this cluster. Available versions are: `v2.8.11-rancher2-1`, `v1.9.7-rancher2-2`, `v1.10.3-rancher2-1`, `v1.11.8-rancher1-1`, `v1.12.6-rancher1-1`, `v1.13.4-rancher1-1`, `v1.14.9-rancher1-1`, `v1.15.12-rancher1-1`, `v1.16.10-rancher2-1` and `v1.17.6-rancher-2-1` (default). |
+| `k8s_version` | Version of Kubernetes to deploy for this cluster. Available versions are: `v2.8.11-rancher2-1`, `v1.9.7-rancher2-2`, `v1.10.3-rancher2-1`, `v1.11.8-rancher1-1`, `v1.12.6-rancher1-1`, `v1.13.4-rancher1-1`, `v1.14.9-rancher1-1`, `v1.15.12-rancher1-1`, `v1.16.15-rancher1-3`, `v1.17.14-rancher-1-2`, `v1.18.12-rancher1-1` (default). |
 | `k8s_network_provider` | Network stack to use for this Kubernetes cluster. Available options are: `calico` and `flannel`. |
 | `private_registry` | URL of the private registry that includes rancher containers |
 | `private_registry_username` | Username for the private registry |
diff --git a/examples/silent-install/triton/cluster-triton-ha.yaml b/examples/silent-install/triton/cluster-triton-ha.yaml
@@ -3,7 +3,7 @@ cluster_manager: manager-on-triton
 backend_provider: local
 name: triton-ha
 cluster_cloud_provider: triton
-k8s_version: v1.17.6-rancher2-1
+k8s_version: v1.18.12-rancher1-1
 k8s_network_provider: flannel
 private_registry: ""
 private_registry_username: ""
diff --git a/terraform/modules/aws-rancher-k8s-host/variables.tf b/terraform/modules/aws-rancher-k8s-host/variables.tf
@@ -18,7 +18,7 @@ variable "rancher_host_labels" {
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.4.4"
+  default     = "rancher/rancher-agent:v2.4.11"
   description = "The Rancher Agent image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
@@ -56,6 +56,7 @@ variable "aws_region" {
 
 variable "aws_ami_id" {
   description = "Base AMI to launch the instances with"
+  # default="ami-08a099fcfc36dff3f"
 }
 
 variable "aws_instance_type" {
diff --git a/terraform/modules/aws-rancher-k8s/variables.tf b/terraform/modules/aws-rancher-k8s/variables.tf
@@ -15,7 +15,7 @@ variable "rancher_secret_key" {
 }
 
 variable "k8s_version" {
-  default = "v1.17.6-rancher2-1"
+  default = "v1.18.12-rancher1-1"
 }
 
 variable "k8s_network_provider" {
@@ -76,7 +76,8 @@ variable "aws_subnet_cidr" {
 
 variable "aws_ami_id" {
   description = "Base AMI to launch the instances with"
-  default     = ""
+  # default="ami-08a099fcfc36dff3f"
+  default = ""
 }
 
 variable "aws_public_key_path" {
diff --git a/terraform/modules/aws-rancher/variables.tf b/terraform/modules/aws-rancher/variables.tf
@@ -12,12 +12,12 @@ variable "docker_engine_install_url" {
 }
 
 variable "rancher_server_image" {
-  default     = "rancher/rancher:v2.4.4"
+  default     = "rancher/rancher:v2.4.11"
   description = "The Rancher Server image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.4.4"
+  default     = "rancher/rancher-agent:v2.4.11"
   description = "The Rancher Agent image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
diff --git a/terraform/modules/azure-rancher-k8s-host/variables.tf b/terraform/modules/azure-rancher-k8s-host/variables.tf
@@ -18,7 +18,7 @@ variable "rancher_host_labels" {
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.4.4"
+  default     = "rancher/rancher-agent:v2.4.11"
   description = "The Rancher Agent image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
diff --git a/terraform/modules/azure-rancher-k8s/variables.tf b/terraform/modules/azure-rancher-k8s/variables.tf
@@ -15,7 +15,7 @@ variable "rancher_secret_key" {
 }
 
 variable "k8s_version" {
-  default = "v1.17.6-rancher2-1"
+  default = "v1.18.12-rancher1-1"
 }
 
 variable "k8s_network_provider" {
diff --git a/terraform/modules/azure-rancher/variables.tf b/terraform/modules/azure-rancher/variables.tf
@@ -12,12 +12,12 @@ variable "docker_engine_install_url" {
 }
 
 variable "rancher_server_image" {
-  default     = "rancher/rancher:v2.4.4"
+  default     = "rancher/rancher:v2.4.11"
   description = "The Rancher Server image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.4.4"
+  default     = "rancher/rancher-agent:v2.4.11"
   description = "The Rancher Agent image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
diff --git a/terraform/modules/azure-rke/variables.tf b/terraform/modules/azure-rke/variables.tf
@@ -21,7 +21,7 @@ variable "rancher_server_image" {
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.4.4"
+  default     = "rancher/rancher-agent:v2.4.11"
   description = "The Rancher Agent image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
diff --git a/terraform/modules/bare-metal-rancher-k8s-host/variables.tf b/terraform/modules/bare-metal-rancher-k8s-host/variables.tf
@@ -18,7 +18,7 @@ variable "rancher_host_labels" {
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.4.4"
+  default     = "rancher/rancher-agent:v2.4.11"
   description = "The Rancher Agent image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
diff --git a/terraform/modules/bare-metal-rancher-k8s/variables.tf b/terraform/modules/bare-metal-rancher-k8s/variables.tf
@@ -15,7 +15,7 @@ variable "rancher_secret_key" {
 }
 
 variable "k8s_version" {
-  default = "v1.17.6-rancher2-1"
+  default = "v1.18.12-rancher1-1"
 }
 
 variable "k8s_network_provider" {
diff --git a/terraform/modules/bare-metal-rancher/variables.tf b/terraform/modules/bare-metal-rancher/variables.tf
@@ -12,12 +12,12 @@ variable "docker_engine_install_url" {
 }
 
 variable "rancher_server_image" {
-  default     = "rancher/rancher:v2.4.4"
+  default     = "rancher/rancher:v2.4.11"
   description = "The Rancher Server image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.4.4"
+  default     = "rancher/rancher-agent:v2.4.11"
   description = "The Rancher Agent image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
diff --git a/terraform/modules/gcp-rancher-k8s-host/variables.tf b/terraform/modules/gcp-rancher-k8s-host/variables.tf
@@ -18,7 +18,7 @@ variable "rancher_host_labels" {
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.4.4"
+  default     = "rancher/rancher-agent:v2.4.11"
   description = "The Rancher Agent image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
diff --git a/terraform/modules/gcp-rancher-k8s/variables.tf b/terraform/modules/gcp-rancher-k8s/variables.tf
@@ -15,7 +15,7 @@ variable "rancher_secret_key" {
 }
 
 variable "k8s_version" {
-  default = "v1.17.6-rancher2-1"
+  default = "v1.18.12-rancher1-1"
 }
 
 variable "k8s_network_provider" {
diff --git a/terraform/modules/gcp-rancher/variables.tf b/terraform/modules/gcp-rancher/variables.tf
@@ -12,12 +12,12 @@ variable "docker_engine_install_url" {
 }
 
 variable "rancher_server_image" {
-  default     = "rancher/rancher:v2.4.4"
+  default     = "rancher/rancher:v2.4.11"
   description = "The Rancher Server image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.4.4"
+  default     = "rancher/rancher-agent:v2.4.11"
   description = "The Rancher Agent image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
diff --git a/terraform/modules/triton-rancher-k8s-host/main.tf b/terraform/modules/triton-rancher-k8s-host/main.tf
@@ -1,6 +1,4 @@
 provider "triton" {
-  version = "~> 0.7.0"
-
   account      = var.triton_account
   key_material = file(var.triton_key_path)
   key_id       = var.triton_key_id
@@ -57,6 +55,6 @@ resource "triton_machine" "host" {
   affinity = ["role!=~${element(keys(var.rancher_host_labels), 0)}"]
 
   tags = {
-    role = "${element(keys(var.rancher_host_labels), 0)}"
+    role = element(keys(var.rancher_host_labels), 0)
   }
 }
diff --git a/terraform/modules/triton-rancher-k8s-host/variables.tf b/terraform/modules/triton-rancher-k8s-host/variables.tf
@@ -16,7 +16,7 @@ variable "rancher_host_labels" {
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.4.4"
+  default     = "rancher/rancher-agent:v2.4.11"
   description = "The Rancher Agent image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
diff --git a/terraform/modules/triton-rancher-k8s-host/versions.tf b/terraform/modules/triton-rancher-k8s-host/versions.tf
@@ -1,4 +1,10 @@
-
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+
+  required_providers {
+    triton = {
+      source = "joyent/triton"
+      version = "0.8.1"
+    }
+  }
 }
diff --git a/terraform/modules/triton-rancher-k8s/outputs.tf b/terraform/modules/triton-rancher-k8s/outputs.tf
@@ -1,11 +1,11 @@
 output "rancher_cluster_id" {
-  value = "${lookup(data.external.rancher_cluster.result, "cluster_id")}"
+  value = lookup(data.external.rancher_cluster.result, "cluster_id")
 }
 
 output "rancher_cluster_registration_token" {
-  value = "${lookup(data.external.rancher_cluster.result, "registration_token")}"
+  value = lookup(data.external.rancher_cluster.result, "registration_token")
 }
 
 output "rancher_cluster_ca_checksum" {
-  value = "${lookup(data.external.rancher_cluster.result, "ca_checksum")}"
-}
+  value = lookup(data.external.rancher_cluster.result, "ca_checksum")
+}
diff --git a/terraform/modules/triton-rancher-k8s/variables.tf b/terraform/modules/triton-rancher-k8s/variables.tf
@@ -15,7 +15,7 @@ variable "rancher_secret_key" {
 }
 
 variable k8s_version {
-  default = "v1.17.6-rancher2-1"
+  default = "v1.18.12-rancher1-1"
 }
 
 variable k8s_network_provider {
diff --git a/terraform/modules/triton-rancher-k8s/versions.tf b/terraform/modules/triton-rancher-k8s/versions.tf
@@ -1,4 +1,10 @@
-
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+
+  required_providers {
+    triton = {
+      source = "joyent/triton"
+      version = "0.8.1"
+    }
+  }
 }
diff --git a/terraform/modules/triton-rancher/main.tf b/terraform/modules/triton-rancher/main.tf
@@ -1,15 +1,13 @@
 provider "triton" {
-  version = "~> 0.7.0"
-
   account      = var.triton_account
   key_material = file(var.triton_key_path)
   key_id       = var.triton_key_id
   url          = var.triton_url
 }
 
 data "triton_network" "networks" {
-  count = "${length(var.triton_network_names)}"
-  name  = "${element(var.triton_network_names, count.index)}"
+  count = length(var.triton_network_names)
+  name  = element(var.triton_network_names, count.index)
 }
 
 data "triton_image" "image" {
@@ -83,7 +81,7 @@ resource "null_resource" "install_rancher_master" {
   }
 
   provisioner "remote-exec" {
-    inline = ["${data.template_file.install_rancher_master.rendered}"]
+    inline = [data.template_file.install_rancher_master.rendered]
   }
 }
 
@@ -115,7 +113,7 @@ resource "null_resource" "setup_rancher_k8s" {
   }
 
   provisioner "remote-exec" {
-    inline = ["${data.template_file.setup_rancher_k8s.rendered}"]
+    inline = [data.template_file.setup_rancher_k8s.rendered]
   }
 }
 
diff --git a/terraform/modules/triton-rancher/outputs.tf b/terraform/modules/triton-rancher/outputs.tf
@@ -3,9 +3,9 @@ output "rancher_url" {
 }
 
 output "rancher_access_key" {
-  value = "${lookup(data.external.rancher_server.result, "name")}"
+  value = lookup(data.external.rancher_server.result, "name")
 }
 
 output "rancher_secret_key" {
-  value = "${lookup(data.external.rancher_server.result, "token")}"
+  value = lookup(data.external.rancher_server.result, "token")
 }
diff --git a/terraform/modules/triton-rancher/variables.tf b/terraform/modules/triton-rancher/variables.tf
@@ -12,12 +12,12 @@ variable "docker_engine_install_url" {
 }
 
 variable "rancher_server_image" {
-  default     = "rancher/rancher:v2.4.4"
+  default     = "rancher/rancher:v2.4.11"
   description = "The Rancher Server image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.4.4"
+  default     = "rancher/rancher-agent:v2.4.11"
   description = "The Rancher Agent image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
diff --git a/terraform/modules/triton-rancher/versions.tf b/terraform/modules/triton-rancher/versions.tf
@@ -1,4 +1,11 @@
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+
+  required_providers {
+    triton = {
+      source = "joyent/triton"
+      version = "0.8.1"
+    }
+  }
 }
diff --git a/terraform/modules/vsphere-rancher-k8s-host/variables.tf b/terraform/modules/vsphere-rancher-k8s-host/variables.tf
@@ -18,7 +18,7 @@ variable "rancher_host_labels" {
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.4.4"
+  default     = "rancher/rancher-agent:v2.4.11"
   description = "The Rancher Agent image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
diff --git a/terraform/modules/vsphere-rancher-k8s/variables.tf b/terraform/modules/vsphere-rancher-k8s/variables.tf
@@ -45,7 +45,7 @@ variable "k8s_registry_password" {
 }
 
 variable "k8s_version" {
-  default = "v1.17.6-rancher2-1"
+  default = "v1.18.12-rancher1-1"
 }
 
 variable "k8s_network_provider" {

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ var versionCmd = &cobra.Command{`
`21`	`21`	`fmt.Print("no version set for this build... ")`
`22`	`22`	`cliVersion = "local"`
`23`	`23`	`}`
`24`		`- fmt.Printf("triton-kubernetes 1.0.0-pre1 (%s)\n", cliVersion)`
	`24`	`+ fmt.Printf("triton-kubernetes 1.0.1-pre1 (%s)\n", cliVersion)`
`25`	`25`	`},`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ variable "rancher_host_labels" {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`variable "rancher_agent_image" {`
`21`		`- default = "rancher/rancher-agent:v2.4.4"`
	`21`	`+ default = "rancher/rancher-agent:v2.4.11"`
`22`	`22`	`description = "The Rancher Agent image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."`
`23`	`23`	`}`
`24`	`24`
`@@ -56,6 +56,7 @@ variable "aws_region" {`
`56`	`56`
`57`	`57`	`variable "aws_ami_id" {`
`58`	`58`	`description = "Base AMI to launch the instances with"`
	`59`	`+ # default="ami-08a099fcfc36dff3f"`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`variable "aws_instance_type" {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ variable "rancher_secret_key" {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`variable "k8s_version" {`
`18`		`- default = "v1.17.6-rancher2-1"`
	`18`	`+ default = "v1.18.12-rancher1-1"`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`variable "k8s_network_provider" {`
`@@ -76,7 +76,8 @@ variable "aws_subnet_cidr" {`
`76`	`76`
`77`	`77`	`variable "aws_ami_id" {`
`78`	`78`	`description = "Base AMI to launch the instances with"`
`79`		`- default = ""`
	`79`	`+ # default="ami-08a099fcfc36dff3f"`
	`80`	`+ default = ""`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`variable "aws_public_key_path" {`
Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,12 @@ variable "docker_engine_install_url" {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`variable "rancher_server_image" {`
`15`		`- default = "rancher/rancher:v2.4.4"`
	`15`	`+ default = "rancher/rancher:v2.4.11"`
`16`	`16`	`description = "The Rancher Server image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`variable "rancher_agent_image" {`
`20`		`- default = "rancher/rancher-agent:v2.4.4"`
	`20`	`+ default = "rancher/rancher-agent:v2.4.11"`
`21`	`21`	`description = "The Rancher Agent image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."`
`22`	`22`	`}`
`23`	`23`