From 5dda9f97dde82b16e5d4feb8c7df671e2afd5f81 Mon Sep 17 00:00:00 2001 From: Sergiusz Urbaniak Date: Tue, 2 May 2017 16:47:13 +0200 Subject: [PATCH 1/2] modules/aws,azure: use the new tag format for k8s 1.6 Fixes #402 --- modules/aws/etcd/nodes.tf | 2 +- modules/aws/master-asg/elb.tf | 6 +++--- modules/aws/master-asg/master.tf | 4 ++-- modules/aws/vpc/sg-elb.tf | 4 ++-- modules/aws/vpc/sg-etcd.tf | 2 +- modules/aws/vpc/sg-master.tf | 2 +- modules/aws/vpc/sg-worker.tf | 2 +- modules/aws/vpc/vpc-private.tf | 4 ++-- modules/aws/vpc/vpc-public.tf | 4 ++-- modules/aws/vpc/vpc.tf | 2 +- modules/aws/worker-asg/worker.tf | 4 ++-- modules/azure/master/master.tf | 8 ++++---- modules/azure/vnet/security-groups.tf | 2 +- modules/azure/vnet/virtualnet.tf | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/modules/aws/etcd/nodes.tf b/modules/aws/etcd/nodes.tf index 8d99eee6f1..7784debe26 100644 --- a/modules/aws/etcd/nodes.tf +++ b/modules/aws/etcd/nodes.tf @@ -41,7 +41,7 @@ resource "aws_instance" "etcd_node" { tags = "${merge(map( "Name", "${var.cluster_name}-etcd-${count.index}", - "KubernetesCluster", "${var.cluster_name}" + "kubernetes.io/cluster/${var.cluster_name}", "owned" ), var.extra_tags)}" root_block_device { diff --git a/modules/aws/master-asg/elb.tf b/modules/aws/master-asg/elb.tf index 27b081ae05..8bdaa4ff45 100644 --- a/modules/aws/master-asg/elb.tf +++ b/modules/aws/master-asg/elb.tf @@ -21,7 +21,7 @@ resource "aws_elb" "api-internal" { tags = "${merge(map( "Name", "${var.cluster_name}-api-internal", - "KubernetesCluster", "${var.cluster_name}" + "kubernetes.io/cluster/${var.cluster_name}", "owned" ), var.extra_tags)}" } @@ -68,7 +68,7 @@ resource "aws_elb" "api-external" { tags = "${merge(map( "Name", "${var.cluster_name}-api-external", - "KubernetesCluster", "${var.cluster_name}" + "kubernetes.io/cluster/${var.cluster_name}", "owned" ), var.extra_tags)}" } @@ -115,7 +115,7 @@ resource "aws_elb" "console" { tags = "${merge(map( "Name", "${var.cluster_name}-console", - "KubernetesCluster", "${var.cluster_name}" + "kubernetes.io/cluster/${var.cluster_name}", "owned" ), var.extra_tags)}" } diff --git a/modules/aws/master-asg/master.tf b/modules/aws/master-asg/master.tf index 96b45dfec2..3405bc117a 100644 --- a/modules/aws/master-asg/master.tf +++ b/modules/aws/master-asg/master.tf @@ -39,8 +39,8 @@ resource "aws_autoscaling_group" "masters" { } tag { - key = "KubernetesCluster" - value = "${var.cluster_name}" + key = "kubernetes.io/cluster/${var.cluster_name}" + value = "owned" propagate_at_launch = true } diff --git a/modules/aws/vpc/sg-elb.tf b/modules/aws/vpc/sg-elb.tf index ca8239a987..f95edfe839 100644 --- a/modules/aws/vpc/sg-elb.tf +++ b/modules/aws/vpc/sg-elb.tf @@ -3,7 +3,7 @@ resource "aws_security_group" "api" { tags = "${merge(map( "Name", "${var.cluster_name}_api_sg", - "KubernetesCluster", "${var.cluster_name}" + "kubernetes.io/cluster/${var.cluster_name}", "owned" ), var.extra_tags)}" egress { @@ -27,7 +27,7 @@ resource "aws_security_group" "console" { tags = "${merge(map( "Name", "${var.cluster_name}_console_sg", - "KubernetesCluster", "${var.cluster_name}" + "kubernetes.io/cluster/${var.cluster_name}", "owned" ), var.extra_tags)}" egress { diff --git a/modules/aws/vpc/sg-etcd.tf b/modules/aws/vpc/sg-etcd.tf index 0b9491bbef..6832385f6f 100644 --- a/modules/aws/vpc/sg-etcd.tf +++ b/modules/aws/vpc/sg-etcd.tf @@ -4,7 +4,7 @@ resource "aws_security_group" "etcd" { tags = "${merge(map( "Name", "${var.cluster_name}_etcd_sg", - "KubernetesCluster", "${var.cluster_name}" + "kubernetes.io/cluster/${var.cluster_name}", "owned" ), var.extra_tags)}" egress { diff --git a/modules/aws/vpc/sg-master.tf b/modules/aws/vpc/sg-master.tf index 1d2fb2bc75..15a36d08c4 100644 --- a/modules/aws/vpc/sg-master.tf +++ b/modules/aws/vpc/sg-master.tf @@ -3,7 +3,7 @@ resource "aws_security_group" "master" { tags = "${merge(map( "Name", "${var.cluster_name}_master_sg", - "KubernetesCluster", "${var.cluster_name}" + "kubernetes.io/cluster/${var.cluster_name}", "owned" ), var.extra_tags)}" } diff --git a/modules/aws/vpc/sg-worker.tf b/modules/aws/vpc/sg-worker.tf index 6d15ff3050..8d9a753de0 100644 --- a/modules/aws/vpc/sg-worker.tf +++ b/modules/aws/vpc/sg-worker.tf @@ -3,7 +3,7 @@ resource "aws_security_group" "worker" { tags = "${merge(map( "Name", "${var.cluster_name}_worker_sg", - "KubernetesCluster", "${var.cluster_name}" + "kubernetes.io/cluster/${var.cluster_name}", "owned" ), var.extra_tags)}" } diff --git a/modules/aws/vpc/vpc-private.tf b/modules/aws/vpc/vpc-private.tf index 7cef765213..6549e02da8 100644 --- a/modules/aws/vpc/vpc-private.tf +++ b/modules/aws/vpc/vpc-private.tf @@ -4,7 +4,7 @@ resource "aws_route_table" "private_routes" { tags = "${merge(map( "Name", "private-${data.aws_availability_zones.azs.names[count.index]}", - "KubernetesCluster", "${var.cluster_name}" + "kubernetes.io/cluster/${var.cluster_name}", "owned" ), var.extra_tags)}" } @@ -32,7 +32,7 @@ resource "aws_subnet" "worker_subnet" { "Name", "worker-${ "${length(var.worker_azs)}" > 0 ? "${var.worker_azs[count.index]}" : "${data.aws_availability_zones.azs.names[count.index]}" }", - "KubernetesCluster", "${var.cluster_name}", + "kubernetes.io/cluster/${var.cluster_name}", "owned", "kubernetes.io/role/internal-elb", "" ), var.extra_tags)}" } diff --git a/modules/aws/vpc/vpc-public.tf b/modules/aws/vpc/vpc-public.tf index 70095b50bd..6612c83b26 100644 --- a/modules/aws/vpc/vpc-public.tf +++ b/modules/aws/vpc/vpc-public.tf @@ -9,7 +9,7 @@ resource "aws_route_table" "default" { tags = "${merge(map( "Name", "public", - "KubernetesCluster", "${var.cluster_name}" + "kubernetes.io/cluster/${var.cluster_name}", "owned" ), var.extra_tags)}" } @@ -42,7 +42,7 @@ resource "aws_subnet" "master_subnet" { "Name", "master-${ "${length(var.master_azs)}" > 0 ? "${var.master_azs[count.index]}" : "${data.aws_availability_zones.azs.names[count.index]}" }", - "KubernetesCluster", "${var.cluster_name}" + "kubernetes.io/cluster/${var.cluster_name}", "owned" ), var.extra_tags)}" } diff --git a/modules/aws/vpc/vpc.tf b/modules/aws/vpc/vpc.tf index c9f6bcfecc..7fbea9ac5d 100644 --- a/modules/aws/vpc/vpc.tf +++ b/modules/aws/vpc/vpc.tf @@ -8,7 +8,7 @@ resource "aws_vpc" "new_vpc" { tags = "${merge(map( "Name", "${var.cluster_name}", - "KubernetesCluster", "${var.cluster_name}" + "kubernetes.io/cluster/${var.cluster_name}", "owned" ), var.extra_tags)}" } diff --git a/modules/aws/worker-asg/worker.tf b/modules/aws/worker-asg/worker.tf index 7793529f83..2b3b2255e0 100644 --- a/modules/aws/worker-asg/worker.tf +++ b/modules/aws/worker-asg/worker.tf @@ -62,8 +62,8 @@ resource "aws_autoscaling_group" "workers" { } tag { - key = "KubernetesCluster" - value = "${var.cluster_name}" + key = "kubernetes.io/cluster/${var.cluster_name}" + value = "owned" propagate_at_launch = true } diff --git a/modules/azure/master/master.tf b/modules/azure/master/master.tf index fc2cacbd51..de4e417f15 100644 --- a/modules/azure/master/master.tf +++ b/modules/azure/master/master.tf @@ -16,8 +16,8 @@ resource "azurerm_storage_account" "tectonic_master" { account_type = "Premium_LRS" tags { - environment = "staging" - KubernetesCluster = "${var.cluster_name}" + environment = "staging" + "kubernetes.io/cluster/${var.cluster_name}" = "owned" } } @@ -84,7 +84,7 @@ resource "azurerm_virtual_machine_scale_set" "tectonic_masters" { } tags { - environment = "staging" - KubernetesCluster = "${var.cluster_name}" + environment = "staging" + "kubernetes.io/cluster/${var.cluster_name}" = "owned" } } diff --git a/modules/azure/vnet/security-groups.tf b/modules/azure/vnet/security-groups.tf index 9eb954d72f..108e5f5307 100644 --- a/modules/azure/vnet/security-groups.tf +++ b/modules/azure/vnet/security-groups.tf @@ -43,6 +43,6 @@ resource "azurerm_network_security_group" "cluster_default" { } tags { - KubernetesCluster = "${var.tectonic_cluster_name}" + "kubernetes.io/cluster/${var.tectonic_cluster_name}" = "owned" } } diff --git a/modules/azure/vnet/virtualnet.tf b/modules/azure/vnet/virtualnet.tf index 15a795cdd8..54e5d8e146 100644 --- a/modules/azure/vnet/virtualnet.tf +++ b/modules/azure/vnet/virtualnet.tf @@ -6,7 +6,7 @@ resource "azurerm_virtual_network" "tectonic_vnet" { location = "${var.location}" tags { - KubernetesCluster = "${var.tectonic_cluster_name}" + "kubernetes.io/cluster/${var.tectonic_cluster_name}" = "owned" } } From e4cd883a4c1b6d89b3c2c7c43a61123aff8df0b5 Mon Sep 17 00:00:00 2001 From: Quentin Machu Date: Wed, 3 May 2017 16:56:33 -0700 Subject: [PATCH 2/2] modules/aws/vpc: set shared rather than owned for VPC/Subnets --- modules/aws/vpc/vpc-private.tf | 4 ++-- modules/aws/vpc/vpc-public.tf | 4 ++-- modules/aws/vpc/vpc.tf | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/aws/vpc/vpc-private.tf b/modules/aws/vpc/vpc-private.tf index 6549e02da8..421aefb3db 100644 --- a/modules/aws/vpc/vpc-private.tf +++ b/modules/aws/vpc/vpc-private.tf @@ -4,7 +4,7 @@ resource "aws_route_table" "private_routes" { tags = "${merge(map( "Name", "private-${data.aws_availability_zones.azs.names[count.index]}", - "kubernetes.io/cluster/${var.cluster_name}", "owned" + "kubernetes.io/cluster/${var.cluster_name}", "shared" ), var.extra_tags)}" } @@ -32,7 +32,7 @@ resource "aws_subnet" "worker_subnet" { "Name", "worker-${ "${length(var.worker_azs)}" > 0 ? "${var.worker_azs[count.index]}" : "${data.aws_availability_zones.azs.names[count.index]}" }", - "kubernetes.io/cluster/${var.cluster_name}", "owned", + "kubernetes.io/cluster/${var.cluster_name}", "shared", "kubernetes.io/role/internal-elb", "" ), var.extra_tags)}" } diff --git a/modules/aws/vpc/vpc-public.tf b/modules/aws/vpc/vpc-public.tf index 6612c83b26..538a4fce03 100644 --- a/modules/aws/vpc/vpc-public.tf +++ b/modules/aws/vpc/vpc-public.tf @@ -9,7 +9,7 @@ resource "aws_route_table" "default" { tags = "${merge(map( "Name", "public", - "kubernetes.io/cluster/${var.cluster_name}", "owned" + "kubernetes.io/cluster/${var.cluster_name}", "shared" ), var.extra_tags)}" } @@ -42,7 +42,7 @@ resource "aws_subnet" "master_subnet" { "Name", "master-${ "${length(var.master_azs)}" > 0 ? "${var.master_azs[count.index]}" : "${data.aws_availability_zones.azs.names[count.index]}" }", - "kubernetes.io/cluster/${var.cluster_name}", "owned" + "kubernetes.io/cluster/${var.cluster_name}", "shared" ), var.extra_tags)}" } diff --git a/modules/aws/vpc/vpc.tf b/modules/aws/vpc/vpc.tf index 7fbea9ac5d..a253080154 100644 --- a/modules/aws/vpc/vpc.tf +++ b/modules/aws/vpc/vpc.tf @@ -8,7 +8,7 @@ resource "aws_vpc" "new_vpc" { tags = "${merge(map( "Name", "${var.cluster_name}", - "kubernetes.io/cluster/${var.cluster_name}", "owned" + "kubernetes.io/cluster/${var.cluster_name}", "shared" ), var.extra_tags)}" }