Merge pull request #929 from hhuuggoo/wip-fix-eks

bumping versions of the terraform modules used for the EKS asset
replicatedhq · May 6, 2019 · 14b1707 · 14b1707
2 parents 4b4b057 + b4fffc6
commit 14b1707
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/integration/base/amazon-eks/expected/installer/empty/empty.tf b/integration/base/amazon-eks/expected/installer/empty/empty.tf
@@ -17,7 +17,7 @@ locals {
 }
 
 provider "aws" {
-  version = "~> 1.27"
+  version = "~> 2.7.0"
   region  = ""
 }
 
@@ -28,7 +28,7 @@ variable "eks-cluster-name" {
 
 module "eks" {
   source  = "terraform-aws-modules/eks/aws"
-  version = "1.7.0"
+  version = "3.0.0"
 
   cluster_name = "${var.eks-cluster-name}"
 

diff --git a/integration/base/amazon-eks/expected/installer/existing/existing_vpc.tf b/integration/base/amazon-eks/expected/installer/existing/existing_vpc.tf
@@ -30,7 +30,7 @@ locals {
 }
 
 provider "aws" {
-  version = "~> 1.27"
+  version = "~> 2.7.0"
   region  = "us-east-1"
 }
 
@@ -41,7 +41,7 @@ variable "eks-cluster-name" {
 
 module "eks" {
   source  = "terraform-aws-modules/eks/aws"
-  version = "1.7.0"
+  version = "3.0.0"
 
   cluster_name = "${var.eks-cluster-name}"
 

diff --git a/integration/base/amazon-eks/expected/installer/new/new_vpc.tf b/integration/base/amazon-eks/expected/installer/new/new_vpc.tf
@@ -27,7 +27,7 @@ variable "vpc_azs" {
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "1.37.0"
+  version = "1.60.0"
   name    = "eks-vpc"
   cidr    = "${var.vpc_cidr}"
   azs     = "${var.vpc_azs}"
@@ -76,7 +76,7 @@ locals {
 }
 
 provider "aws" {
-  version = "~> 1.27"
+  version = "~> 2.7.0"
   region  = "us-west-2"
 }
 
@@ -87,7 +87,7 @@ variable "eks-cluster-name" {
 
 module "eks" {
   source  = "terraform-aws-modules/eks/aws"
-  version = "1.7.0"
+  version = "3.0.0"
 
   cluster_name = "${var.eks-cluster-name}"
 

diff --git a/integration/init_app/amazon-eks-template/expected/installer/new/new_vpc.tf b/integration/init_app/amazon-eks-template/expected/installer/new/new_vpc.tf
@@ -27,7 +27,7 @@ variable "vpc_azs" {
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "1.37.0"
+  version = "1.60.0"
   name    = "eks-vpc"
   cidr    = "${var.vpc_cidr}"
   azs     = "${var.vpc_azs}"
@@ -76,7 +76,7 @@ locals {
 }
 
 provider "aws" {
-  version = "~> 1.27"
+  version = "~> 2.7.0"
   region  = "us-west-2"
 }
 
@@ -87,7 +87,7 @@ variable "eks-cluster-name" {
 
 module "eks" {
   source  = "terraform-aws-modules/eks/aws"
-  version = "1.7.0"
+  version = "3.0.0"
 
   cluster_name = "${var.eks-cluster-name}"
 

diff --git a/pkg/lifecycle/render/amazoneks/render_templates.go b/pkg/lifecycle/render/amazoneks/render_templates.go
@@ -26,7 +26,7 @@ variable "vpc_azs" {
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "1.37.0"
+  version = "1.60.0"
   name    = "eks-vpc"
   cidr    = "${var.vpc_cidr}"
   azs     = "${var.vpc_azs}"
@@ -80,7 +80,7 @@ locals {
 }
 
 provider "aws" {
-  version = "~> 1.27"
+  version = "~> 2.7.0"
   region  = "{{.Region}}"
 }
 
@@ -91,7 +91,7 @@ variable "eks-cluster-name" {
 
 module "eks" {
   source  = "terraform-aws-modules/eks/aws"
-  version = "1.7.0"
+  version = "3.0.0"
 
   cluster_name = "${var.eks-cluster-name}"
 

diff --git a/pkg/lifecycle/render/amazoneks/render_test.go b/pkg/lifecycle/render/amazoneks/render_test.go
@@ -170,7 +170,7 @@ locals {
 }
 
 provider "aws" {
-  version = "~> 1.27"
+  version = "~> 2.7.0"
   region  = ""
 }
 
@@ -181,7 +181,7 @@ variable "eks-cluster-name" {
 
 module "eks" {
   source  = "terraform-aws-modules/eks/aws"
-  version = "1.7.0"
+  version = "3.0.0"
 
   cluster_name = "${var.eks-cluster-name}"
 
@@ -227,7 +227,7 @@ locals {
 }
 
 provider "aws" {
-  version = "~> 1.27"
+  version = "~> 2.7.0"
   region  = "test-region"
 }
 
@@ -238,7 +238,7 @@ variable "eks-cluster-name" {
 
 module "eks" {
   source  = "terraform-aws-modules/eks/aws"
-  version = "1.7.0"
+  version = "3.0.0"
 
   cluster_name = "${var.eks-cluster-name}"
 
@@ -298,7 +298,7 @@ locals {
 }
 
 provider "aws" {
-  version = "~> 1.27"
+  version = "~> 2.7.0"
   region  = "double-test-region"
 }
 
@@ -309,7 +309,7 @@ variable "eks-cluster-name" {
 
 module "eks" {
   source  = "terraform-aws-modules/eks/aws"
-  version = "1.7.0"
+  version = "3.0.0"
 
   cluster_name = "${var.eks-cluster-name}"
 
@@ -389,7 +389,7 @@ variable "vpc_azs" {
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "1.37.0"
+  version = "1.60.0"
   name    = "eks-vpc"
   cidr    = "${var.vpc_cidr}"
   azs     = "${var.vpc_azs}"
@@ -456,7 +456,7 @@ variable "vpc_azs" {
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "1.37.0"
+  version = "1.60.0"
   name    = "eks-vpc"
   cidr    = "${var.vpc_cidr}"
   azs     = "${var.vpc_azs}"
@@ -605,7 +605,7 @@ locals {
 }
 
 provider "aws" {
-  version = "~> 1.27"
+  version = "~> 2.7.0"
   region  = ""
 }
 
@@ -616,7 +616,7 @@ variable "eks-cluster-name" {
 
 module "eks" {
   source  = "terraform-aws-modules/eks/aws"
-  version = "1.7.0"
+  version = "3.0.0"
 
   cluster_name = "${var.eks-cluster-name}"
 
@@ -679,7 +679,7 @@ locals {
 }
 
 provider "aws" {
-  version = "~> 1.27"
+  version = "~> 2.7.0"
   region  = "us-east-1"
 }
 
@@ -690,7 +690,7 @@ variable "eks-cluster-name" {
 
 module "eks" {
   source  = "terraform-aws-modules/eks/aws"
-  version = "1.7.0"
+  version = "3.0.0"
 
   cluster_name = "${var.eks-cluster-name}"
 
@@ -762,7 +762,7 @@ variable "vpc_azs" {
 
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "1.37.0"
+  version = "1.60.0"
   name    = "eks-vpc"
   cidr    = "${var.vpc_cidr}"
   azs     = "${var.vpc_azs}"
@@ -811,7 +811,7 @@ locals {
 }
 
 provider "aws" {
-  version = "~> 1.27"
+  version = "~> 2.7.0"
   region  = "us-east-1"
 }
 
@@ -822,7 +822,7 @@ variable "eks-cluster-name" {
 
 module "eks" {
   source  = "terraform-aws-modules/eks/aws"
-  version = "1.7.0"
+  version = "3.0.0"
 
   cluster_name = "${var.eks-cluster-name}"