Merge pull request #828 from GoogleCloudPlatform/lcaggio/fix-fast-fir…

…ewall-dp Update firewall rules.
GoogleCloudPlatform · Sep 20, 2022 · 40b3aa3 · 40b3aa3
2 parents 0bdcaf9 + 149d84d
commit 40b3aa3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/blueprints/data-solutions/data-platform-foundations/variables.tf b/blueprints/data-solutions/data-platform-foundations/variables.tf
@@ -28,7 +28,7 @@ variable "composer_config" {
   })
   default = {
     node_count      = 3
-    airflow_version = "composer-1.17.5-airflow-2.1.4"
+    airflow_version = "composer-1-airflow-2"
     env_variables   = {}
   }
 }

diff --git a/fast/stages/02-networking-nva/data/firewall-rules/dev/rules.yaml b/fast/stages/02-networking-nva/data/firewall-rules/dev/rules.yaml
@@ -4,8 +4,8 @@ ingress-allow-composer-nodes:
   description: "Allow traffic to Composer nodes."
   direction: INGRESS
   action: allow
-  sources: []
-  ranges: ["0.0.0.0/0"]
+  sources:
+    - composer-worker
   targets:
     - composer-worker
   use_service_accounts: false
@@ -17,8 +17,8 @@ ingress-allow-dataflow-load:
   description: "Allow traffic to Dataflow nodes."
   direction: INGRESS
   action: allow
-  sources: []
-  ranges: ["0.0.0.0/0"]
+  sources:
+    - dataflow
   targets:
     - dataflow
   use_service_accounts: false

diff --git a/fast/stages/02-networking-peering/data/firewall-rules/dev/rules.yaml b/fast/stages/02-networking-peering/data/firewall-rules/dev/rules.yaml
@@ -4,8 +4,8 @@ ingress-allow-composer-nodes:
   description: "Allow traffic to Composer nodes."
   direction: INGRESS
   action: allow
-  sources: []
-  ranges: ["0.0.0.0/0"]
+  sources:
+    - composer-worker
   targets:
     - composer-worker
   use_service_accounts: false
@@ -17,8 +17,8 @@ ingress-allow-dataflow-load:
   description: "Allow traffic to Dataflow nodes."
   direction: INGRESS
   action: allow
-  sources: []
-  ranges: ["0.0.0.0/0"]
+  sources:
+    - dataflow
   targets:
     - dataflow
   use_service_accounts: false

diff --git a/fast/stages/02-networking-vpn/data/firewall-rules/dev/rules.yaml b/fast/stages/02-networking-vpn/data/firewall-rules/dev/rules.yaml
@@ -4,8 +4,8 @@ ingress-allow-composer-nodes:
   description: "Allow traffic to Composer nodes."
   direction: INGRESS
   action: allow
-  sources: []
-  ranges: ["0.0.0.0/0"]
+  sources:
+    - composer-worker
   targets:
     - composer-worker
   use_service_accounts: false
@@ -17,8 +17,8 @@ ingress-allow-dataflow-load:
   description: "Allow traffic to Dataflow nodes."
   direction: INGRESS
   action: allow
-  sources: []
-  ranges: ["0.0.0.0/0"]
+  sources:
+    - dataflow
   targets:
     - dataflow
   use_service_accounts: false

diff --git a/fast/stages/03-data-platform/dev/demo b/fast/stages/03-data-platform/dev/demo
@@ -0,0 +1 @@
+../../../../blueprints/data-solutions/data-platform-foundations/demo/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../../blueprints/data-solutions/data-platform-foundations/demo/