From a79dc21869a306bc4d7df757c5ad57ff4f7144a3 Mon Sep 17 00:00:00 2001 From: Ranyodh Singh Date: Fri, 2 Dec 2022 02:37:24 -0500 Subject: [PATCH] Update deprecated field in aws provider config, and add MKE version to AWS and Azure (#90) * update aws provider config to replace deprecated field * add mke_version to aws and azure, it is required field now --- examples/terraform/aws/main.tf | 6 ++++-- examples/terraform/aws/variables.tf | 5 +++++ examples/terraform/azure/main.tf | 1 + examples/terraform/azure/variables.tf | 4 ++++ examples/terraform/gcp/variables.tf | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/examples/terraform/aws/main.tf b/examples/terraform/aws/main.tf index 681527f..7d22e13 100644 --- a/examples/terraform/aws/main.tf +++ b/examples/terraform/aws/main.tf @@ -1,6 +1,6 @@ provider "aws" { region = var.aws_region - shared_credentials_file = var.aws_shared_credentials_file + shared_credentials_files = [var.aws_shared_credentials_file] profile = var.aws_profile } @@ -122,6 +122,7 @@ locals { kind = "mke" spec = { mke = { + version = var.mke_version adminUsername = "admin" adminPassword = var.admin_password installFlags : [ @@ -140,6 +141,7 @@ locals { kind = "mke+msr" spec = { mke = { + version = var.mke_version adminUsername = "admin" adminPassword = var.admin_password installFlags : [ @@ -163,4 +165,4 @@ locals { output "mke_cluster" { value = yamlencode(local.launchpad_tmpl) -} \ No newline at end of file +} diff --git a/examples/terraform/aws/variables.tf b/examples/terraform/aws/variables.tf index 4a410e7..ea84a82 100644 --- a/examples/terraform/aws/variables.tf +++ b/examples/terraform/aws/variables.tf @@ -61,6 +61,11 @@ variable "worker_volume_size" { variable "msr_volume_size" { default = 100 } + variable "windows_administrator_password" { default = "w!ndozePassw0rd" } + +variable "mke_version" { + default = "3.5.5" +} diff --git a/examples/terraform/azure/main.tf b/examples/terraform/azure/main.tf index 31d8610..1df9bdf 100644 --- a/examples/terraform/azure/main.tf +++ b/examples/terraform/azure/main.tf @@ -120,6 +120,7 @@ locals { } spec = { mke = { + version = var.mke_version adminUsername = "admin" adminPassword = var.admin_password installFlags : [ diff --git a/examples/terraform/azure/variables.tf b/examples/terraform/azure/variables.tf index 6d0a819..4a09ef6 100644 --- a/examples/terraform/azure/variables.tf +++ b/examples/terraform/azure/variables.tf @@ -96,3 +96,7 @@ variable "update_domain_count" { description = "Specifies the number of update domains that are used" default = 2 } + +variable "mke_version" { + default = "3.5.5" +} diff --git a/examples/terraform/gcp/variables.tf b/examples/terraform/gcp/variables.tf index d3345a9..99a0272 100644 --- a/examples/terraform/gcp/variables.tf +++ b/examples/terraform/gcp/variables.tf @@ -84,5 +84,5 @@ variable "windows_password" { } variable "mke_version" { - default = "3.5.2" + default = "3.5.5" }