You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/09/24 13:14:07 UTC
[incubator-dlab] branch DLAB-terraform updated: added kubernetes
version;
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-terraform by this push:
new f2e2191 added kubernetes version;
f2e2191 is described below
commit f2e2191dba2649c1e5e2618ea2d51419360d647c
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Tue Sep 24 16:13:57 2019 +0300
added kubernetes version;
---
.../terraform/aws/ssn-k8s/main/auto_scaling_groups.tf | 6 ++++--
.../terraform/aws/ssn-k8s/main/files/masters-user-data.sh | 2 +-
.../terraform/aws/ssn-k8s/main/files/workers-user-data.sh | 2 +-
infrastructure-provisioning/terraform/aws/ssn-k8s/main/variables.tf | 4 +++-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/auto_scaling_groups.tf b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/auto_scaling_groups.tf
index 61faed3..4c428e3 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/auto_scaling_groups.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/auto_scaling_groups.tf
@@ -49,14 +49,16 @@ data "template_file" "ssn_k8s_masters_user_data" {
ssn_keystore_password = random_string.ssn_keystore_password.result
endpoint_keystore_password = random_string.endpoint_keystore_password.result
endpoint_elastic_ip = aws_eip.k8s-endpoint-eip.public_ip
+ kubernetes_version = var.kubernetes_version
}
}
data "template_file" "ssn_k8s_workers_user_data" {
template = file("./files/workers-user-data.sh")
vars = {
- k8s-bucket-name = aws_s3_bucket.ssn_k8s_bucket.id
- k8s_os_user = var.os_user
+ k8s-bucket-name = aws_s3_bucket.ssn_k8s_bucket.id
+ k8s_os_user = var.os_user
+ kubernetes_version = var.kubernetes_version
}
}
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/masters-user-data.sh b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/masters-user-data.sh
index db2227c..40ab2be 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/masters-user-data.sh
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/masters-user-data.sh
@@ -67,7 +67,7 @@ sudo apt-get install -y apt-transport-https curl
sudo bash -c 'curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -'
sudo bash -c 'echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list'
sudo apt-get update
-sudo apt-get install -y kubelet kubeadm kubectl
+sudo apt-get install -y kubelet=${kubernetes_version} kubeadm=${kubernetes_version} kubectl=${kubernetes_version}
check_tokens
if [[ $local_ip == "$first_master_ip" ]] && [[ $RUN == "false" ]];then
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/workers-user-data.sh b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/workers-user-data.sh
index 889bf98..0864fcc 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/workers-user-data.sh
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/workers-user-data.sh
@@ -52,7 +52,7 @@ sudo apt-get install -y apt-transport-https curl
sudo bash -c 'curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -'
sudo bash -c 'echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list'
sudo apt-get update
-sudo apt-get install -y kubelet kubeadm kubectl
+sudo apt-get install -y kubelet=${kubernetes_version} kubeadm=${kubernetes_version} kubectl=${kubernetes_version}
while check_tokens
do
if [[ $RUN == "false" ]];
diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/variables.tf b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/variables.tf
index cde1694..45a7e1a 100644
--- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/variables.tf
+++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/variables.tf
@@ -100,7 +100,9 @@ variable "ssn_root_volume_size" {
variable "ssn_k8s_masters_shape" {
default = "t2.medium"
}
-
variable "ssn_k8s_workers_shape" {
default = "t2.medium"
+}
+variable "kubernetes_version" {
+ default = "1.14.7-00"
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org