Browse Source
Run terraform fmt and add step to CI (#4405)
Run terraform fmt and add step to CI (#4405)
* Run terraform fmt
* Add terraform fmt to .terraform-validate CI step
* Add tf-validate-aws CI step
* Revert "Add tf-validate-aws CI step"
This reverts commit e007225fac.
pull/4463/head
Andreas Holmsten
6 years ago
committed by
Kubernetes Prow Robot
Kubernetes Prow Robot
16 changed files with 233 additions and 263 deletions
Split View
Diff Options
-
1.gitlab-ci.yml
-
156contrib/terraform/aws/create-infrastructure.tf
-
55contrib/terraform/aws/modules/elb/main.tf
-
4contrib/terraform/aws/modules/elb/outputs.tf
-
23contrib/terraform/aws/modules/elb/variables.tf
-
33contrib/terraform/aws/modules/iam/main.tf
-
4contrib/terraform/aws/modules/iam/outputs.tf
-
2contrib/terraform/aws/modules/iam/variables.tf
-
134contrib/terraform/aws/modules/vpc/main.tf
-
12contrib/terraform/aws/modules/vpc/outputs.tf
-
16contrib/terraform/aws/modules/vpc/variables.tf
-
15contrib/terraform/aws/output.tf
-
24contrib/terraform/aws/variables.tf
-
4contrib/terraform/packet/kubespray.tf
-
8contrib/terraform/packet/output.tf
-
5contrib/terraform/packet/sample-inventory/cluster.tf
@ -1,7 +1,7 @@ |
|||
output "aws_elb_api_id" { |
|||
value = "${aws_elb.aws-elb-api.id}" |
|||
value = "${aws_elb.aws-elb-api.id}" |
|||
} |
|||
|
|||
output "aws_elb_api_fqdn" { |
|||
value = "${aws_elb.aws-elb-api.dns_name}" |
|||
value = "${aws_elb.aws-elb-api.dns_name}" |
|||
} |
|||
@ -1,33 +1,30 @@ |
|||
variable "aws_cluster_name" { |
|||
description = "Name of Cluster" |
|||
description = "Name of Cluster" |
|||
} |
|||
|
|||
variable "aws_vpc_id" { |
|||
description = "AWS VPC ID" |
|||
description = "AWS VPC ID" |
|||
} |
|||
|
|||
variable "aws_elb_api_port" { |
|||
description = "Port for AWS ELB" |
|||
description = "Port for AWS ELB" |
|||
} |
|||
|
|||
variable "k8s_secure_api_port" { |
|||
description = "Secure Port of K8S API Server" |
|||
description = "Secure Port of K8S API Server" |
|||
} |
|||
|
|||
|
|||
|
|||
variable "aws_avail_zones" { |
|||
description = "Availability Zones Used" |
|||
type = "list" |
|||
description = "Availability Zones Used" |
|||
type = "list" |
|||
} |
|||
|
|||
|
|||
variable "aws_subnet_ids_public" { |
|||
description = "IDs of Public Subnets" |
|||
type = "list" |
|||
description = "IDs of Public Subnets" |
|||
type = "list" |
|||
} |
|||
|
|||
variable "default_tags" { |
|||
description = "Tags for all resources" |
|||
type = "map" |
|||
description = "Tags for all resources" |
|||
type = "map" |
|||
} |
|||
@ -1,7 +1,7 @@ |
|||
output "kube-master-profile" { |
|||
value = "${aws_iam_instance_profile.kube-master.name }" |
|||
value = "${aws_iam_instance_profile.kube-master.name }" |
|||
} |
|||
|
|||
output "kube-worker-profile" { |
|||
value = "${aws_iam_instance_profile.kube-worker.name }" |
|||
value = "${aws_iam_instance_profile.kube-worker.name }" |
|||
} |
|||
@ -1,3 +1,3 @@ |
|||
variable "aws_cluster_name" { |
|||
description = "Name of Cluster" |
|||
description = "Name of Cluster" |
|||
} |
|||
@ -1,21 +1,19 @@ |
|||
output "aws_vpc_id" { |
|||
value = "${aws_vpc.cluster-vpc.id}" |
|||
value = "${aws_vpc.cluster-vpc.id}" |
|||
} |
|||
|
|||
output "aws_subnet_ids_private" { |
|||
value = ["${aws_subnet.cluster-vpc-subnets-private.*.id}"] |
|||
value = ["${aws_subnet.cluster-vpc-subnets-private.*.id}"] |
|||
} |
|||
|
|||
output "aws_subnet_ids_public" { |
|||
value = ["${aws_subnet.cluster-vpc-subnets-public.*.id}"] |
|||
value = ["${aws_subnet.cluster-vpc-subnets-public.*.id}"] |
|||
} |
|||
|
|||
output "aws_security_group" { |
|||
value = ["${aws_security_group.kubernetes.*.id}"] |
|||
|
|||
value = ["${aws_security_group.kubernetes.*.id}"] |
|||
} |
|||
|
|||
output "default_tags" { |
|||
value = "${var.default_tags}" |
|||
|
|||
value = "${var.default_tags}" |
|||
} |
|||
@ -1,29 +1,27 @@ |
|||
variable "aws_vpc_cidr_block" { |
|||
description = "CIDR Blocks for AWS VPC" |
|||
description = "CIDR Blocks for AWS VPC" |
|||
} |
|||
|
|||
|
|||
variable "aws_cluster_name" { |
|||
description = "Name of Cluster" |
|||
description = "Name of Cluster" |
|||
} |
|||
|
|||
|
|||
variable "aws_avail_zones" { |
|||
description = "AWS Availability Zones Used" |
|||
type = "list" |
|||
description = "AWS Availability Zones Used" |
|||
type = "list" |
|||
} |
|||
|
|||
variable "aws_cidr_subnets_private" { |
|||
description = "CIDR Blocks for private subnets in Availability zones" |
|||
type = "list" |
|||
type = "list" |
|||
} |
|||
|
|||
variable "aws_cidr_subnets_public" { |
|||
description = "CIDR Blocks for public subnets in Availability zones" |
|||
type = "list" |
|||
type = "list" |
|||
} |
|||
|
|||
variable "default_tags" { |
|||
description = "Default tags for all resources" |
|||
type = "map" |
|||
type = "map" |
|||
} |
|||
@ -1,28 +1,27 @@ |
|||
output "bastion_ip" { |
|||
value = "${join("\n", aws_instance.bastion-server.*.public_ip)}" |
|||
value = "${join("\n", aws_instance.bastion-server.*.public_ip)}" |
|||
} |
|||
|
|||
output "masters" { |
|||
value = "${join("\n", aws_instance.k8s-master.*.private_ip)}" |
|||
value = "${join("\n", aws_instance.k8s-master.*.private_ip)}" |
|||
} |
|||
|
|||
output "workers" { |
|||
value = "${join("\n", aws_instance.k8s-worker.*.private_ip)}" |
|||
value = "${join("\n", aws_instance.k8s-worker.*.private_ip)}" |
|||
} |
|||
|
|||
output "etcd" { |
|||
value = "${join("\n", aws_instance.k8s-etcd.*.private_ip)}" |
|||
value = "${join("\n", aws_instance.k8s-etcd.*.private_ip)}" |
|||
} |
|||
|
|||
|
|||
output "aws_elb_api_fqdn" { |
|||
value = "${module.aws-elb.aws_elb_api_fqdn}:${var.aws_elb_api_port}" |
|||
value = "${module.aws-elb.aws_elb_api_fqdn}:${var.aws_elb_api_port}" |
|||
} |
|||
|
|||
output "inventory" { |
|||
value = "${data.template_file.inventory.rendered}" |
|||
value = "${data.template_file.inventory.rendered}" |
|||
} |
|||
|
|||
output "default_tags" { |
|||
value = "${var.default_tags}" |
|||
value = "${var.default_tags}" |
|||
} |
|||
@ -1,15 +1,15 @@ |
|||
output "k8s_masters" { |
|||
value = "${packet_device.k8s_master.*.access_public_ipv4}" |
|||
value = "${packet_device.k8s_master.*.access_public_ipv4}" |
|||
} |
|||
|
|||
output "k8s_masters_no_etc" { |
|||
value = "${packet_device.k8s_master_no_etcd.*.access_public_ipv4}" |
|||
value = "${packet_device.k8s_master_no_etcd.*.access_public_ipv4}" |
|||
} |
|||
|
|||
output "k8s_etcds" { |
|||
value = "${packet_device.k8s_etcd.*.access_public_ipv4}" |
|||
value = "${packet_device.k8s_etcd.*.access_public_ipv4}" |
|||
} |
|||
|
|||
output "k8s_nodes" { |
|||
value = "${packet_device.k8s_node.*.access_public_ipv4}" |
|||
value = "${packet_device.k8s_node.*.access_public_ipv4}" |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save