diff --git a/create/cluster.go b/create/cluster.go index d895ff7f..8c58590a 100644 --- a/create/cluster.go +++ b/create/cluster.go @@ -360,6 +360,9 @@ func getBaseClusterTerraformConfig(terraformModulePath string) (baseClusterTerra {"v1.11.8", "v1.11.8-rancher1-1"}, {"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.6", "v1.15.6-rancher1-2"}, + {"v1.16.3", "v1.16.3-rancher1-1"}, } prompt := promptui.Select{ Label: "Kubernetes Version", diff --git a/docs/guide/aws/cluster.md b/docs/guide/aws/cluster.md index 7608c999..96dffb29 100644 --- 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.13.4 +✔ Kubernetes Version: v1.16.3 ✔ Kubernetes Network Provider: calico ✔ Private Registry: None ✔ k8s Registry: None diff --git a/docs/guide/azure/cluster.md b/docs/guide/azure/cluster.md index 62f419b8..3ff02d94 100644 --- 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.13.4 +✔ Kubernetes Version: v1.16.3 ✔ Kubernetes Network Provider: calico ✔ Private Registry: None ✔ k8s Registry: None diff --git a/docs/guide/gcp/cluster.md b/docs/guide/gcp/cluster.md index df8b1af9..f43d4d83 100644 --- 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.13.4 +✔ Kubernetes Version: v1.16.3 ✔ 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 index 9158fd8c..6a25fa91 100644 --- 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.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_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`, `v1.13.4-rancher1-1`, `v1.14.9-rancher1-1`, `v1.15.6-rancher1-2`, and `v1.16.3-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 index 3fc9fcf3..331011fb 100644 --- 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.13.4 +✔ Kubernetes Version: v1.16.3 ✔ Kubernetes Network Provider: calico ✔ Private Registry: None ✔ k8s Registry: None diff --git a/docs/guide/vSphere/cluster.md b/docs/guide/vSphere/cluster.md index 18bf1a0a..e466f0f8 100644 --- 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.13.4 +✔ Kubernetes Version: v1.16.3 ✔ 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 index ebd8c57d..60271bd2 100644 --- 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.13.4-rancher1-1 +k8s_version: v1.16.3-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 index b1fd9b10..e0499315 100644 --- 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.13.4-rancher1-1 +k8s_version: v1.16.3-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 index 45a49325..f5df0e2d 100644 --- 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.1.7" + default = "rancher/rancher-agent:v2.3.3" 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 index c97bf047..f723fa73 100644 --- 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.13.4-rancher1-1" + default = "v1.16.3-rancher1-1" } variable k8s_network_provider { diff --git a/terraform/modules/aws-rancher/variables.tf b/terraform/modules/aws-rancher/variables.tf index a0030cc6..1c223714 100644 --- 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.1.7" + default = "rancher/rancher:v2.3.3" 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.1.7" + default = "rancher/rancher-agent:v2.3.3" 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 index 7a333c63..1fa398e5 100644 --- 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.1.7" + default = "rancher/rancher-agent:v2.3.3" 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 index da4d8157..3ff09173 100644 --- 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.13.4-rancher1-1" + default = "v1.16.3-rancher1-1" } variable k8s_network_provider { diff --git a/terraform/modules/azure-rancher/variables.tf b/terraform/modules/azure-rancher/variables.tf index ae227f4c..8eb3c32c 100644 --- 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.1.7" + default = "rancher/rancher:v2.3.3" 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.1.7" + default = "rancher/rancher-agent:v2.3.3" 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 index adf97a3d..45fbd8b2 100644 --- 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.1.7" + default = "rancher/rancher-agent:v2.3.3" 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 index 3bc2eb00..9c9ad02d 100644 --- 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.1.7" + default = "rancher/rancher-agent:v2.3.3" 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 index c8464d0d..c8cdd21d 100644 --- 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.13.4-rancher1-1" + default = "v1.16.3-rancher1-1" } variable k8s_network_provider { diff --git a/terraform/modules/bare-metal-rancher/variables.tf b/terraform/modules/bare-metal-rancher/variables.tf index 2404305c..73d085b2 100644 --- 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.1.7" + default = "rancher/rancher:v2.3.3" 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.1.7" + default = "rancher/rancher-agent:v2.3.3" 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/files/setup_rancher.sh.tpl b/terraform/modules/files/setup_rancher.sh.tpl index 7ec5ce8a..810a13ab 100644 --- a/terraform/modules/files/setup_rancher.sh.tpl +++ b/terraform/modules/files/setup_rancher.sh.tpl @@ -16,6 +16,15 @@ while [ $? -ne 1 ]; do sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1; done +# Wait for apt-get frontend to be unlocked +printf 'Waiting for apt-get frontend to unlock' +sudo fuser /var/lib/dpkg/lock-frontend >/dev/null 2>&1; +while [ $? -ne 1 ]; do + printf '.'; + sleep 5; + sudo fuser /var/lib/dpkg/lock-frontend >/dev/null 2>&1; +done + sudo apt-get install jq -y # Login as default admin user diff --git a/terraform/modules/gcp-rancher-k8s-host/variables.tf b/terraform/modules/gcp-rancher-k8s-host/variables.tf index 837d1efe..c2e0d9e1 100644 --- 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.1.7" + default = "rancher/rancher-agent:v2.3.3" 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 index 61b704d4..6cc65a03 100644 --- 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.13.4-rancher1-1" + default = "v1.16.3-rancher1-1" } variable k8s_network_provider { diff --git a/terraform/modules/gcp-rancher/variables.tf b/terraform/modules/gcp-rancher/variables.tf index 0a223617..f73214c7 100644 --- 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.1.7" + default = "rancher/rancher:v2.3.3" 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.1.7" + default = "rancher/rancher-agent:v2.3.3" 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 index 25761f59..0d6e67b0 100644 --- 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.1.7" + default = "rancher/rancher-agent:v2.3.3" 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 index 52191810..42550943 100644 --- 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.13.4-rancher1-1" + default = "v1.16.3-rancher1-1" } variable k8s_network_provider { diff --git a/terraform/modules/triton-rancher/variables.tf b/terraform/modules/triton-rancher/variables.tf index 6a7357ba..db080bee 100644 --- 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.1.7" + default = "rancher/rancher:v2.3.3" 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.1.7" + default = "rancher/rancher-agent:v2.3.3" 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 index 5f277cba..909df9df 100644 --- 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.1.7" + default = "rancher/rancher-agent:v2.3.3" 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 index 9915114e..d3e1aa97 100644 --- 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.13.4-rancher1-1" + default = "v1.16.3-rancher1-1" } variable "k8s_network_provider" {