Skip to content

Full support for terraform-0.7.11 #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tamsky wants to merge 16 commits into from
Closed

Full support for terraform-0.7.11 #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b264a1a
Fix nested quotes for Terraform 0.7.x
Nov 15, 2016
21439ce
Use template_file as data resource for TF 0.7.x
Nov 15, 2016
f9aa334
Remove etcd_discovery_url.txt
Nov 15, 2016
337e104
Convert etcd_discovery_url to null_resource
Nov 15, 2016
fd852bb
switch regions
tamsky Nov 16, 2016
11010dc
include changes from https://github.com/Capgemini/kubeform/pull/86
tamsky Nov 16, 2016
754750a
separate out vpc_public_cidrs_list and move it next to dependent list…
tamsky Nov 17, 2016
683f56c
aws_instance: fix subnet_id
tamsky Nov 17, 2016
0dfaaba
tag aws_vpc with org Name
tamsky Nov 17, 2016
9dea01b
un-fix kubectl_server_ip in module.kube_admin_cert
tamsky Nov 17, 2016
b9fac49
docs/aws/public: remove manual steps re: etcd_discovery_url
tamsky Nov 29, 2016
4f77240
remove manual steps
tamsky Nov 29, 2016
8968b02
restore eu-west regions and AZs
tamsky Nov 29, 2016
a54a491
docs/aws/public: re-add manual provisioning step for etcd_discovery_url
tamsky Nov 29, 2016
9a1fae4
remove null_resource etcd_discovery_url trigger
tamsky Dec 1, 2016
99dd8ae
add empty etcd_discovery_url.txt
tamsky Dec 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/getting-started-guides/aws/public.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ for i in $(ls .terraform/modules/*/Makefile); do i=$(dirname $i); make -C $i; do
### Provision the cluster infrastructure

```

@enxebre enxebre Nov 25, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just remove the file from the repo and this will just work when running terraform apply? so no need to manual step?

@tamsky tamsky Nov 29, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you're correct and it can be removed.

@tamsky tamsky Nov 29, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I spoke too soon. It needs to stay.

Explanation is from
337e104

In Terraform 0.7.x, template file data sources do not support the
'provisioner' parameter. So instead, we must now use a null_resource to
get the discovery URL.

And, unfortunately, depending on a null_resource does not mean that you
can read the file before it exists.

@enxebre enxebre Dec 1, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just tested this myself, So we just need to keep a (empty) file named "etcd_discovery_url.txt" in the repo so when running "terraform apply" terraform file() does not complain, then the null resource populates the file right before the template data source uses it.

cd /tmp/kubeform/terraform/aws/public-cloud
terraform apply -target=null_resource.etcd_discovery_url
terraform apply
```

Expand Down
4 changes: 2 additions & 2 deletions terraform/aws/elb/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variable "elb_name" { default = "kube-master" }
variable "health_check_target" { default = "HTTP:8080/healthz" }
variable "instances" {}
variable "subnets" {}
variable "instances" { type = "list" }
variable "subnets" { type = "list" }
variable "security_groups" {}

resource "aws_elb" "kube_master" {
Expand Down
12 changes: 6 additions & 6 deletions terraform/aws/iam/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
resource "aws_iam_role" "master_role" {
name = "master_role"
path = "/"
assume_role_policy = "${file(\"${path.module}/master-role.json\")}"
assume_role_policy = "${file("${path.module}/master-role.json")}"
}

resource "aws_iam_role_policy" "master_policy" {
name = "master_policy"
role = "${aws_iam_role.master_role.id}"
policy = "${file(\"${path.module}/master-policy.json\")}"
policy = "${file("${path.module}/master-policy.json")}"
}

resource "aws_iam_instance_profile" "master_profile" {
Expand All @@ -20,13 +20,13 @@ resource "aws_iam_instance_profile" "master_profile" {
resource "aws_iam_role" "worker_role" {
name = "worker_role"
path = "/"
assume_role_policy = "${file(\"${path.module}/worker-role.json\")}"
assume_role_policy = "${file("${path.module}/worker-role.json")}"
}

resource "aws_iam_role_policy" "worker_policy" {
name = "worker_policy"
role = "${aws_iam_role.worker_role.id}"
policy = "${file(\"${path.module}/worker-policy.json\")}"
policy = "${file("${path.module}/worker-policy.json")}"
}

resource "aws_iam_instance_profile" "worker_profile" {
Expand All @@ -38,13 +38,13 @@ resource "aws_iam_instance_profile" "worker_profile" {
resource "aws_iam_role" "edge-router_role" {
name = "edge-router_role"
path = "/"
assume_role_policy = "${file(\"${path.module}/edge-router-role.json\")}"
assume_role_policy = "${file("${path.module}/edge-router-role.json")}"
}

resource "aws_iam_role_policy" "edge-router_policy" {
name = "edge-router_policy"
role = "${aws_iam_role.edge-router_role.id}"
policy = "${file(\"${path.module}/edge-router-policy.json\")}"
policy = "${file("${path.module}/edge-router-policy.json")}"
}

resource "aws_iam_instance_profile" "edge-router_profile" {
Expand Down
6 changes: 3 additions & 3 deletions terraform/aws/private-cloud/bastion-server.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ module "bastion_ami" {
virttype = "${module.bastion_amitype.prefer_hvm}"
}

resource "template_file" "bastion_cloud_init" {
data "template_file" "bastion_cloud_init" {
template = "bastion-cloud-config.yml.tpl"
depends_on = ["template_file.etcd_discovery_url"]
depends_on = ["null_resource.etcd_discovery_url"]
vars {
etcd_discovery_url = "${file(var.etcd_discovery_url_file)}"
size = "${var.masters}"
Expand All @@ -31,7 +31,7 @@ resource "aws_instance" "bastion" {
security_groups = ["${module.sg-default.security_group_id}", "${aws_security_group.bastion.id}"]
key_name = "${module.aws-keypair.keypair_name}"
source_dest_check = false
user_data = "${template_file.bastion_cloud_init.rendered}"
user_data = "${data.template_file.bastion_cloud_init.rendered}"
tags = {
Name = "kube-bastion"
role = "bastion"
Expand Down
1 change: 0 additions & 1 deletion terraform/aws/private-cloud/etcd_discovery_url.txt
View file
Open in desktop

This file was deleted.

20 changes: 10 additions & 10 deletions terraform/aws/private-cloud/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ module "elb" {
source = "../elb"

security_groups = "${module.sg-default.security_group_id}"
instances = "${join(\",\", aws_instance.worker.*.id)}"
instances = "${join(",", aws_instance.worker.*.id)}"
subnets = "${module.vpc.public_subnets}"
}

# Generate an etcd URL for the cluster
resource "template_file" "etcd_discovery_url" {
template = "/dev/null"
provisioner "local-exec" {
command = "curl https://discovery.etcd.io/new?size=${var.masters} > ${var.etcd_discovery_url_file}"
}
# This will regenerate the discovery URL if the cluster size changes, we include the bastion here
vars {
size = "${var.masters}"
}
resource "null_resource" "etcd_discovery_url" {
provisioner "local-exec" {
command = "curl -s https://discovery.etcd.io/new?size=${var.masters} > ${var.etcd_discovery_url_file}"
}

# This will regenerate the discovery URL if the cluster size changes
triggers {
size = "${var.masters}"
}
}

# outputs
Expand Down
6 changes: 3 additions & 3 deletions terraform/aws/private-cloud/masters.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ module "master_ami" {
virttype = "${module.master_amitype.prefer_hvm}"
}

resource "template_file" "master_cloud_init" {
data "template_file" "master_cloud_init" {
template = "master-cloud-config.yml.tpl"
depends_on = ["template_file.etcd_discovery_url"]
depends_on = ["null_resource.etcd_discovery_url"]
vars {
etcd_discovery_url = "${file(var.etcd_discovery_url_file)}"
size = "${var.masters}"
Expand All @@ -29,7 +29,7 @@ resource "aws_instance" "mmaster" {
subnet_id = "${element(split(",", module.vpc.private_subnets), count.index)}"
security_groups = ["${module.sg-default.security_group_id}"]
depends_on = ["aws_instance.bastion"]
user_data = "${template_file.master_cloud_init.rendered}"
user_data = "${data.template_file.master_cloud_init.rendered}"
tags = {
Name = "kube-master-${count.index}"
role = "masters"
Expand Down
6 changes: 3 additions & 3 deletions terraform/aws/private-cloud/workers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ module "worker_ami" {
virttype = "${module.worker_amitype.prefer_hvm}"
}

resource "template_file" "worker_cloud_init" {
data "template_file" "worker_cloud_init" {
template = "worker-cloud-config.yml.tpl"
depends_on = ["template_file.etcd_discovery_url"]
depends_on = ["null_resource.etcd_discovery_url"]
vars {
etcd_discovery_url = "${file(var.etcd_discovery_url_file)}"
size = "${var.masters}"
Expand All @@ -33,7 +33,7 @@ resource "aws_instance" "worker" {
subnet_id = "${element(split(",", module.vpc.private_subnets), count.index)}"
security_groups = ["${module.sg-default.security_group_id}"]
depends_on = ["aws_instance.bastion", "aws_instance.master"]
user_data = "${template_file.master_cloud_init.rendered}"
user_data = "${data.template_file.master_cloud_init.rendered}"
tags = {
Name = "kube-worker-${count.index}"
role = "workers"
Expand Down
16 changes: 8 additions & 8 deletions terraform/aws/public-cloud/edge-routers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ module "edge-router_ami" {
virttype = "${module.edge-router_amitype.prefer_hvm}"
}

resource "template_file" "edge-router_cloud_init" {
data "template_file" "edge-router_cloud_init" {
template = "${file("worker-cloud-config.yml.tpl")}"
depends_on = ["template_file.etcd_discovery_url"]
depends_on = ["null_resource.etcd_discovery_url"]
vars {
etcd_discovery_url = "${file(var.etcd_discovery_url_file)}"
size = "${var.masters}"
region = "${var.region}"
etcd_ca = "${replace(module.ca.ca_cert_pem, \"\n\", \"\\n\")}"
etcd_cert = "${replace(module.etcd_cert.etcd_cert_pem, \"\n\", \"\\n\")}"
etcd_key = "${replace(module.etcd_cert.etcd_private_key, \"\n\", \"\\n\")}"
etcd_ca = "${replace(module.ca.ca_cert_pem, "\n", "\\n")}"
etcd_cert = "${replace(module.etcd_cert.etcd_cert_pem, "\n", "\\n")}"
etcd_key = "${replace(module.etcd_cert.etcd_private_key, "\n", "\\n")}"
}
}

Expand All @@ -29,11 +29,11 @@ resource "aws_instance" "edge-router" {
iam_instance_profile = "${module.iam.edge-router_profile_name}"
count = "${var.edge-routers}"
key_name = "${module.aws-keypair.keypair_name}"
subnet_id = "${element(split(",", module.public_subnet.subnet_ids), count.index)}"
subnet_id = "${element(module.public_subnet.subnet_ids, count.index)}"
source_dest_check = false
security_groups = ["${module.sg-default.security_group_id}"]
vpc_security_group_ids = ["${module.sg-default.security_group_id}"]
depends_on = ["aws_instance.master"]
user_data = "${template_file.edge-router_cloud_init.rendered}"
user_data = "${data.template_file.edge-router_cloud_init.rendered}"
tags = {
Name = "kube-edge-router-${count.index}"
role = "edge-routers"
Expand Down
1 change: 0 additions & 1 deletion terraform/aws/public-cloud/etcd_discovery_url.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
https://discovery.etcd.io/5a6cb41d2a91517447cb738d7e2cf898
79 changes: 45 additions & 34 deletions terraform/aws/public-cloud/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,17 @@ variable "access_key" {}
variable "secret_key" {}
variable "organization" { default = "kubeform" }
variable "region" { default = "eu-west-1" }
variable "availability_zones" { default = "eu-west-1a,eu-west-1b,eu-west-1c" }

# length(availability_zones) must == length(vpc_public_cidrs_list)
variable "availability_zones" {
type = "list"
default = [ "eu-west-1a", "eu-west-1b", "eu-west-1c" ]
}
variable "vpc_public_cidrs_list" {
type = "list"
default = [ "10.0.1.0/24", "10.0.2.0/24", "10.0.3.0/24" ]
}

variable "coreos_channel" { default = "alpha" }
variable "etcd_discovery_url_file" { default = "etcd_discovery_url.txt" }
variable "masters" { default = "3" }
Expand All @@ -25,6 +35,9 @@ resource "aws_vpc" "default" {
cidr_block = "${var.vpc_cidr_block}"
enable_dns_support = true
enable_dns_hostnames = true
tags {
Name = "${var.organization} VPC"
}
lifecycle {
create_before_destroy = true
}
Expand All @@ -51,27 +64,27 @@ module "aws-keypair" {

# certificates
module "ca" {
source = "github.com/Capgemini/tf_tls/ca"
source = "github.com/tamsky/tf_tls/ca"
organization = "${var.organization}"
ca_count = "${var.masters + var.workers + var.edge-routers}"
deploy_ssh_hosts = "${concat(aws_instance.edge-router.*.public_ip, concat(aws_instance.master.*.public_ip, aws_instance.worker.*.public_ip))}"
deploy_ssh_hosts = [ "${concat(aws_instance.edge-router.*.public_ip, concat(aws_instance.master.*.public_ip, aws_instance.worker.*.public_ip))}" ]
ssh_user = "core"
ssh_private_key = "${tls_private_key.ssh.private_key_pem}"
}

module "etcd_cert" {
source = "github.com/Capgemini/tf_tls/etcd"
source = "github.com/tamsky/tf_tls/etcd"
ca_cert_pem = "${module.ca.ca_cert_pem}"
ca_private_key_pem = "${module.ca.ca_private_key_pem}"
}

module "kube_master_certs" {
source = "github.com/Capgemini/tf_tls/kubernetes/master"
source = "github.com/tamsky/tf_tls/kubernetes/master"
ca_cert_pem = "${module.ca.ca_cert_pem}"
ca_private_key_pem = "${module.ca.ca_private_key_pem}"
ip_addresses = "${concat(aws_instance.master.*.private_ip, aws_instance.master.*.public_ip)}"
dns_names = "${compact(module.master_elb.elb_dns_name)}"
deploy_ssh_hosts = "${compact(aws_instance.master.*.public_ip)}"
ip_addresses = [ "${concat(aws_instance.master.*.private_ip, aws_instance.master.*.public_ip)}" ]
dns_names = [ "${module.master_elb.elb_dns_name}" ]
deploy_ssh_hosts = [ "${aws_instance.master.*.public_ip}" ]
master_count = "${var.masters}"
validity_period_hours = "8760"
early_renewal_hours = "720"
Expand All @@ -80,11 +93,11 @@ module "kube_master_certs" {
}

module "kube_kubelet_certs" {
source = "github.com/Capgemini/tf_tls/kubernetes/kubelet"
source = "github.com/tamsky/tf_tls/kubernetes/kubelet"
ca_cert_pem = "${module.ca.ca_cert_pem}"
ca_private_key_pem = "${module.ca.ca_private_key_pem}"
ip_addresses = "${concat(aws_instance.edge-router.*.private_ip, concat(aws_instance.master.*.private_ip, aws_instance.worker.*.private_ip))}"
deploy_ssh_hosts = "${concat(aws_instance.edge-router.*.public_ip, concat(aws_instance.master.*.public_ip, aws_instance.worker.*.public_ip))}"
ip_addresses = [ "${concat(aws_instance.edge-router.*.private_ip, concat(aws_instance.master.*.private_ip, aws_instance.worker.*.private_ip))}" ]
deploy_ssh_hosts = [ "${concat(aws_instance.edge-router.*.public_ip, concat(aws_instance.master.*.public_ip, aws_instance.worker.*.public_ip))}" ]
kubelet_count = "${var.masters + var.workers + var.edge-routers}"
validity_period_hours = "8760"
early_renewal_hours = "720"
Expand All @@ -93,35 +106,35 @@ module "kube_kubelet_certs" {
}

module "kube_admin_cert" {
source = "github.com/Capgemini/tf_tls/kubernetes/admin"
source = "github.com/tamsky/tf_tls/kubernetes/admin"
ca_cert_pem = "${module.ca.ca_cert_pem}"
ca_private_key_pem = "${module.ca.ca_private_key_pem}"
kubectl_server_ip = "${module.master_elb.elb_dns_name}"
}

module "docker_daemon_certs" {
source = "github.com/Capgemini/tf_tls/docker/daemon"
source = "github.com/tamsky/tf_tls/docker/daemon"
ca_cert_pem = "${module.ca.ca_cert_pem}"
ca_private_key_pem = "${module.ca.ca_private_key_pem}"
ip_addresses_list = "${concat(aws_instance.edge-router.*.private_ip, concat(aws_instance.master.*.private_ip, aws_instance.worker.*.private_ip))}"
deploy_ssh_hosts = "${concat(aws_instance.edge-router.*.public_ip, concat(aws_instance.master.*.public_ip, aws_instance.worker.*.public_ip))}"
ip_addresses_list = [ "${concat(aws_instance.edge-router.*.private_ip, concat(aws_instance.master.*.private_ip, aws_instance.worker.*.private_ip))}" ]
deploy_ssh_hosts = [ "${concat(aws_instance.edge-router.*.public_ip, concat(aws_instance.master.*.public_ip, aws_instance.worker.*.public_ip))}" ]
docker_daemon_count = "${var.masters + var.workers + var.edge-routers}"
private_key = "${tls_private_key.ssh.private_key_pem}"
validity_period_hours = 8760
early_renewal_hours = 720
validity_period_hours = "8760"
early_renewal_hours = "720"
user = "core"
}

module "docker_client_certs" {
source = "github.com/Capgemini/tf_tls/docker/client"
source = "github.com/tamsky/tf_tls/docker/client"
ca_cert_pem = "${module.ca.ca_cert_pem}"
ca_private_key_pem = "${module.ca.ca_private_key_pem}"
ip_addresses_list = "${concat(aws_instance.edge-router.*.private_ip, concat(aws_instance.master.*.private_ip, aws_instance.worker.*.private_ip))}"
deploy_ssh_hosts = "${concat(aws_instance.edge-router.*.public_ip, concat(aws_instance.master.*.public_ip, aws_instance.worker.*.public_ip))}"
ip_addresses_list = [ "${concat(aws_instance.edge-router.*.private_ip, concat(aws_instance.master.*.private_ip, aws_instance.worker.*.private_ip))}" ]
deploy_ssh_hosts = [ "${concat(aws_instance.edge-router.*.public_ip, concat(aws_instance.master.*.public_ip, aws_instance.worker.*.public_ip))}" ]
docker_client_count = "${var.masters + var.workers + var.edge-routers}"
private_key = "${tls_private_key.ssh.private_key_pem}"
validity_period_hours = 8760
early_renewal_hours = 720
validity_period_hours = "8760"
early_renewal_hours = "720"
user = "core"
}

Expand All @@ -134,10 +147,10 @@ module "igw" {

# public subnets
module "public_subnet" {
source = "github.com/terraform-community-modules/tf_aws_public_subnet?ref=b7659c06cba6a545b83f569bc73560b266e6c9c1"
source = "github.com/terraform-community-modules/tf_aws_public_subnet"
name = "public"
cidrs = "10.0.1.0/24,10.0.2.0/24,10.0.3.0/24"
azs = "${var.availability_zones}"
cidrs = [ "${var.vpc_public_cidrs_list}" ]
azs = [ "${var.availability_zones}" ]
vpc_id = "${aws_vpc.default.id}"
igw_id = "${module.igw.igw_id}"
}
Expand All @@ -154,13 +167,11 @@ module "iam" {
}

# Generate an etcd URL for the cluster
resource "template_file" "etcd_discovery_url" {
template = "${file("/dev/null")}"
provisioner "local-exec" {
command = "curl https://discovery.etcd.io/new?size=${var.masters} > ${var.etcd_discovery_url_file}"
}
# This will regenerate the discovery URL if the cluster size changes
vars {
size = "${var.masters}"
}
resource "null_resource" "etcd_discovery_url" {
provisioner "local-exec" {
command = "curl -s https://discovery.etcd.io/new?size=${var.masters} > ${var.etcd_discovery_url_file}"
}

# To change the cluster size of an existing live cluster, please read:
# https://coreos.com/etcd/docs/latest/etcd-live-cluster-reconfiguration.html
}
Loading