Merge pull request #43 from jetstack/amazon-tf-fixes

Adds some amazon terraform fixes + kubeconfig gen

Author: jetstack-bot

demo/infrastructure/amazon/.gitignore

@@ -0,0 +1,2 @@
+/config-map-aws-auth_*
+/kubeconfig_*

demo/infrastructure/amazon/ouputs.tf renamed to demo/infrastructure/amazon/outputs.tf

@@ -10,9 +10,9 @@ output "config" {
   value = "${jsonencode(local.config)}"
 }
 
-#output "kubeconfig_command" {
-#  value = "eksctl utils write-kubeconfig --name=cluster-${random_id.suffix.hex} --kubeconfig=$KUBECONFIG --set-kubeconfig-context=true --region=${var.region} && cat infrastructure/amazon/aws-auth.yaml | sed -e \"s~{{ROLE_ARN}}~${module.cluster.cluster_node_arn}~g\" | kubectl apply -f -"
-#}
+output "kubeconfig_command" {
+  value = "cp infrastructure/amazon/kubeconfig_cluster-${random_id.suffix.hex} $$KUBECONFIG"
+}
 
 output "kubeconfig" {
   description = "kubectl config as generated by the module."

demo/infrastructure/amazon/providers.tf

@@ -2,11 +2,17 @@ variable "region" {
   default = "eu-west-1"
 }
 
+variable "cluster_version" {
+  default = "1.12"
+}
+
 provider "aws" {
   region = "${var.region}"
 }
 
 module "cluster" {
-  source = "../modules/amazon-cluster"
-  suffix = "${random_id.suffix.hex}"
+  source  = "../modules/amazon-cluster"
+  suffix  = "${random_id.suffix.hex}"
+
+  cluster_version = "${var.cluster_version}"
 }

demo/infrastructure/modules/amazon-cluster/cluster.tf

@@ -1,9 +1,10 @@
 variable "suffix" {}
+variable "cluster_version" {}
 
 data "aws_availability_zones" "available" {}
 
 locals {
-  cluster_name = "cluster-${var.suffix}"
+  cluster_name    = "cluster-${var.suffix}"
 
   worker_groups = [
     {
@@ -94,6 +95,7 @@ module "vpc" {
 module "eks" {
   source                               = "terraform-aws-modules/eks/aws"
   cluster_name                         = "${local.cluster_name}"
+  cluster_version                      = "${var.cluster_version}"
   subnets                              = ["${module.vpc.private_subnets}"]
   tags                                 = "${local.tags}"
   vpc_id                               = "${module.vpc.vpc_id}"