kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3041 from justinsb/it_shared_vpc_and_subnet 

Automatic merge from submit-queue

Add integration tests for shared subnet & VPC
This commit is contained in:
Kubernetes Submit Queue 2017-08-18 15:55:53 -07:00 committed by GitHub
parent df4aa41322 64f0920c8b
commit a3fdefa74c
8 changed files with 864 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/kops/integration_test.go
View File

@ -107,6 +107,16 @@ func TestPrivateDns2(t *testing.T) {
runTest(t, "privatedns2.example.com", "../../tests/integration/privatedns2", "v1alpha2", true, 1)
}
// TestSharedSubnet runs the test on a configuration with a shared subnet (and VPC)
func TestSharedSubnet(t *testing.T) {
runTest(t, "sharedsubnet.example.com", "../../tests/integration/shared_subnet", "v1alpha2", false, 1)
}
// TestSharedVPC runs the test on a configuration with a shared VPC
func TestSharedVPC(t *testing.T) {
runTest(t, "sharedvpc.example.com", "../../tests/integration/shared_vpc", "v1alpha2", false, 1)
}
func runTest(t *testing.T, clusterName string, srcDir string, version string, private bool, zones int) {
var stdout bytes.Buffer

1
tests/integration/shared_subnet/id_rsa.pub Executable file
View File

@ -0,0 +1 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ==

79
tests/integration/shared_subnet/in-v1alpha2.yaml Normal file
View File

@ -0,0 +1,79 @@
apiVersion: kops/v1alpha2
kind: Cluster
metadata:
creationTimestamp: "2016-12-10T22:42:27Z"
name: sharedsubnet.example.com
spec:
kubernetesApiAccess:
- 0.0.0.0/0
channel: stable
cloudProvider: aws
configBase: memfs://clusters.example.com/sharedsubnet.example.com
etcdClusters:
- etcdMembers:
- instanceGroup: master-us-test-1a
name: us-test-1a
name: main
- etcdMembers:
- instanceGroup: master-us-test-1a
name: us-test-1a
name: events
kubernetesVersion: v1.4.6
masterInternalName: api.internal.sharedsubnet.example.com
masterPublicName: api.sharedsubnet.example.com
networkCIDR: 172.20.0.0/16
networkID: vpc-12345678
networking:
kubenet: {}
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
subnets:
- cidr: 172.20.32.0/19
id: subnet-12345678
name: us-test-1a
type: Public
zone: us-test-1a
topology:
masters: public
nodes: public
---
apiVersion: kops/v1alpha2
kind: InstanceGroup
metadata:
creationTimestamp: "2016-12-10T22:42:28Z"
name: nodes
labels:
kops.k8s.io/cluster: sharedsubnet.example.com
spec:
associatePublicIp: true
image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
machineType: t2.medium
maxSize: 2
minSize: 2
role: Node
subnets:
- us-test-1a
---
apiVersion: kops/v1alpha2
kind: InstanceGroup
metadata:
creationTimestamp: "2016-12-10T22:42:28Z"
name: master-us-test-1a
labels:
kops.k8s.io/cluster: sharedsubnet.example.com
spec:
associatePublicIp: true
image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
machineType: m3.medium
maxSize: 1
minSize: 1
role: Master
subnets:
- us-test-1a

332
tests/integration/shared_subnet/kubernetes.tf Normal file
View File

@ -0,0 +1,332 @@
output "cluster_name" {
value = "sharedsubnet.example.com"
}
output "master_security_group_ids" {
value = ["${aws_security_group.masters-sharedsubnet-example-com.id}"]
}
output "masters_role_arn" {
value = "${aws_iam_role.masters-sharedsubnet-example-com.arn}"
}
output "masters_role_name" {
value = "${aws_iam_role.masters-sharedsubnet-example-com.name}"
}
output "node_security_group_ids" {
value = ["${aws_security_group.nodes-sharedsubnet-example-com.id}"]
}
output "node_subnet_ids" {
value = ["subnet-12345678"]
}
output "nodes_role_arn" {
value = "${aws_iam_role.nodes-sharedsubnet-example-com.arn}"
}
output "nodes_role_name" {
value = "${aws_iam_role.nodes-sharedsubnet-example-com.name}"
}
output "region" {
value = "us-test-1"
}
output "subnet_ids" {
value = ["subnet-12345678"]
}
output "vpc_id" {
value = "vpc-12345678"
}
resource "aws_autoscaling_group" "master-us-test-1a-masters-sharedsubnet-example-com" {
name = "master-us-test-1a.masters.sharedsubnet.example.com"
launch_configuration = "${aws_launch_configuration.master-us-test-1a-masters-sharedsubnet-example-com.id}"
max_size = 1
min_size = 1
vpc_zone_identifier = ["subnet-12345678"]
tag = {
key = "KubernetesCluster"
value = "sharedsubnet.example.com"
propagate_at_launch = true
}
tag = {
key = "Name"
value = "master-us-test-1a.masters.sharedsubnet.example.com"
propagate_at_launch = true
}
tag = {
key = "k8s.io/role/master"
value = "1"
propagate_at_launch = true
}
}
resource "aws_autoscaling_group" "nodes-sharedsubnet-example-com" {
name = "nodes.sharedsubnet.example.com"
launch_configuration = "${aws_launch_configuration.nodes-sharedsubnet-example-com.id}"
max_size = 2
min_size = 2
vpc_zone_identifier = ["subnet-12345678"]
tag = {
key = "KubernetesCluster"
value = "sharedsubnet.example.com"
propagate_at_launch = true
}
tag = {
key = "Name"
value = "nodes.sharedsubnet.example.com"
propagate_at_launch = true
}
tag = {
key = "k8s.io/role/node"
value = "1"
propagate_at_launch = true
}
}
resource "aws_ebs_volume" "us-test-1a-etcd-events-sharedsubnet-example-com" {
availability_zone = "us-test-1a"
size = 20
type = "gp2"
encrypted = false
tags = {
KubernetesCluster = "sharedsubnet.example.com"
Name = "us-test-1a.etcd-events.sharedsubnet.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
}
}
resource "aws_ebs_volume" "us-test-1a-etcd-main-sharedsubnet-example-com" {
availability_zone = "us-test-1a"
size = 20
type = "gp2"
encrypted = false
tags = {
KubernetesCluster = "sharedsubnet.example.com"
Name = "us-test-1a.etcd-main.sharedsubnet.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
}
}
resource "aws_iam_instance_profile" "masters-sharedsubnet-example-com" {
name = "masters.sharedsubnet.example.com"
role = "${aws_iam_role.masters-sharedsubnet-example-com.name}"
}
resource "aws_iam_instance_profile" "nodes-sharedsubnet-example-com" {
name = "nodes.sharedsubnet.example.com"
role = "${aws_iam_role.nodes-sharedsubnet-example-com.name}"
}
resource "aws_iam_role" "masters-sharedsubnet-example-com" {
name = "masters.sharedsubnet.example.com"
assume_role_policy = "${file("${path.module}/data/aws_iam_role_masters.sharedsubnet.example.com_policy")}"
}
resource "aws_iam_role" "nodes-sharedsubnet-example-com" {
name = "nodes.sharedsubnet.example.com"
assume_role_policy = "${file("${path.module}/data/aws_iam_role_nodes.sharedsubnet.example.com_policy")}"
}
resource "aws_iam_role_policy" "masters-sharedsubnet-example-com" {
name = "masters.sharedsubnet.example.com"
role = "${aws_iam_role.masters-sharedsubnet-example-com.name}"
policy = "${file("${path.module}/data/aws_iam_role_policy_masters.sharedsubnet.example.com_policy")}"
}
resource "aws_iam_role_policy" "nodes-sharedsubnet-example-com" {
name = "nodes.sharedsubnet.example.com"
role = "${aws_iam_role.nodes-sharedsubnet-example-com.name}"
policy = "${file("${path.module}/data/aws_iam_role_policy_nodes.sharedsubnet.example.com_policy")}"
}
resource "aws_key_pair" "kubernetes-sharedsubnet-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157" {
key_name = "kubernetes.sharedsubnet.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57"
public_key = "${file("${path.module}/data/aws_key_pair_kubernetes.sharedsubnet.example.com-c4a6ed9aa889b9e2c39cd663eb9c7157_public_key")}"
}
resource "aws_launch_configuration" "master-us-test-1a-masters-sharedsubnet-example-com" {
name_prefix = "master-us-test-1a.masters.sharedsubnet.example.com-"
image_id = "ami-12345678"
instance_type = "m3.medium"
key_name = "${aws_key_pair.kubernetes-sharedsubnet-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id}"
iam_instance_profile = "${aws_iam_instance_profile.masters-sharedsubnet-example-com.id}"
security_groups = ["${aws_security_group.masters-sharedsubnet-example-com.id}"]
associate_public_ip_address = true
user_data = "${file("${path.module}/data/aws_launch_configuration_master-us-test-1a.masters.sharedsubnet.example.com_user_data")}"
root_block_device = {
volume_type = "gp2"
volume_size = 64
delete_on_termination = true
}
ephemeral_block_device = {
device_name = "/dev/sdc"
virtual_name = "ephemeral0"
}
lifecycle = {
create_before_destroy = true
}
}
resource "aws_launch_configuration" "nodes-sharedsubnet-example-com" {
name_prefix = "nodes.sharedsubnet.example.com-"
image_id = "ami-12345678"
instance_type = "t2.medium"
key_name = "${aws_key_pair.kubernetes-sharedsubnet-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id}"
iam_instance_profile = "${aws_iam_instance_profile.nodes-sharedsubnet-example-com.id}"
security_groups = ["${aws_security_group.nodes-sharedsubnet-example-com.id}"]
associate_public_ip_address = true
user_data = "${file("${path.module}/data/aws_launch_configuration_nodes.sharedsubnet.example.com_user_data")}"
root_block_device = {
volume_type = "gp2"
volume_size = 128
delete_on_termination = true
}
lifecycle = {
create_before_destroy = true
}
}
resource "aws_security_group" "masters-sharedsubnet-example-com" {
name = "masters.sharedsubnet.example.com"
vpc_id = "vpc-12345678"
description = "Security group for masters"
tags = {
KubernetesCluster = "sharedsubnet.example.com"
Name = "masters.sharedsubnet.example.com"
}
}
resource "aws_security_group" "nodes-sharedsubnet-example-com" {
name = "nodes.sharedsubnet.example.com"
vpc_id = "vpc-12345678"
description = "Security group for nodes"
tags = {
KubernetesCluster = "sharedsubnet.example.com"
Name = "nodes.sharedsubnet.example.com"
}
}
resource "aws_security_group_rule" "all-master-to-master" {
type = "ingress"
security_group_id = "${aws_security_group.masters-sharedsubnet-example-com.id}"
source_security_group_id = "${aws_security_group.masters-sharedsubnet-example-com.id}"
from_port = 0
to_port = 0
protocol = "-1"
}
resource "aws_security_group_rule" "all-master-to-node" {
type = "ingress"
security_group_id = "${aws_security_group.nodes-sharedsubnet-example-com.id}"
source_security_group_id = "${aws_security_group.masters-sharedsubnet-example-com.id}"
from_port = 0
to_port = 0
protocol = "-1"
}
resource "aws_security_group_rule" "all-node-to-node" {
type = "ingress"
security_group_id = "${aws_security_group.nodes-sharedsubnet-example-com.id}"
source_security_group_id = "${aws_security_group.nodes-sharedsubnet-example-com.id}"
from_port = 0
to_port = 0
protocol = "-1"
}
resource "aws_security_group_rule" "https-external-to-master-0-0-0-0--0" {
type = "ingress"
security_group_id = "${aws_security_group.masters-sharedsubnet-example-com.id}"
from_port = 443
to_port = 443
protocol = "tcp"
cidr_blocks = ["0.0.0.0/0"]
}
resource "aws_security_group_rule" "master-egress" {
type = "egress"
security_group_id = "${aws_security_group.masters-sharedsubnet-example-com.id}"
from_port = 0
to_port = 0
protocol = "-1"
cidr_blocks = ["0.0.0.0/0"]
}
resource "aws_security_group_rule" "node-egress" {
type = "egress"
security_group_id = "${aws_security_group.nodes-sharedsubnet-example-com.id}"
from_port = 0
to_port = 0
protocol = "-1"
cidr_blocks = ["0.0.0.0/0"]
}
resource "aws_security_group_rule" "node-to-master-tcp-1-4000" {
type = "ingress"
security_group_id = "${aws_security_group.masters-sharedsubnet-example-com.id}"
source_security_group_id = "${aws_security_group.nodes-sharedsubnet-example-com.id}"
from_port = 1
to_port = 4000
protocol = "tcp"
}
resource "aws_security_group_rule" "node-to-master-tcp-4003-65535" {
type = "ingress"
security_group_id = "${aws_security_group.masters-sharedsubnet-example-com.id}"
source_security_group_id = "${aws_security_group.nodes-sharedsubnet-example-com.id}"
from_port = 4003
to_port = 65535
protocol = "tcp"
}
resource "aws_security_group_rule" "node-to-master-udp-1-65535" {
type = "ingress"
security_group_id = "${aws_security_group.masters-sharedsubnet-example-com.id}"
source_security_group_id = "${aws_security_group.nodes-sharedsubnet-example-com.id}"
from_port = 1
to_port = 65535
protocol = "udp"
}
resource "aws_security_group_rule" "ssh-external-to-master-0-0-0-0--0" {
type = "ingress"
security_group_id = "${aws_security_group.masters-sharedsubnet-example-com.id}"
from_port = 22
to_port = 22
protocol = "tcp"
cidr_blocks = ["0.0.0.0/0"]
}
resource "aws_security_group_rule" "ssh-external-to-node-0-0-0-0--0" {
type = "ingress"
security_group_id = "${aws_security_group.nodes-sharedsubnet-example-com.id}"
from_port = 22
to_port = 22
protocol = "tcp"
cidr_blocks = ["0.0.0.0/0"]
}
terraform = {
required_version = ">= 0.9.3"
}

1
tests/integration/shared_vpc/id_rsa.pub Executable file
View File

@ -0,0 +1 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCtWu40XQo8dczLsCq0OWV+hxm9uV3WxeH9Kgh4sMzQxNtoU1pvW0XdjpkBesRKGoolfWeCLXWxpyQb1IaiMkKoz7MdhQ/6UKjMjP66aFWWp3pwD0uj0HuJ7tq4gKHKRYGTaZIRWpzUiANBrjugVgA+Sd7E/mYwc/DMXkIyRZbvhQ==

78
tests/integration/shared_vpc/in-v1alpha2.yaml Normal file
View File

@ -0,0 +1,78 @@
apiVersion: kops/v1alpha2
kind: Cluster
metadata:
creationTimestamp: "2016-12-10T22:42:27Z"
name: sharedvpc.example.com
spec:
kubernetesApiAccess:
- 0.0.0.0/0
channel: stable
cloudProvider: aws
configBase: memfs://clusters.example.com/sharedvpc.example.com
etcdClusters:
- etcdMembers:
- instanceGroup: master-us-test-1a
name: us-test-1a
name: main
- etcdMembers:
- instanceGroup: master-us-test-1a
name: us-test-1a
name: events
kubernetesVersion: v1.4.6
masterInternalName: api.internal.sharedvpc.example.com
masterPublicName: api.sharedvpc.example.com
networkCIDR: 172.20.0.0/16
networkID: vpc-12345678
networking:
kubenet: {}
nonMasqueradeCIDR: 100.64.0.0/10
sshAccess:
- 0.0.0.0/0
subnets:
- cidr: 172.20.32.0/19
name: us-test-1a
type: Public
zone: us-test-1a
topology:
masters: public
nodes: public
---
apiVersion: kops/v1alpha2
kind: InstanceGroup
metadata:
creationTimestamp: "2016-12-10T22:42:28Z"
name: nodes
labels:
kops.k8s.io/cluster: sharedvpc.example.com
spec:
associatePublicIp: true
image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
machineType: t2.medium
maxSize: 2
minSize: 2
role: Node
subnets:
- us-test-1a
---
apiVersion: kops/v1alpha2
kind: InstanceGroup
metadata:
creationTimestamp: "2016-12-10T22:42:28Z"
name: master-us-test-1a
labels:
kops.k8s.io/cluster: sharedvpc.example.com
spec:
associatePublicIp: true
image: kope.io/k8s-1.4-debian-jessie-amd64-hvm-ebs-2016-10-21
machineType: m3.medium
maxSize: 1
minSize: 1
role: Master
subnets:
- us-test-1a

360
tests/integration/shared_vpc/kubernetes.tf Normal file
View File

@ -0,0 +1,360 @@
output "cluster_name" {
value = "sharedvpc.example.com"
}
output "master_security_group_ids" {
value = ["${aws_security_group.masters-sharedvpc-example-com.id}"]
}
output "masters_role_arn" {
value = "${aws_iam_role.masters-sharedvpc-example-com.arn}"
}
output "masters_role_name" {
value = "${aws_iam_role.masters-sharedvpc-example-com.name}"
}
output "node_security_group_ids" {
value = ["${aws_security_group.nodes-sharedvpc-example-com.id}"]
}
output "node_subnet_ids" {
value = ["${aws_subnet.us-test-1a-sharedvpc-example-com.id}"]
}
output "nodes_role_arn" {
value = "${aws_iam_role.nodes-sharedvpc-example-com.arn}"
}
output "nodes_role_name" {
value = "${aws_iam_role.nodes-sharedvpc-example-com.name}"
}
output "region" {
value = "us-test-1"
}
output "vpc_id" {
value = "vpc-12345678"
}
resource "aws_autoscaling_group" "master-us-test-1a-masters-sharedvpc-example-com" {
name = "master-us-test-1a.masters.sharedvpc.example.com"
launch_configuration = "${aws_launch_configuration.master-us-test-1a-masters-sharedvpc-example-com.id}"
max_size = 1
min_size = 1
vpc_zone_identifier = ["${aws_subnet.us-test-1a-sharedvpc-example-com.id}"]
tag = {
key = "KubernetesCluster"
value = "sharedvpc.example.com"
propagate_at_launch = true
}
tag = {
key = "Name"
value = "master-us-test-1a.masters.sharedvpc.example.com"
propagate_at_launch = true
}
tag = {
key = "k8s.io/role/master"
value = "1"
propagate_at_launch = true
}
}
resource "aws_autoscaling_group" "nodes-sharedvpc-example-com" {
name = "nodes.sharedvpc.example.com"
launch_configuration = "${aws_launch_configuration.nodes-sharedvpc-example-com.id}"
max_size = 2
min_size = 2
vpc_zone_identifier = ["${aws_subnet.us-test-1a-sharedvpc-example-com.id}"]
tag = {
key = "KubernetesCluster"
value = "sharedvpc.example.com"
propagate_at_launch = true
}
tag = {
key = "Name"
value = "nodes.sharedvpc.example.com"
propagate_at_launch = true
}
tag = {
key = "k8s.io/role/node"
value = "1"
propagate_at_launch = true
}
}
resource "aws_ebs_volume" "us-test-1a-etcd-events-sharedvpc-example-com" {
availability_zone = "us-test-1a"
size = 20
type = "gp2"
encrypted = false
tags = {
KubernetesCluster = "sharedvpc.example.com"
Name = "us-test-1a.etcd-events.sharedvpc.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
}
}
resource "aws_ebs_volume" "us-test-1a-etcd-main-sharedvpc-example-com" {
availability_zone = "us-test-1a"
size = 20
type = "gp2"
encrypted = false
tags = {
KubernetesCluster = "sharedvpc.example.com"
Name = "us-test-1a.etcd-main.sharedvpc.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
}
}
resource "aws_iam_instance_profile" "masters-sharedvpc-example-com" {
name = "masters.sharedvpc.example.com"
role = "${aws_iam_role.masters-sharedvpc-example-com.name}"
}
resource "aws_iam_instance_profile" "nodes-sharedvpc-example-com" {
name = "nodes.sharedvpc.example.com"
role = "${aws_iam_role.nodes-sharedvpc-example-com.name}"
}
resource "aws_iam_role" "masters-sharedvpc-example-com" {
name = "masters.sharedvpc.example.com"
assume_role_policy = "${file("${path.module}/data/aws_iam_role_masters.sharedvpc.example.com_policy")}"
}
resource "aws_iam_role" "nodes-sharedvpc-example-com" {
name = "nodes.sharedvpc.example.com"
assume_role_policy = "${file("${path.module}/data/aws_iam_role_nodes.sharedvpc.example.com_policy")}"
}
resource "aws_iam_role_policy" "masters-sharedvpc-example-com" {
name = "masters.sharedvpc.example.com"
role = "${aws_iam_role.masters-sharedvpc-example-com.name}"
policy = "${file("${path.module}/data/aws_iam_role_policy_masters.sharedvpc.example.com_policy")}"
}
resource "aws_iam_role_policy" "nodes-sharedvpc-example-com" {
name = "nodes.sharedvpc.example.com"
role = "${aws_iam_role.nodes-sharedvpc-example-com.name}"
policy = "${file("${path.module}/data/aws_iam_role_policy_nodes.sharedvpc.example.com_policy")}"
}
resource "aws_key_pair" "kubernetes-sharedvpc-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157" {
key_name = "kubernetes.sharedvpc.example.com-c4:a6:ed:9a:a8:89:b9:e2:c3:9c:d6:63:eb:9c:71:57"
public_key = "${file("${path.module}/data/aws_key_pair_kubernetes.sharedvpc.example.com-c4a6ed9aa889b9e2c39cd663eb9c7157_public_key")}"
}
resource "aws_launch_configuration" "master-us-test-1a-masters-sharedvpc-example-com" {
name_prefix = "master-us-test-1a.masters.sharedvpc.example.com-"
image_id = "ami-12345678"
instance_type = "m3.medium"
key_name = "${aws_key_pair.kubernetes-sharedvpc-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id}"
iam_instance_profile = "${aws_iam_instance_profile.masters-sharedvpc-example-com.id}"
security_groups = ["${aws_security_group.masters-sharedvpc-example-com.id}"]
associate_public_ip_address = true
user_data = "${file("${path.module}/data/aws_launch_configuration_master-us-test-1a.masters.sharedvpc.example.com_user_data")}"
root_block_device = {
volume_type = "gp2"
volume_size = 64
delete_on_termination = true
}
ephemeral_block_device = {
device_name = "/dev/sdc"
virtual_name = "ephemeral0"
}
lifecycle = {
create_before_destroy = true
}
}
resource "aws_launch_configuration" "nodes-sharedvpc-example-com" {
name_prefix = "nodes.sharedvpc.example.com-"
image_id = "ami-12345678"
instance_type = "t2.medium"
key_name = "${aws_key_pair.kubernetes-sharedvpc-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id}"
iam_instance_profile = "${aws_iam_instance_profile.nodes-sharedvpc-example-com.id}"
security_groups = ["${aws_security_group.nodes-sharedvpc-example-com.id}"]
associate_public_ip_address = true
user_data = "${file("${path.module}/data/aws_launch_configuration_nodes.sharedvpc.example.com_user_data")}"
root_block_device = {
volume_type = "gp2"
volume_size = 128
delete_on_termination = true
}
lifecycle = {
create_before_destroy = true
}
}
resource "aws_route" "0-0-0-0--0" {
route_table_id = "${aws_route_table.sharedvpc-example-com.id}"
destination_cidr_block = "0.0.0.0/0"
gateway_id = "fake-ig"
}
resource "aws_route_table" "sharedvpc-example-com" {
vpc_id = "vpc-12345678"
tags = {
KubernetesCluster = "sharedvpc.example.com"
Name = "sharedvpc.example.com"
}
}
resource "aws_route_table_association" "us-test-1a-sharedvpc-example-com" {
subnet_id = "${aws_subnet.us-test-1a-sharedvpc-example-com.id}"
route_table_id = "${aws_route_table.sharedvpc-example-com.id}"
}
resource "aws_security_group" "masters-sharedvpc-example-com" {
name = "masters.sharedvpc.example.com"
vpc_id = "vpc-12345678"
description = "Security group for masters"
tags = {
KubernetesCluster = "sharedvpc.example.com"
Name = "masters.sharedvpc.example.com"
}
}
resource "aws_security_group" "nodes-sharedvpc-example-com" {
name = "nodes.sharedvpc.example.com"
vpc_id = "vpc-12345678"
description = "Security group for nodes"
tags = {
KubernetesCluster = "sharedvpc.example.com"
Name = "nodes.sharedvpc.example.com"
}
}
resource "aws_security_group_rule" "all-master-to-master" {
type = "ingress"
security_group_id = "${aws_security_group.masters-sharedvpc-example-com.id}"
source_security_group_id = "${aws_security_group.masters-sharedvpc-example-com.id}"
from_port = 0
to_port = 0
protocol = "-1"
}
resource "aws_security_group_rule" "all-master-to-node" {
type = "ingress"
security_group_id = "${aws_security_group.nodes-sharedvpc-example-com.id}"
source_security_group_id = "${aws_security_group.masters-sharedvpc-example-com.id}"
from_port = 0
to_port = 0
protocol = "-1"
}
resource "aws_security_group_rule" "all-node-to-node" {
type = "ingress"
security_group_id = "${aws_security_group.nodes-sharedvpc-example-com.id}"
source_security_group_id = "${aws_security_group.nodes-sharedvpc-example-com.id}"
from_port = 0
to_port = 0
protocol = "-1"
}
resource "aws_security_group_rule" "https-external-to-master-0-0-0-0--0" {
type = "ingress"
security_group_id = "${aws_security_group.masters-sharedvpc-example-com.id}"
from_port = 443
to_port = 443
protocol = "tcp"
cidr_blocks = ["0.0.0.0/0"]
}
resource "aws_security_group_rule" "master-egress" {
type = "egress"
security_group_id = "${aws_security_group.masters-sharedvpc-example-com.id}"
from_port = 0
to_port = 0
protocol = "-1"
cidr_blocks = ["0.0.0.0/0"]
}
resource "aws_security_group_rule" "node-egress" {
type = "egress"
security_group_id = "${aws_security_group.nodes-sharedvpc-example-com.id}"
from_port = 0
to_port = 0
protocol = "-1"
cidr_blocks = ["0.0.0.0/0"]
}
resource "aws_security_group_rule" "node-to-master-tcp-1-4000" {
type = "ingress"
security_group_id = "${aws_security_group.masters-sharedvpc-example-com.id}"
source_security_group_id = "${aws_security_group.nodes-sharedvpc-example-com.id}"
from_port = 1
to_port = 4000
protocol = "tcp"
}
resource "aws_security_group_rule" "node-to-master-tcp-4003-65535" {
type = "ingress"
security_group_id = "${aws_security_group.masters-sharedvpc-example-com.id}"
source_security_group_id = "${aws_security_group.nodes-sharedvpc-example-com.id}"
from_port = 4003
to_port = 65535
protocol = "tcp"
}
resource "aws_security_group_rule" "node-to-master-udp-1-65535" {
type = "ingress"
security_group_id = "${aws_security_group.masters-sharedvpc-example-com.id}"
source_security_group_id = "${aws_security_group.nodes-sharedvpc-example-com.id}"
from_port = 1
to_port = 65535
protocol = "udp"
}
resource "aws_security_group_rule" "ssh-external-to-master-0-0-0-0--0" {
type = "ingress"
security_group_id = "${aws_security_group.masters-sharedvpc-example-com.id}"
from_port = 22
to_port = 22
protocol = "tcp"
cidr_blocks = ["0.0.0.0/0"]
}
resource "aws_security_group_rule" "ssh-external-to-node-0-0-0-0--0" {
type = "ingress"
security_group_id = "${aws_security_group.nodes-sharedvpc-example-com.id}"
from_port = 22
to_port = 22
protocol = "tcp"
cidr_blocks = ["0.0.0.0/0"]
}
resource "aws_subnet" "us-test-1a-sharedvpc-example-com" {
vpc_id = "vpc-12345678"
cidr_block = "172.20.32.0/19"
availability_zone = "us-test-1a"
tags = {
KubernetesCluster = "sharedvpc.example.com"
Name = "us-test-1a.sharedvpc.example.com"
"kubernetes.io/cluster/sharedvpc.example.com" = "owned"
}
}
terraform = {
required_version = ">= 0.9.3"
}

3
upup/pkg/fi/cloudup/awstasks/subnet.go
View File

@ -210,6 +210,9 @@ func (_ *Subnet) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Su
shared := fi.BoolValue(e.Shared)
if shared {
// Not terraform owned / managed
// We probably shouldn't output subnet_ids only in this case - we normally output them by role,
// but removing it now might break people. We could always output subnet_ids though, if we
// ever get a request for that.
return t.AddOutputVariableArray("subnet_ids", terraform.LiteralFromStringValue(*e.ID))
}