From 2f34d2d2018404ff2d396d32eec2363f4dd1df86 Mon Sep 17 00:00:00 2001 From: Jason Fillo Date: Tue, 9 Apr 2019 09:25:21 -0500 Subject: [PATCH 1/4] aws-r53: adding china ELB endpoints and hosted zone id's --- provider/aws.go | 72 +++++++++++++++++++++++--------------------- provider/aws_test.go | 4 +++ 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/provider/aws.go b/provider/aws.go index 7bfd17ac0..a9419e6e9 100644 --- a/provider/aws.go +++ b/provider/aws.go @@ -43,40 +43,44 @@ var ( // see: https://docs.aws.amazon.com/general/latest/gr/rande.html#elb_region canonicalHostedZones = map[string]string{ // Application Load Balancers and Classic Load Balancers - "us-east-2.elb.amazonaws.com": "Z3AADJGX6KTTL2", - "us-east-1.elb.amazonaws.com": "Z35SXDOTRQ7X7K", - "us-west-1.elb.amazonaws.com": "Z368ELLRRE2KJ0", - "us-west-2.elb.amazonaws.com": "Z1H1FL5HABSF5", - "ca-central-1.elb.amazonaws.com": "ZQSVJUPU6J1EY", - "ap-south-1.elb.amazonaws.com": "ZP97RAFLXTNZK", - "ap-northeast-2.elb.amazonaws.com": "ZWKZPGTI48KDX", - "ap-northeast-3.elb.amazonaws.com": "Z5LXEXXYW11ES", - "ap-southeast-1.elb.amazonaws.com": "Z1LMS91P8CMLE5", - "ap-southeast-2.elb.amazonaws.com": "Z1GM3OXH4ZPM65", - "ap-northeast-1.elb.amazonaws.com": "Z14GRHDCWA56QT", - "eu-central-1.elb.amazonaws.com": "Z215JYRZR1TBD5", - "eu-west-1.elb.amazonaws.com": "Z32O12XQLNTSW2", - "eu-west-2.elb.amazonaws.com": "ZHURV8PSTC4K8", - "eu-west-3.elb.amazonaws.com": "Z3Q77PNBQS71R4", - "eu-north-1.elb.amazonaws.com": "Z23TAZ6LKFMNIO", - "sa-east-1.elb.amazonaws.com": "Z2P70J7HTTTPLU", - // Network Load Balancers - "elb.us-east-2.amazonaws.com": "ZLMOA37VPKANP", - "elb.us-east-1.amazonaws.com": "Z26RNL4JYFTOTI", - "elb.us-west-1.amazonaws.com": "Z24FKFUX50B4VW", - "elb.us-west-2.amazonaws.com": "Z18D5FSROUN65G", - "elb.ca-central-1.amazonaws.com": "Z2EPGBW3API2WT", - "elb.ap-south-1.amazonaws.com": "ZVDDRBQ08TROA", - "elb.ap-northeast-2.amazonaws.com": "ZIBE1TIR4HY56", - "elb.ap-southeast-1.amazonaws.com": "ZKVM4W9LS7TM", - "elb.ap-southeast-2.amazonaws.com": "ZCT6FZBF4DROD", - "elb.ap-northeast-1.amazonaws.com": "Z31USIVHYNEOWT", - "elb.eu-central-1.amazonaws.com": "Z3F0SRJ5LGBH90", - "elb.eu-west-1.amazonaws.com": "Z2IFOLAFXWLO4F", - "elb.eu-west-2.amazonaws.com": "ZD4D7Y8KGAS4G", - "elb.eu-west-3.amazonaws.com": "Z1CMS0P5QUZ6D5", - "elb.eu-north-1.amazonaws.com": "Z1UDT6IFJ4EJM", - "elb.sa-east-1.amazonaws.com": "ZTK26PT1VY4CU", + "us-east-2.elb.amazonaws.com": "Z3AADJGX6KTTL2", + "us-east-1.elb.amazonaws.com": "Z35SXDOTRQ7X7K", + "us-west-1.elb.amazonaws.com": "Z368ELLRRE2KJ0", + "us-west-2.elb.amazonaws.com": "Z1H1FL5HABSF5", + "ca-central-1.elb.amazonaws.com": "ZQSVJUPU6J1EY", + "ap-south-1.elb.amazonaws.com": "ZP97RAFLXTNZK", + "ap-northeast-2.elb.amazonaws.com": "ZWKZPGTI48KDX", + "ap-northeast-3.elb.amazonaws.com": "Z5LXEXXYW11ES", + "ap-southeast-1.elb.amazonaws.com": "Z1LMS91P8CMLE5", + "ap-southeast-2.elb.amazonaws.com": "Z1GM3OXH4ZPM65", + "ap-northeast-1.elb.amazonaws.com": "Z14GRHDCWA56QT", + "eu-central-1.elb.amazonaws.com": "Z215JYRZR1TBD5", + "eu-west-1.elb.amazonaws.com": "Z32O12XQLNTSW2", + "eu-west-2.elb.amazonaws.com": "ZHURV8PSTC4K8", + "eu-west-3.elb.amazonaws.com": "Z3Q77PNBQS71R4", + "eu-north-1.elb.amazonaws.com": "Z23TAZ6LKFMNIO", + "sa-east-1.elb.amazonaws.com": "Z2P70J7HTTTPLU", + "cn-north-1.elb.amazonaws.com.cn" "Z3BX2TMKNYI13Y", + "cn-northwest-1.elb.amazonaws.com.cn" "Z3BX2TMKNYI13Y", + // Network Load Balance + "elb.us-east-2.amazonaws.com": "ZLMOA37VPKANP", + "elb.us-east-1.amazonaws.com": "Z26RNL4JYFTOTI", + "elb.us-west-1.amazonaws.com": "Z24FKFUX50B4VW", + "elb.us-west-2.amazonaws.com": "Z18D5FSROUN65G", + "elb.ca-central-1.amazonaws.com": "Z2EPGBW3API2WT", + "elb.ap-south-1.amazonaws.com": "ZVDDRBQ08TROA", + "elb.ap-northeast-2.amazonaws.com": "ZIBE1TIR4HY56", + "elb.ap-southeast-1.amazonaws.com": "ZKVM4W9LS7TM", + "elb.ap-southeast-2.amazonaws.com": "ZCT6FZBF4DROD", + "elb.ap-northeast-1.amazonaws.com": "Z31USIVHYNEOWT", + "elb.eu-central-1.amazonaws.com": "Z3F0SRJ5LGBH90", + "elb.eu-west-1.amazonaws.com": "Z2IFOLAFXWLO4F", + "elb.eu-west-2.amazonaws.com": "ZD4D7Y8KGAS4G", + "elb.eu-west-3.amazonaws.com": "Z1CMS0P5QUZ6D5", + "elb.eu-north-1.amazonaws.com": "Z1UDT6IFJ4EJM", + "elb.sa-east-1.amazonaws.com": "ZTK26PT1VY4CU", + "elb.cn-north-1.amazonaws.com.cn": "Z3QFB96KMJ7ED6", + "elb.cn-northwest-1.amazonaws.com.cn": "ZQEIKTCZ8352D", } ) diff --git a/provider/aws_test.go b/provider/aws_test.go index f4ca41f6e..a1e626a77 100644 --- a/provider/aws_test.go +++ b/provider/aws_test.go @@ -898,6 +898,8 @@ func TestAWSCanonicalHostedZone(t *testing.T) { {"foo.eu-west-2.elb.amazonaws.com", "ZHURV8PSTC4K8"}, {"foo.eu-west-3.elb.amazonaws.com", "Z3Q77PNBQS71R4"}, {"foo.sa-east-1.elb.amazonaws.com", "Z2P70J7HTTTPLU"}, + {"foo.cn-north-1.elb.amazonaws.com.cn", "Z3BX2TMKNYI13Y"}, + {"foo.cn-northwest-1.elb.amazonaws.com.cn", "Z3BX2TMKNYI13Y"}, // Network Load Balancers {"foo.elb.us-east-2.amazonaws.com", "ZLMOA37VPKANP"}, {"foo.elb.us-east-1.amazonaws.com", "Z26RNL4JYFTOTI"}, @@ -914,6 +916,8 @@ func TestAWSCanonicalHostedZone(t *testing.T) { {"foo.elb.eu-west-2.amazonaws.com", "ZD4D7Y8KGAS4G"}, {"foo.elb.eu-west-3.amazonaws.com", "Z1CMS0P5QUZ6D5"}, {"foo.elb.sa-east-1.amazonaws.com", "ZTK26PT1VY4CU"}, + {"foo.elb.cn-north-1.amazonaws.com.cn", "Z3QFB96KMJ7ED6"}, + {"foo.elb.cn-northwest-1.amazonaws.com.cn". "ZQEIKTCZ8352D"}, // No Load Balancer {"foo.example.org", ""}, } { From 86bd0108ef0f62c117216937a28cb8f43670b84d Mon Sep 17 00:00:00 2001 From: Jason Fillo Date: Tue, 9 Apr 2019 09:24:16 -0500 Subject: [PATCH 2/4] aws-r53: adding china ELB endpoints and hosted zone id's. fixed spacing --- provider/aws_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provider/aws_test.go b/provider/aws_test.go index a1e626a77..5a591739e 100644 --- a/provider/aws_test.go +++ b/provider/aws_test.go @@ -899,7 +899,7 @@ func TestAWSCanonicalHostedZone(t *testing.T) { {"foo.eu-west-3.elb.amazonaws.com", "Z3Q77PNBQS71R4"}, {"foo.sa-east-1.elb.amazonaws.com", "Z2P70J7HTTTPLU"}, {"foo.cn-north-1.elb.amazonaws.com.cn", "Z3BX2TMKNYI13Y"}, - {"foo.cn-northwest-1.elb.amazonaws.com.cn", "Z3BX2TMKNYI13Y"}, + {"foo.cn-northwest-1.elb.amazonaws.com.cn", "Z3BX2TMKNYI13Y"}, // Network Load Balancers {"foo.elb.us-east-2.amazonaws.com", "ZLMOA37VPKANP"}, {"foo.elb.us-east-1.amazonaws.com", "Z26RNL4JYFTOTI"}, @@ -917,7 +917,7 @@ func TestAWSCanonicalHostedZone(t *testing.T) { {"foo.elb.eu-west-3.amazonaws.com", "Z1CMS0P5QUZ6D5"}, {"foo.elb.sa-east-1.amazonaws.com", "ZTK26PT1VY4CU"}, {"foo.elb.cn-north-1.amazonaws.com.cn", "Z3QFB96KMJ7ED6"}, - {"foo.elb.cn-northwest-1.amazonaws.com.cn". "ZQEIKTCZ8352D"}, + {"foo.elb.cn-northwest-1.amazonaws.com.cn". "ZQEIKTCZ8352D"}, // No Load Balancer {"foo.example.org", ""}, } { From 388119206758d4f4da5b40fd5f6e18524b037a89 Mon Sep 17 00:00:00 2001 From: Jason Fillo Date: Tue, 9 Apr 2019 09:58:10 -0500 Subject: [PATCH 3/4] aws-r53: adding china ELB endpoints and hosted zone id's. corrected formatting --- provider/aws.go | 38 +++++++++++++++++++------------------- provider/aws_test.go | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/provider/aws.go b/provider/aws.go index a9419e6e9..c42d460d2 100644 --- a/provider/aws.go +++ b/provider/aws.go @@ -43,25 +43,25 @@ var ( // see: https://docs.aws.amazon.com/general/latest/gr/rande.html#elb_region canonicalHostedZones = map[string]string{ // Application Load Balancers and Classic Load Balancers - "us-east-2.elb.amazonaws.com": "Z3AADJGX6KTTL2", - "us-east-1.elb.amazonaws.com": "Z35SXDOTRQ7X7K", - "us-west-1.elb.amazonaws.com": "Z368ELLRRE2KJ0", - "us-west-2.elb.amazonaws.com": "Z1H1FL5HABSF5", - "ca-central-1.elb.amazonaws.com": "ZQSVJUPU6J1EY", - "ap-south-1.elb.amazonaws.com": "ZP97RAFLXTNZK", - "ap-northeast-2.elb.amazonaws.com": "ZWKZPGTI48KDX", - "ap-northeast-3.elb.amazonaws.com": "Z5LXEXXYW11ES", - "ap-southeast-1.elb.amazonaws.com": "Z1LMS91P8CMLE5", - "ap-southeast-2.elb.amazonaws.com": "Z1GM3OXH4ZPM65", - "ap-northeast-1.elb.amazonaws.com": "Z14GRHDCWA56QT", - "eu-central-1.elb.amazonaws.com": "Z215JYRZR1TBD5", - "eu-west-1.elb.amazonaws.com": "Z32O12XQLNTSW2", - "eu-west-2.elb.amazonaws.com": "ZHURV8PSTC4K8", - "eu-west-3.elb.amazonaws.com": "Z3Q77PNBQS71R4", - "eu-north-1.elb.amazonaws.com": "Z23TAZ6LKFMNIO", - "sa-east-1.elb.amazonaws.com": "Z2P70J7HTTTPLU", - "cn-north-1.elb.amazonaws.com.cn" "Z3BX2TMKNYI13Y", - "cn-northwest-1.elb.amazonaws.com.cn" "Z3BX2TMKNYI13Y", + "us-east-2.elb.amazonaws.com": "Z3AADJGX6KTTL2", + "us-east-1.elb.amazonaws.com": "Z35SXDOTRQ7X7K", + "us-west-1.elb.amazonaws.com": "Z368ELLRRE2KJ0", + "us-west-2.elb.amazonaws.com": "Z1H1FL5HABSF5", + "ca-central-1.elb.amazonaws.com": "ZQSVJUPU6J1EY", + "ap-south-1.elb.amazonaws.com": "ZP97RAFLXTNZK", + "ap-northeast-2.elb.amazonaws.com": "ZWKZPGTI48KDX", + "ap-northeast-3.elb.amazonaws.com": "Z5LXEXXYW11ES", + "ap-southeast-1.elb.amazonaws.com": "Z1LMS91P8CMLE5", + "ap-southeast-2.elb.amazonaws.com": "Z1GM3OXH4ZPM65", + "ap-northeast-1.elb.amazonaws.com": "Z14GRHDCWA56QT", + "eu-central-1.elb.amazonaws.com": "Z215JYRZR1TBD5", + "eu-west-1.elb.amazonaws.com": "Z32O12XQLNTSW2", + "eu-west-2.elb.amazonaws.com": "ZHURV8PSTC4K8", + "eu-west-3.elb.amazonaws.com": "Z3Q77PNBQS71R4", + "eu-north-1.elb.amazonaws.com": "Z23TAZ6LKFMNIO", + "sa-east-1.elb.amazonaws.com": "Z2P70J7HTTTPLU", + "cn-north-1.elb.amazonaws.com.cn": "Z3BX2TMKNYI13Y", + "cn-northwest-1.elb.amazonaws.com.cn": "Z3BX2TMKNYI13Y", // Network Load Balance "elb.us-east-2.amazonaws.com": "ZLMOA37VPKANP", "elb.us-east-1.amazonaws.com": "Z26RNL4JYFTOTI", diff --git a/provider/aws_test.go b/provider/aws_test.go index 5a591739e..766014b99 100644 --- a/provider/aws_test.go +++ b/provider/aws_test.go @@ -917,7 +917,7 @@ func TestAWSCanonicalHostedZone(t *testing.T) { {"foo.elb.eu-west-3.amazonaws.com", "Z1CMS0P5QUZ6D5"}, {"foo.elb.sa-east-1.amazonaws.com", "ZTK26PT1VY4CU"}, {"foo.elb.cn-north-1.amazonaws.com.cn", "Z3QFB96KMJ7ED6"}, - {"foo.elb.cn-northwest-1.amazonaws.com.cn". "ZQEIKTCZ8352D"}, + {"foo.elb.cn-northwest-1.amazonaws.com.cn", "ZQEIKTCZ8352D"}, // No Load Balancer {"foo.example.org", ""}, } { From 44c32e1ed8d1c4d48177e3bc53573d54e31587f9 Mon Sep 17 00:00:00 2001 From: Jason Fillo Date: Tue, 9 Apr 2019 11:51:44 -0500 Subject: [PATCH 4/4] aws-r53: adding china ELB endpoints and hosted zone id's. fixed typo when reformatting --- provider/aws.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provider/aws.go b/provider/aws.go index c42d460d2..be2d516d8 100644 --- a/provider/aws.go +++ b/provider/aws.go @@ -62,7 +62,7 @@ var ( "sa-east-1.elb.amazonaws.com": "Z2P70J7HTTTPLU", "cn-north-1.elb.amazonaws.com.cn": "Z3BX2TMKNYI13Y", "cn-northwest-1.elb.amazonaws.com.cn": "Z3BX2TMKNYI13Y", - // Network Load Balance + // Network Load Balancers "elb.us-east-2.amazonaws.com": "ZLMOA37VPKANP", "elb.us-east-1.amazonaws.com": "Z26RNL4JYFTOTI", "elb.us-west-1.amazonaws.com": "Z24FKFUX50B4VW",