From e43bc75932b826759b5cd2148093a7758d50d309 Mon Sep 17 00:00:00 2001 From: Tim Schindler Date: Thu, 14 Feb 2019 15:54:44 +0100 Subject: [PATCH] add ELB tags for custom ingresses (#1391) --- .../controller/v22/templates/cloudformation/guest/subnets.go | 4 ++++ .../controller/v23/templates/cloudformation/guest/subnets.go | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/service/controller/v22/templates/cloudformation/guest/subnets.go b/service/controller/v22/templates/cloudformation/guest/subnets.go index 6ec79e1251..2d7d7c3ea8 100644 --- a/service/controller/v22/templates/cloudformation/guest/subnets.go +++ b/service/controller/v22/templates/cloudformation/guest/subnets.go @@ -12,6 +12,8 @@ const Subnets = `{{ define "subnets" }} Tags: - Key: Name Value: {{ .Name }} + - Key: "kubernetes.io/role/elb" + Value: "1" VpcId: !Ref VPC {{ .RouteTableAssociation.Name }}: @@ -32,6 +34,8 @@ const Subnets = `{{ define "subnets" }} Tags: - Key: Name Value: {{ .Name }} + - Key: "kubernetes.io/role/internal-elb" + Value: "1" VpcId: !Ref VPC {{ .RouteTableAssociation.Name }}: diff --git a/service/controller/v23/templates/cloudformation/guest/subnets.go b/service/controller/v23/templates/cloudformation/guest/subnets.go index 6ec79e1251..2d7d7c3ea8 100644 --- a/service/controller/v23/templates/cloudformation/guest/subnets.go +++ b/service/controller/v23/templates/cloudformation/guest/subnets.go @@ -12,6 +12,8 @@ const Subnets = `{{ define "subnets" }} Tags: - Key: Name Value: {{ .Name }} + - Key: "kubernetes.io/role/elb" + Value: "1" VpcId: !Ref VPC {{ .RouteTableAssociation.Name }}: @@ -32,6 +34,8 @@ const Subnets = `{{ define "subnets" }} Tags: - Key: Name Value: {{ .Name }} + - Key: "kubernetes.io/role/internal-elb" + Value: "1" VpcId: !Ref VPC {{ .RouteTableAssociation.Name }}: