From 3b9fb0719669b0749d114a0e0fa2804588a43d62 Mon Sep 17 00:00:00 2001
From: Luca Prete <preteluca@gmail.com>
Date: Mon, 31 Jan 2022 18:17:29 +0100
Subject: [PATCH] Fast - stage 02-netwoking - Fix rfc1918_172 range

---
 fast/stages/02-networking/README.md       | 2 +-
 fast/stages/02-networking/data/cidrs.yaml | 2 +-
 fast/stages/02-networking/variables.tf    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fast/stages/02-networking/README.md b/fast/stages/02-networking/README.md
index 0101c1156..fb1852192 100644
--- a/fast/stages/02-networking/README.md
+++ b/fast/stages/02-networking/README.md
@@ -311,7 +311,7 @@ DNS configurations are centralised in the `dns.tf` file. Spokes delegate DNS res
 | [billing_account_id](variables.tf#L17) | Billing account id. | <code>string</code> | ✓ |  | <code>00-bootstrap</code> |
 | [organization](variables.tf#L86) | Organization details. | <code title="object&#40;&#123;&#10;  domain      &#61; string&#10;  id          &#61; number&#10;  customer_id &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ |  | <code>00-bootstrap</code> |
 | [prefix](variables.tf#L102) | Prefix used for resources that need unique names. | <code>string</code> | ✓ |  | <code>00-bootstrap</code> |
-| [custom_adv](variables.tf#L23) | Custom advertisement definitions in name => range format. | <code>map&#40;string&#41;</code> |  | <code title="&#123;&#10;  cloud_dns             &#61; &#34;35.199.192.0&#47;19&#34;&#10;  gcp_all               &#61; &#34;10.128.0.0&#47;16&#34;&#10;  gcp_dev               &#61; &#34;10.128.32.0&#47;19&#34;&#10;  gcp_landing           &#61; &#34;10.128.0.0&#47;19&#34;&#10;  gcp_prod              &#61; &#34;10.128.64.0&#47;19&#34;&#10;  googleapis_private    &#61; &#34;199.36.153.8&#47;30&#34;&#10;  googleapis_restricted &#61; &#34;199.36.153.4&#47;30&#34;&#10;  rfc_1918_10           &#61; &#34;10.0.0.0&#47;8&#34;&#10;  rfc_1918_172          &#61; &#34;172.16.0.0&#47;16&#34;&#10;  rfc_1918_192          &#61; &#34;192.168.0.0&#47;16&#34;&#10;&#125;">&#123;&#8230;&#125;</code> |  |
+| [custom_adv](variables.tf#L23) | Custom advertisement definitions in name => range format. | <code>map&#40;string&#41;</code> |  | <code title="&#123;&#10;  cloud_dns             &#61; &#34;35.199.192.0&#47;19&#34;&#10;  gcp_all               &#61; &#34;10.128.0.0&#47;16&#34;&#10;  gcp_dev               &#61; &#34;10.128.32.0&#47;19&#34;&#10;  gcp_landing           &#61; &#34;10.128.0.0&#47;19&#34;&#10;  gcp_prod              &#61; &#34;10.128.64.0&#47;19&#34;&#10;  googleapis_private    &#61; &#34;199.36.153.8&#47;30&#34;&#10;  googleapis_restricted &#61; &#34;199.36.153.4&#47;30&#34;&#10;  rfc_1918_10           &#61; &#34;10.0.0.0&#47;8&#34;&#10;  rfc_1918_172          &#61; &#34;172.16.0.0&#47;12&#34;&#10;  rfc_1918_192          &#61; &#34;192.168.0.0&#47;16&#34;&#10;&#125;">&#123;&#8230;&#125;</code> |  |
 | [data_dir](variables.tf#L40) | Relative path for the folder storing configuration data for network resources. | <code>string</code> |  | <code>&#34;data&#34;</code> |  |
 | [dns](variables.tf#L46) | Onprem DNS resolvers. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code title="&#123;&#10;  onprem &#61; &#91;&#34;10.0.200.3&#34;&#93;&#10;&#125;">&#123;&#8230;&#125;</code> |  |
 | [folder_id](variables.tf#L54) | Folder to be used for the networking resources in folders/nnnnnnnnnnn format. If null, folder will be created. | <code>string</code> |  | <code>null</code> | <code>01-resman</code> |
diff --git a/fast/stages/02-networking/data/cidrs.yaml b/fast/stages/02-networking/data/cidrs.yaml
index 5f453d8d4..b6c25e21a 100644
--- a/fast/stages/02-networking/data/cidrs.yaml
+++ b/fast/stages/02-networking/data/cidrs.yaml
@@ -8,7 +8,7 @@ healthchecks:
 
 rfc1918:
   - 10.0.0.0/8
-  - 172.16.0.0/16
+  - 172.16.0.0/12
   - 192.168.0.0/16
 
 onprem_probes:
diff --git a/fast/stages/02-networking/variables.tf b/fast/stages/02-networking/variables.tf
index 22e8c7452..abf45adbf 100644
--- a/fast/stages/02-networking/variables.tf
+++ b/fast/stages/02-networking/variables.tf
@@ -32,7 +32,7 @@ variable "custom_adv" {
     googleapis_private    = "199.36.153.8/30"
     googleapis_restricted = "199.36.153.4/30"
     rfc_1918_10           = "10.0.0.0/8"
-    rfc_1918_172          = "172.16.0.0/16"
+    rfc_1918_172          = "172.16.0.0/12"
     rfc_1918_192          = "192.168.0.0/16"
   }
 }