search

Capgemini / kubeform

Form your :boat: Kubernetes :anchor: cluster anywhere using CoreOS, Terraform and Ansible
https://capgemini.github.io/kubeform
MIT License
326 stars 57 forks source link

Update terraform/aws to support terraform version 0.7.x #172

Closed tamsky closed 7 years ago

tamsky commented 7 years ago

supersedes #171

/cc @enxebre

tamsky commented 7 years ago

@enxebre I've granted permission for you to commit to this branch in my repo, if you'd prefer to make any further edits.

Also suggest checking out github's "Squash & Merge" option if you'd like to keep the commit history clean.

enxebre commented 7 years ago

Hey @tamsky thanks for the suggestion! I'm sorry if my last comment here https://github.com/Capgemini/kubeform/pull/172/commits/bea178174958845c1aba0a274efcd40c13d6a4b8 was confuse, the bit that we should remove is terraform apply -target=null_resource.etcd_discovery_url We don't need that step. The file is already in the repo, so "${file(var.etcd_discovery_url_file)}" won't complain when creating the resource graph. Then the null resource will populate the file with the right value right before creating the new vm at execution time. Don't you agree? After that we can merge!

tamsky commented 7 years ago

Removed manual step.

Don't you agree?

I agree! Just tested now. LGTM.

Squash & merge away.

tamsky commented 7 years ago

I have updated the private-cloud tree with the changes I was able to identify.

terraform plan now runs cleanly.

Also found this syntax/typo that probably should have been caught before by any test that ran terraform plan.

Given that there is no README for this directory, I'm not testing terraform apply

@enxebre please test private-cloud if your org is still using that directory.

Thanks!

tamsky commented 7 years ago

@enxebre also, what do you want to do regarding the outputs that exist in private-cloud but are missing from public-cloud:

https://github.com/tamsky/kubeform/blob/terraform-0.7.x/terraform/aws/private-cloud/main.tf#L80-L95

enxebre commented 7 years ago

@tamsky this is good to go. thanks for contributing!