Update terraform/aws to support terraform version 0.7.x - #172
Conversation
* includes changes from Capgemini#86 * Fix nested quotes for terraform 0.7.x * Use template_file as data resource for terraform 0.7.x * Convert etcd_discovery_url to null_resource 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. * separate out vpc_public_cidrs_list and move it next to dependent list of AZs * aws_instance: fix subnet_id * convert security_groups -> vpc_security_group_ids * tag aws_vpc with org Name * add empty etcd_discovery_url.txt
| ### Provision the cluster infrastructure | ||
|
|
||
| ``` | ||
| cd /tmp/kubeform/terraform/aws/public-cloud |
There was a problem hiding this comment.
This step terraform apply -target=null_resource.etcd_discovery_url is not necessary, we can remove this. We need to add the new terraform version requirement in this file.
For squashing I usually use git rebase -i you can also use git merge --squash or something like https://github.com/tj/git-extras/blob/master/Commands.md#git-squash, or just recreate your local branch as you must have done here, then you need to git push --force against your branch when you are sure you want to override it
There was a problem hiding this comment.
Since most blocks already do, I thought it would be an improvement to always start each shell block with a cd. Removed.
Requirement at the top updated. I picked 0.7.11 since that's what I tested with.
|
@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. |
|
Hey @tamsky thanks for the suggestion! I'm sorry if my last comment here bea1781 was confuse, the bit that we should remove is |
|
Removed manual step.
I agree! Squash & merge away. |
| } | ||
|
|
||
| # This will regenerate the discovery URL if the cluster size changes | ||
| triggers { |
There was a problem hiding this comment.
do we want to remove this from the private-cloud tree as well?
There was a problem hiding this comment.
yes please, lets keep both aligned for consistency.
…s changes to public-cloud
|
I have updated the private-cloud tree with the changes I was able to identify.
Also found this syntax/typo that probably should have been caught before by any test that ran Given that there is no README for this directory, I'm not testing @enxebre please test Thanks! |
|
@enxebre also, what do you want to do regarding the https://github.com/tamsky/kubeform/blob/terraform-0.7.x/terraform/aws/private-cloud/main.tf#L80-L95 |
|
@tamsky this is good to go. thanks for contributing! |
2 participants
supersedes #171
/cc @enxebre