Merge pull request #155 from nimajalali/k8s-upgrade

Upgrade to latest Kubernetes
TritonDataCenter · Mar 20, 2019 · 747c4f9 · 747c4f9
2 parents 3b35956 + 4003951
commit 747c4f9
Show file tree

Hide file tree

Showing 27 changed files with 37 additions and 34 deletions.
diff --git a/create/cluster.go b/create/cluster.go
@@ -354,9 +354,12 @@ func getBaseClusterTerraformConfig(terraformModulePath string) (baseClusterTerra
 			DisplayName string
 			Name        string
 		}{
-			{"v1.8.10", "v1.8.10-rancher1-1"},
-			{"v1.9.5", "v1.9.5-rancher1-1"},
-			{"v1.10.0", "v1.10.0-rancher1-1"},
+			{"v1.8.11", "v1.8.11-rancher2-1"},
+			{"v1.9.7", "v1.9.7-rancher2-2"},
+			{"v1.10.3", "v1.10.3-rancher2-1"},
+			{"v1.11.8", "v1.11.8-rancher1-1"},
+			{"v1.12.6", "v1.12.6-rancher1-1"},
+			{"v1.13.4", "v1.13.4-rancher1-1"},
 		}
 		prompt := promptui.Select{
 			Label: "Kubernetes Version",

diff --git a/docs/guide/aws/cluster.md b/docs/guide/aws/cluster.md
@@ -18,7 +18,7 @@ create cluster called
 ✔ Cluster Manager: dev-manager
 ✔ Cloud Provider: AWS
 ✔ Cluster Name: dev-cluster
-✔ Kubernetes Version: v1.8.10
+✔ Kubernetes Version: v1.13.4
 ✔ Kubernetes Network Provider: calico
 ✔ Private Registry: None
 ✔ k8s Registry: None

diff --git a/docs/guide/azure/cluster.md b/docs/guide/azure/cluster.md
@@ -18,7 +18,7 @@ create cluster called
 ✔ Cluster Manager: dev-manager
 ✔ Cloud Provider: Azure
 ✔ Cluster Name: azure-cluster
-✔ Kubernetes Version: v1.10.0
+✔ Kubernetes Version: v1.13.4
 ✔ Kubernetes Network Provider: calico
 ✔ Private Registry: None
 ✔ k8s Registry: None

diff --git a/docs/guide/gcp/cluster.md b/docs/guide/gcp/cluster.md
@@ -18,7 +18,7 @@ create cluster called
 ✔ Cluster Manager: dev-manager
 ✔ Cloud Provider: GCP
 ✔ Cluster Name: gcp-cluster
-✔ Kubernetes Version: v1.10.0
+✔ Kubernetes Version: v1.13.4
 ✔ Kubernetes Network Provider: calico
 ✔ Private Registry: None
 ✔ k8s Registry: None

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: `v1.8.10-rancher1-1`, `v1.9.5-rancher1-1`, and `v1.10.0-rancher1-1`. |
+| `k8s_version` | Version of Kubernetes to deploy for this cluster. Available versions are: `v1.8.11-rancher2-1`, `v1.9.7-rancher2-2`, `v1.10.3-rancher2-1`, `v1.11.8-rancher1-1`, `v1.12.6-rancher1-1`, and `v1.13.4-rancher1-1``. |
 | `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/docs/guide/triton/cluster.md b/docs/guide/triton/cluster.md
@@ -18,7 +18,7 @@ create cluster called
 ✔ Cluster Manager: dev-manager
 ✔ Cloud Provider: Triton
 ✔ Cluster Name: dev-cluster
-✔ Kubernetes Version: v1.9.5
+✔ Kubernetes Version: v1.13.4
 ✔ Kubernetes Network Provider: calico
 ✔ Private Registry: None
 ✔ k8s Registry: None

diff --git a/docs/guide/vSphere/cluster.md b/docs/guide/vSphere/cluster.md
@@ -18,7 +18,7 @@ create cluster called
 ✔ Cluster Manager: dev-manager
 ✔ Cloud Provider: vSphere
 ✔ Cluster Name: dev-cluster
-✔ Kubernetes Version: v1.8.10
+✔ Kubernetes Version: v1.13.4
 ✔ Kubernetes Network Provider: calico
 ✔ Private Registry: None
 ✔ k8s Registry: None

diff --git a/examples/silent-install/gcp/cluster-gcp-ha.yaml b/examples/silent-install/gcp/cluster-gcp-ha.yaml
@@ -3,7 +3,7 @@ cluster_manager: manager-on-triton
 backend_provider: local
 name: gcp-ha
 cluster_cloud_provider: gcp
-k8s_version: v1.10.0-rancher1-1
+k8s_version: v1.13.4-rancher1-1
 k8s_network_provider: calico
 private_registry: ""
 private_registry_username: ""

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.8.10-rancher1-1
+k8s_version: v1.13.4-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
@@ -16,7 +16,7 @@ variable "rancher_host_labels" {
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.0.0"
+  default     = "rancher/rancher-agent:v2.1.7"
   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/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.9.5-rancher1-1"
+  default = "v1.13.4-rancher1-1"
 }
 
 variable k8s_network_provider {

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.0.0"
+  default     = "rancher/rancher:v2.1.7"
   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.0.0"
+  default     = "rancher/rancher-agent:v2.1.7"
   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
@@ -16,7 +16,7 @@ variable "rancher_host_labels" {
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.0.0"
+  default     = "rancher/rancher-agent:v2.1.7"
   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.9.5-rancher1-1"
+  default = "v1.13.4-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.0.0"
+  default     = "rancher/rancher:v2.1.7"
   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.0.0"
+  default     = "rancher/rancher-agent:v2.1.7"
   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.0.0"
+  default     = "rancher/rancher-agent:v2.1.7"
   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
@@ -16,7 +16,7 @@ variable "rancher_host_labels" {
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.0.0"
+  default     = "rancher/rancher-agent:v2.1.7"
   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.9.5-rancher1-1"
+  default = "v1.13.4-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.0.0"
+  default     = "rancher/rancher:v2.1.7"
   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.0.0"
+  default     = "rancher/rancher-agent:v2.1.7"
   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
@@ -16,7 +16,7 @@ variable "rancher_host_labels" {
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.0.0"
+  default     = "rancher/rancher-agent:v2.1.7"
   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.9.5-rancher1-1"
+  default = "v1.13.4-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.0.0"
+  default     = "rancher/rancher:v2.1.7"
   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.0.0"
+  default     = "rancher/rancher-agent:v2.1.7"
   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/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.0.0"
+  default     = "rancher/rancher-agent:v2.1.7"
   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/variables.tf b/terraform/modules/triton-rancher-k8s/variables.tf
@@ -15,7 +15,7 @@ variable "rancher_secret_key" {
 }
 
 variable k8s_version {
-  default = "v1.9.5-rancher1-1"
+  default = "v1.13.4-rancher1-1"
 }
 
 variable k8s_network_provider {

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.0.0"
+  default     = "rancher/rancher:v2.1.7"
   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.0.0"
+  default     = "rancher/rancher-agent:v2.1.7"
   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-host/variables.tf b/terraform/modules/vsphere-rancher-k8s-host/variables.tf
@@ -16,7 +16,7 @@ variable "rancher_host_labels" {
 }
 
 variable "rancher_agent_image" {
-  default     = "rancher/rancher-agent:v2.0.0"
+  default     = "rancher/rancher-agent:v2.1.7"
   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.9.5-rancher1-1"
+  default = "v1.13.4-rancher1-1"
 }
 
 variable "k8s_network_provider" {