Merge pull request #33 from fayazg/k8s1.8

Shubhra Kar · web-flow · commit 1b1fd27da243 · 2018-01-16T10:33:48.000-08:00
kubernetes upgrade
diff --git a/README.md b/README.md
@@ -89,7 +89,7 @@ Follow the on screen instructions answering questions about the cluster. You can
 | Which Triton networks should be used for this environment                      | Joyent-SDC-Public                                     | <kbd>enter</kbd>     |
 | Which Triton package should be used for Global Cluster Manager server(s)       | k4-highcpu-kvm-1.75G                                  | k4-highcpu-kvm-3.75G |
 | Which Triton package should be used for Global Cluster Manager database server | k4-highcpu-kvm-1.75G                                  | k4-highcpu-kvm-3.75G |
-| docker-engine install script                                                   | <https://releases.rancher.com/install-docker/1.12.sh> | <kbd>enter</kbd>     |
+| docker-engine install script                                                   | <https://releases.rancher.com/install-docker/17.03.sh> | <kbd>enter</kbd>     |
 
 After verification of the entries, setup will start Cluster Manager in HA mode on Joyent Cloud. This will be a two node HA configuration with a shared database node.
 
@@ -114,7 +114,7 @@ The Triton credentials are pulled from environment variables. If `eval "$(triton
 | Which Triton package should be used for triton-test environment etcd nodes | k4-highcpu-kvm-1.75G | k4-highcpu-kvm-3.75G |
 | Which Triton package should be used for triton-test environment orchestration nodes running apiserver/scheduler/controllermanager/... | k4-highcpu-kvm-1.75G | k4-highcpu-kvm-3.75G |
 | Which Triton package should be used for triton-test environment compute nodes | k4-highcpu-kvm-1.75G | k4-highcpu-kvm-3.75G |
-| docker-engine install script | <https://releases.rancher.com/install-docker/1.12.sh> | <kbd>enter</kbd> |
+| docker-engine install script | <https://releases.rancher.com/install-docker/17.03.sh> | <kbd>enter</kbd> |
 
 After verification of the entries, setup will create a Kubernetes environment in HA mode on Joyent Cloud. This will be a three worker/three ETCD/three Kubernetes Services node configuration managed by the previously started cluster manager ([global-cluster](#starting-a-global-cluster-manager)).
 
@@ -155,7 +155,7 @@ aws ec2 describe-images --image-id ami-0def3275
 | What size hosts should be used for aws-test environment orchestration nodes running apiserver/scheduler/controllermanager/... | t2.micro | t2.small |
 | What size hosts should be used for aws-test environment compute nodes | t2.micro | t2.small |
 | Which ssh public key should these hosts be set up with |  | \[your public ssh key] |
-| docker-engine install script | <https://releases.rancher.com/install-docker/1.12.sh> | <kbd>enter</kbd> |
+| docker-engine install script | <https://releases.rancher.com/install-docker/17.03.sh> | <kbd>enter</kbd> |
 
 After verification of the entries, setup will create a Kubernetes environment in HA mode running on AWS. This will be a three worker/three ETCD/three Kubernetes Services node configuration managed by the previously started cluster manager ([global-cluster](#starting-a-global-cluster-manager)).
 
@@ -176,7 +176,7 @@ After verification of the entries, setup will create a Kubernetes environment in
 | What size hosts should be used for azure-test environment orchestration nodes running apiserver/scheduler/controllermanager/... | Standard_A1 | Standard_A2 |
 | What size hosts should be used for azure-test environment compute nodes | Standard_A1 | Standard_A2 |
 | Which ssh public key should these hosts be set up with |  | \[public ssh key] |
-| docker-engine install script | <https://releases.rancher.com/install-docker/1.12.sh> | <kbd>enter</kbd> |
+| docker-engine install script | <https://releases.rancher.com/install-docker/17.03.sh> | <kbd>enter</kbd> |
 
 After verification of the entries, setup will create a Kubernetes environment in HA mode running on Azure. This will be a three worker/three ETCD/three Kubernetes Services node configuration managed by the previously started cluster manager ([global-cluster](#starting-a-global-cluster-manager)).
 
@@ -195,6 +195,6 @@ After verification of the entries, setup will create a Kubernetes environment in
 | What size hosts should be used for gcp-test environment etcd nodes | n1-standard-1 | n1-standard-2 |
 | What size hosts should be used for gcp-test environment orchestration nodes running apiserver/scheduler/controllermanager/... | n1-standard-1 | n1-standard-2 |
 | What size hosts should be used for gcp-test environment compute nodes | n1-standard-1 | n1-standard-2 |
-| docker-engine install script | <https://releases.rancher.com/install-docker/1.12.sh> | <kbd>enter</kbd> |
+| docker-engine install script | <https://releases.rancher.com/install-docker/17.03.sh> | <kbd>enter</kbd> |
 
 After verification of the entries, setup will create a Kubernetes environment in HA mode running on GCP. This will be a three worker/three ETCD/three Kubernetes Services node configuration managed by the previously started cluster manager ([global-cluster](#starting-a-global-cluster-manager)).
diff --git a/packer/rancher-agent.yaml b/packer/rancher-agent.yaml
@@ -8,7 +8,7 @@ builders:
 provisioners:
 - type: shell
   inline:
-    - sudo curl "https://releases.rancher.com/install-docker/1.12.sh" | sh
+    - sudo curl "https://releases.rancher.com/install-docker/17.03.sh" | sh
     - sudo apt-get install jq -y
     - sudo docker pull rancher/healthcheck:v0.3.3
     - sudo docker pull rancher/net:v0.11.9
diff --git a/packer/rancher-host.yaml b/packer/rancher-host.yaml
@@ -8,5 +8,5 @@ builders:
 provisioners:
 - type: shell
   inline:
-    - sudo curl "https://releases.rancher.com/install-docker/1.12.sh" | sh
+    - sudo curl "https://releases.rancher.com/install-docker/17.03.sh" | sh
     - sudo apt-get install jq -y
diff --git a/packer/rancher-server.yaml b/packer/rancher-server.yaml
@@ -8,6 +8,6 @@ builders:
 provisioners:
 - type: shell
   inline:
-    - sudo curl "https://releases.rancher.com/install-docker/1.12.sh" | sh
+    - sudo curl "https://releases.rancher.com/install-docker/17.03.sh" | sh
     - sudo apt-get install jq -y
     - sudo docker pull rancher/server:v1.6.10
diff --git a/template_aws_environment.conf b/template_aws_environment.conf
@@ -31,4 +31,4 @@ aws_public_key_path=/path/to/id_rsa.pub
 # k8s_registry_username=username
 # k8s_registry_password=password
 
-docker_engine_install_url=https://releases.rancher.com/install-docker/1.12.sh
+docker_engine_install_url=https://releases.rancher.com/install-docker/17.03.sh
diff --git a/template_azure_environment.conf b/template_azure_environment.conf
@@ -33,4 +33,4 @@ azure_public_key_path=/path/to/id_rsa.pub
 # k8s_registry_username=username
 # k8s_registry_password=password
 
-docker_engine_install_url=https://releases.rancher.com/install-docker/1.12.sh
+docker_engine_install_url=https://releases.rancher.com/install-docker/17.03.sh
diff --git a/template_clustermanager.conf b/template_clustermanager.conf
@@ -31,4 +31,4 @@ mysqldb_package=k4-highcpu-kvm-7.75G
 # rancher_registry_username=username
 # rancher_registry_password=password
 
-docker_engine_install_url=https://releases.rancher.com/install-docker/1.12.sh
+docker_engine_install_url=https://releases.rancher.com/install-docker/17.03.sh
diff --git a/template_gcp_environment.conf b/template_gcp_environment.conf
@@ -29,4 +29,4 @@ gcp_instance_zone=us-west1-a
 # k8s_registry_username=username
 # k8s_registry_password=password
 
-docker_engine_install_url=https://releases.rancher.com/install-docker/1.12.sh
+docker_engine_install_url=https://releases.rancher.com/install-docker/17.03.sh
diff --git a/template_triton_environment.conf b/template_triton_environment.conf
@@ -33,4 +33,4 @@ compute_package=k4-highcpu-kvm-1.75G
 # k8s_registry_username=username
 # k8s_registry_password=password
 
-docker_engine_install_url=https://releases.rancher.com/install-docker/1.12.sh
+docker_engine_install_url=https://releases.rancher.com/install-docker/17.03.sh
diff --git a/terraform/modules/aws-rancher-k8s/files/install_rancher_agent.sh.tpl b/terraform/modules/aws-rancher-k8s/files/install_rancher_agent.sh.tpl
@@ -1,6 +1,5 @@
 #!/bin/sh
-# This script just wraps https://releases.rancher.com/install-docker/1.12.sh
-# It disables firewalld on CentOS.
+# Disable firewalld on CentOS.
 # TODO: Replace firewalld with iptables.
 
 if [ -n "$(command -v firewalld)" ]; then
@@ -20,4 +19,4 @@ if [ "${rancher_registry_username}" != "" ]; then
 fi
 
 # Run Rancher agent container
-${rancher_agent_command}
+${rancher_agent_command}
diff --git a/terraform/modules/aws-rancher-k8s/variables.tf b/terraform/modules/aws-rancher-k8s/variables.tf
@@ -35,7 +35,7 @@ variable "compute_node_count" {
 }
 
 variable "docker_engine_install_url" {
-  default     = "https://releases.rancher.com/install-docker/1.12.sh"
+  default     = "https://releases.rancher.com/install-docker/17.03.sh"
   description = "The URL to the shell script to install the docker engine."
 }
 
diff --git a/terraform/modules/azure-rancher-k8s/files/install_rancher_agent.sh.tpl b/terraform/modules/azure-rancher-k8s/files/install_rancher_agent.sh.tpl
@@ -1,6 +1,5 @@
 #!/bin/sh
-# This script just wraps https://releases.rancher.com/install-docker/1.12.sh
-# It disables firewalld on CentOS.
+# Disable firewalld on CentOS.
 # TODO: Replace firewalld with iptables.
 
 if [ -n "$(command -v firewalld)" ]; then
@@ -21,4 +20,4 @@ if [ "${rancher_registry_username}" != "" ]; then
 fi
 
 # Run Rancher agent container
-${rancher_agent_command}
+${rancher_agent_command}
diff --git a/terraform/modules/azure-rancher-k8s/variables.tf b/terraform/modules/azure-rancher-k8s/variables.tf
@@ -35,7 +35,7 @@ variable "compute_node_count" {
 }
 
 variable "docker_engine_install_url" {
-  default     = "https://releases.rancher.com/install-docker/1.12.sh"
+  default     = "https://releases.rancher.com/install-docker/17.03.sh"
   description = "The URL to the shell script to install the docker engine."
 }
 
diff --git a/terraform/modules/gcp-rancher-k8s/files/install_rancher_agent.sh.tpl b/terraform/modules/gcp-rancher-k8s/files/install_rancher_agent.sh.tpl
@@ -1,6 +1,5 @@
 #!/bin/sh
-# This script just wraps https://releases.rancher.com/install-docker/1.12.sh
-# It disables firewalld on CentOS.
+# Disable firewalld on CentOS.
 # TODO: Replace firewalld with iptables.
 
 if [ -n "$(command -v firewalld)" ]; then
@@ -20,4 +19,4 @@ if [ "${rancher_registry_username}" != "" ]; then
 fi
 
 # Run Rancher agent container
-${rancher_agent_command}
+${rancher_agent_command}
diff --git a/terraform/modules/gcp-rancher-k8s/variables.tf b/terraform/modules/gcp-rancher-k8s/variables.tf
@@ -35,7 +35,7 @@ variable "compute_node_count" {
 }
 
 variable "docker_engine_install_url" {
-  default     = "https://releases.rancher.com/install-docker/1.12.sh"
+  default     = "https://releases.rancher.com/install-docker/17.03.sh"
   description = "The URL to the shell script to install the docker engine."
 }
 
diff --git a/terraform/modules/rancher-k8s/variables.tf b/terraform/modules/rancher-k8s/variables.tf
@@ -30,7 +30,7 @@ variable "compute_node_count" {
 }
 
 variable "docker_engine_install_url" {
-  default     = "https://releases.rancher.com/install-docker/1.12.sh"
+  default     = "https://releases.rancher.com/install-docker/17.03.sh"
   description = "The URL to the shell script to install the docker engine."
 }
 
diff --git a/terraform/modules/triton-rancher-k8s/files/install_rancher_agent.sh.tpl b/terraform/modules/triton-rancher-k8s/files/install_rancher_agent.sh.tpl
@@ -1,6 +1,5 @@
 #!/bin/sh
-# This script just wraps https://releases.rancher.com/install-docker/1.12.sh
-# It disables firewalld on CentOS.
+# Disable firewalld on CentOS.
 # TODO: Replace firewalld with iptables.
 
 if [ -n "$(command -v firewalld)" ]; then
diff --git a/terraform/modules/triton-rancher-k8s/variables.tf b/terraform/modules/triton-rancher-k8s/variables.tf
@@ -35,7 +35,7 @@ variable "compute_node_count" {
 }
 
 variable "docker_engine_install_url" {
-  default     = "https://releases.rancher.com/install-docker/1.12.sh"
+  default     = "https://releases.rancher.com/install-docker/17.03.sh"
   description = "The URL to the shell script to install the docker engine."
 }
 
diff --git a/terraform/modules/triton-rancher/variables.tf b/terraform/modules/triton-rancher/variables.tf
@@ -51,7 +51,7 @@ variable "master_triton_machine_package" {
 }
 
 variable "docker_engine_install_url" {
-  default     = "https://releases.rancher.com/install-docker/1.12.sh"
+  default     = "https://releases.rancher.com/install-docker/17.03.sh"
   description = "The URL to the shell script to install the docker engine."
 }
 
@@ -106,7 +106,7 @@ variable "mysqldb_database_name" {
 }
 
 variable "rancher_server_image" {
-  default     = "rancher/server:v1.6.10"
+  default     = "rancher/server:v1.6.14"
   description = "The Rancher Server image to use, can be a url to a private registry leverage docker_login_* variables to authenticate to registry."
 }
 
diff --git a/triton-kubernetes.sh b/triton-kubernetes.sh
@@ -95,7 +95,7 @@ startProvisioning() {
 		cd terraform
 		$TERRAFORM init
 		$TERRAFORM get
-		$TERRAFORM apply -target "module.${1}"
+		$TERRAFORM apply -auto-approve=true -target "module.${1}"
 	)
 }
 deleteEnvironment() {
@@ -318,7 +318,7 @@ getClusterManagerConfig() {
 	then
 		_mysqldb_triton_machine_package="$(getArgument "Which Triton package should be used for Global Cluster Manager database server" "k4-highcpu-kvm-1.75G")"
 	fi
-	docker_engine_install_url="$(getArgument "docker-engine install script" "https://releases.rancher.com/install-docker/1.12.sh")"
+	docker_engine_install_url="$(getArgument "docker-engine install script" "https://releases.rancher.com/install-docker/17.03.sh")"
 }
 getAWSEnvironmentConfig() {
 	_name="$(getArgument "Name your environment" "aws-test")"
@@ -342,7 +342,7 @@ getAWSEnvironmentConfig() {
 	fi
 	_compute_aws_instance_type="$(getArgument "What size hosts should be used for $_name environment compute nodes" "t2.micro")"
 	_aws_public_key_path="$(getArgument "Which ssh public key should these hosts be set up with" "${HOME}/.ssh/id_rsa.pub")"
-	docker_engine_install_url="$(getArgument "docker-engine install script" "https://releases.rancher.com/install-docker/1.12.sh")"
+	docker_engine_install_url="$(getArgument "docker-engine install script" "https://releases.rancher.com/install-docker/17.03.sh")"
 }
 getAzureEnvironmentConfig() {
 	_name="$(getArgument "Name your environment" "azure-test")"
@@ -365,7 +365,7 @@ getAzureEnvironmentConfig() {
 	fi
 	_compute_azure_size="$(getArgument "What size hosts should be used for $_name environment compute nodes" "Standard_A1")"
 	_azure_public_key_path="$(getArgument "Which ssh public key should these hosts be set up with" "${HOME}/.ssh/id_rsa.pub")"
-	docker_engine_install_url="$(getArgument "docker-engine install script" "https://releases.rancher.com/install-docker/1.12.sh")"
+	docker_engine_install_url="$(getArgument "docker-engine install script" "https://releases.rancher.com/install-docker/17.03.sh")"
 }
 getGCPEnvironmentConfig() {
 	_name="$(getArgument "Name your environment" "gcp-test")"
@@ -388,7 +388,7 @@ getGCPEnvironmentConfig() {
 		_orchestration_gcp_instance_type="$(getArgument "What size hosts should be used for $_name environment orchestration nodes running apiserver/scheduler/controllermanager/..." "n1-standard-1")"
 	fi
 	_compute_gcp_instance_type="$(getArgument "What size hosts should be used for $_name environment compute nodes" "n1-standard-1")"
-	docker_engine_install_url="$(getArgument "docker-engine install script" "https://releases.rancher.com/install-docker/1.12.sh")"
+	docker_engine_install_url="$(getArgument "docker-engine install script" "https://releases.rancher.com/install-docker/17.03.sh")"
 }
 getTritonEnvironmentConfig() {
 	_name="$(getArgument "Name your environment" "triton-test")"
@@ -430,10 +430,10 @@ getTritonEnvironmentConfig() {
 		_orchestration_triton_machine_package="$(getArgument "Which Triton package should be used for $_name environment orchestration nodes running apiserver/scheduler/controllermanager/..." "k4-highcpu-kvm-1.75G")"
 	fi
 	_compute_triton_machine_package="$(getArgument "Which Triton package should be used for $_name environment compute nodes" "k4-highcpu-kvm-1.75G")"
-	docker_engine_install_url="$(getArgument "docker-engine install script" "https://releases.rancher.com/install-docker/1.12.sh")"
+	docker_engine_install_url="$(getArgument "docker-engine install script" "https://releases.rancher.com/install-docker/17.03.sh")"
 }
 readConfig() {
-	docker_engine_install_url=https://releases.rancher.com/install-docker/1.12.sh
+	docker_engine_install_url=https://releases.rancher.com/install-docker/17.03.sh
 	while read -r line || [[ -n "$line" ]]
 	do
 		line=$(echo "$line" | tr -d ' ')
@@ -1109,17 +1109,13 @@ showEnvironmentDetails() {
 
 getTERRAFORM() {
 	local __TERRAFORM
-	local __TERRAFORM_VERSION
 	local __TERRAFORM_URL
 	local __TERRAFORM_ZIP_FILE
 
 	if [ -n "$(command -v terraform)" ]
 	then
 		__TERRAFORM="$(command -v terraform)"
-		__TERRAFORM_VERSION="$(terraform version | grep 'Terraform v' | sed 's/Terraform v//')"
-	fi
-	if [ "$__TERRAFORM_VERSION" != "$(curl -s https://checkpoint-api.hashicorp.com/v1/check/terraform | jq -r -M '.current_version')" ]
-	then
+	else
 		(
 			__TERRAFORM_ZIP_FILE="terraform_""$(uname | tr '[:upper:]' '[:lower:]')""_amd64.zip"
 			__TERRAFORM_URL="https://releases.hashicorp.com/terraform/0.10.8/terraform_0.10.8_$(uname | tr '[:upper:]' '[:lower:]')_amd64.zip"
@@ -1138,7 +1134,6 @@ getTERRAFORM() {
 			fi
 		)
 		__TERRAFORM="$(pwd)/bin/terraform"
-		__TERRAFORM_VERSION="$("$__TERRAFORM" version | grep 'Terraform v' | sed 's/Terraform v//')"
 	fi
 	TERRAFORM=$__TERRAFORM
 }
