Skip to content
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.

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

Added new terraform-bin plugin and updated templates to 0.12.6 #418

Merged
merged 8 commits into from
Aug 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion core/src/epicli/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ boto3 = "*"
jsonschema = "*"
python-json-logger = "*"
ansible = "*"
terraform-binary = "*"
terraform-bin = "*"

[requires]
python_version = "3.7"
99 changes: 50 additions & 49 deletions core/src/epicli/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ name: default
specification:
name: SET_BY_AUTOMATION
token: SET_BY_AUTOMATION
encrypted: True
encrypted: true
performance_mode: "generalPurpose"
throughput_mode: "bursting"
#provisioned_throughput_in_mibps: # The throughput, measured in MiB/s, that you want to provision for the file system. Only applicable when throughput_mode set to provisioned
mount_targets: [] #TO_BET_SET
# - name: mount-name
# subnet_name: source_subnet_name
security:
populate_sg_rules: True # when set to true, security group for EFS will allow traffic from other clusters, groups
populate_sg_rules: true # when set to true, security group for EFS will allow traffic from other clusters, groups

Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ specification:
availability_zones: [] # specified automatically - based on subnet az's
launch_configuration: SET_BY_AUTOMATION
cluster_name: SET_BY_AUTOMATION
authorized_to_efs: False
mount_efs: False
authorized_to_efs: false
mount_efs: false
tags:
- version: 0.3.0
size: t2.micro
Expand Down Expand Up @@ -71,8 +71,8 @@ provider: aws
name: kubernetes-master-machine
specification:
size: t3.medium
authorized_to_efs: True
mount_efs: True
authorized_to_efs: true
mount_efs: true
security:
rules:
- name: ssh
Expand Down Expand Up @@ -151,8 +151,8 @@ provider: aws
name: kubernetes-node-machine
specification:
size: t3.medium
authorized_to_efs: True
mount_efs: True
authorized_to_efs: true
mount_efs: true
security:
rules:
- name: ssh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

resource "aws_efs_file_system" "{{ specification.name }}" {
creation_token = "{{ specification.token }}"
encrypted = "{{ specification.encrypted }}"
encrypted = "{{ specification.encrypted | lower }}"
performance_mode = "{{ specification.performance_mode }}"
throughput_mode = "{{ specification.throughput_mode }}"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
resource "aws_internet_gateway" "{{ specification.name }}" {
vpc_id = "${aws_vpc.{{ specification.vpc_name }}.id}"

tags {
tags = {
Name = "{{ specification.name }}"
cluster_name = "{{ specification.cluster_name }}"
cluster_version = "{{ version }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ resource "aws_launch_configuration" "{{ specification.name }}" {
name = "{{ specification.name }}"
image_id = "{{ specification.image_id }}"
instance_type = "{{ specification.size }}"
associate_public_ip_address = "{{ specification.associate_public_ip }}"
associate_public_ip_address = "{{ specification.associate_public_ip | lower }}"

# Security group
security_groups = [{% for security_group in specification.security_groups %} "${aws_security_group.{{ security_group }}.id}" {% if not loop.last %}, {% endif %} {% endfor %}]
enable_monitoring = "{{ specification.enable_monitoring }}"
enable_monitoring = "{{ specification.enable_monitoring | lower }}"
key_name = "{{ specification.key_name }}"

ebs_optimized = "{{ specification.ebs_optimized }}"
ebs_optimized = "{{ specification.ebs_optimized | lower }}"
root_block_device {
volume_type = "{{ specification.disks.root.volume_type }}"
volume_size = "{{ specification.disks.root.volume_size }}"
delete_on_termination = "{{ specification.disks.root.delete_on_termination }}"
delete_on_termination = "{{ specification.disks.root.delete_on_termination | lower }}"
}

{% for disk in specification.disks.additional_disks %}
Expand All @@ -35,8 +35,8 @@ resource "aws_launch_configuration" "{{ specification.name }}" {
device_name = "{{ disk.device_name }}"
volume_type = "{{ disk.volume_type }}"
volume_size = "{{ disk.volume_size }}"
encrypted = "{{ disk.encrypted }}"
delete_on_termination = "{{ disk.delete_on_termination }}"
encrypted = "{{ disk.encrypted | lower }}"
delete_on_termination = "{{ disk.delete_on_termination | lower }}"
}

{%- endfor %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ resource "aws_route_table" "{{ specification.name }}" {
gateway_id = "${ aws_internet_gateway.{{ specification.route.gateway_name }}.id}"
}

tags {
tags = {
Name = "web-table"
cluster_name = "{{ specification.cluster_name }}"
cluster_version = "{{ version }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ resource "aws_security_group" "{{ specification.name }}" {
vpc_id = "${aws_vpc.{{ specification.vpc_name }}.id}"


tags {
tags = {
cluster_name = "{{ specification.cluster_name }}"
cluster_version = "{{ version }}"
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/epicli/data/aws/terraform/infrastructure/vpc.j2
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ resource "aws_vpc" "{{ specification.name }}" {
enable_dns_support = "true"
enable_dns_hostnames = "true"

tags {
tags = {
Name = "{{ specification.name }}"
cluster_name = "{{ specification.cluster_name }}"
cluster_version = "{{ version }}"
Expand Down