feat: distinct vpc remove legacy resources BREAKING CHANGE (#922)

* feat: distinct vpc remove legacy resources BREAKING CHANGE

* update fw pol description and remove cidr setters

solutions/client-landing-zone/client-folder/firewall-policy/rules/defaults.yaml

@@ -44,7 +44,7 @@ spec:
       - "192.168.0.0/16"
   priority: 2147483541
 ---
-# Delegate to the next folder.standard down in the hierarchy that has a network isolation rule that denies ingress from private IP ranges, ingress traffic from private IP ranges to VPC resources in shared VPC network
+# Delegate to the next folder down in the hierarchy
 apiVersion: compute.cnrm.cloud.google.com/v1beta1
 kind: ComputeFirewallPolicyRule
 metadata:
@@ -54,7 +54,7 @@ metadata:
     config.kubernetes.io/depends-on: compute.cnrm.cloud.google.com/namespaces/client-name-networking/ComputeFirewallPolicy/client-name-client-folder-fwpol # kpt-set: compute.cnrm.cloud.google.com/namespaces/${client-name}-networking/ComputeFirewallPolicy/${client-name}-client-folder-fwpol
 spec:
   action: "goto_next"
-  description: "Delegate to the next folder.standard down in the hierarchy that has a network isolation rule that denies ingress from private IP ranges, ingress traffic from private IP ranges to VPC resources in shared VPC network"
+  description: "Delegate to the next folder down in the hierarchy."
   direction: "INGRESS"
   disabled: false
   # logging not supported for goto_next rules

solutions/client-landing-zone/client-folder/standard/applications-infrastructure/dns-project/public-dns.yaml

@@ -1,66 +1,61 @@
-# # Copyright 2020 Google LLC
-# #
-# # Licensed under the Apache License, Version 2.0 (the "License");
-# # you may not use this file except in compliance with the License.
-# # You may obtain a copy of the License at
-# #
-# #     http://www.apache.org/licenses/LICENSE-2.0
-# #
-# # Unless required by applicable law or agreed to in writing, software
-# # distributed under the License is distributed on an "AS IS" BASIS,
-# # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# # See the License for the specific language governing permissions and
-# # limitations under the License.
-# #########
-# ###################### NOTICE ######################
-# # enable resources in this file and disable '../host-project/network/public-dns.yaml' to transition DNS resources
-# # they will be uncommented (enabled) by default in a future update
-# #########
-# # Public Client DNS subzone
-# # SC-22
-# # AU-12 - Enable Logging for DNS Managed zone
-# apiVersion: dns.cnrm.cloud.google.com/v1beta1
-# kind: DNSManagedZone
-# metadata:
-#   name: client-name-standard-public-dns # kpt-set: ${client-name}-standard-public-dns
-#   namespace: client-name-networking # kpt-set: ${client-name}-networking
-#   annotations:
-#     cnrm.cloud.google.com/project-id: dns-project-id # kpt-set: ${dns-project-id}
-#     config.kubernetes.io/depends-on: resourcemanager.cnrm.cloud.google.com/namespaces/client-name-projects/Project/dns-project-id # kpt-set: resourcemanager.cnrm.cloud.google.com/namespaces/${client-name}-projects/Project/${dns-project-id}
-# spec:
-#   description: "client-name standard public dns subzone" # kpt-set: ${client-name} standard public dns subzone
-#   resourceID: client-name-standard-public-dns # kpt-set: ${client-name}-standard-public-dns
-#   dnsName: "dns-name" # kpt-set: ${dns-name}
-#   visibility: public
-#   dnssecConfig:
-#     state: "on"
-#   # AU-12
-#   cloudLoggingConfig:
-#     enableLogging: true
-# ---
-# # Record Set for client DNS subzone in public core DNS zone
-# # SC-22
-# apiVersion: dns.cnrm.cloud.google.com/v1beta1
-# kind: DNSRecordSet
-# metadata:
-#   name: client-name-standard-core-public-dns-ns-rset # kpt-set: ${client-name}-standard-core-public-dns-ns-rset
-#   namespace: client-name-networking # kpt-set: ${client-name}-networking
-#   annotations:
-#     cnrm.cloud.google.com/project-id: core-dns-project-id # kpt-set: ${core-dns-project-id}
-#     config.kubernetes.io/depends-on: dns.cnrm.cloud.google.com/namespaces/client-name-networking/DNSManagedZone/client-name-standard-public-dns # kpt-set: dns.cnrm.cloud.google.com/namespaces/${client-name}-networking/DNSManagedZone/${client-name}-standard-public-dns
-# spec:
-#   name: "dns-name" # kpt-set: ${dns-name}
-#   type: "NS"
-#   ttl: 300
-#   managedZoneRef:
-#     name: core-dns-project-id-standard-core-public-dns # kpt-set: ${core-dns-project-id}-standard-core-public-dns
-#     namespace: networking
-#   # The nameservers below must be updated to match the same nameservers as the client DNS subzone
-#   # Cloud DNS creates NS and SOA records automatically when a zone is created and these cannot be changed
-#   # See https://cloud.google.com/dns/docs/zones#create-pub-zone
-#   rrdatas: # kpt-set: ${dns-nameservers}
-#     - "ns-cloud-a1.googledomains.com."
-#     - "ns-cloud-a2.googledomains.com."
-#     - "ns-cloud-a3.googledomains.com."
-#     - "ns-cloud-a4.googledomains.com."
-
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#########
+# Public Client DNS subzone
+# SC-22
+# AU-12 - Enable Logging for DNS Managed zone
+apiVersion: dns.cnrm.cloud.google.com/v1beta1
+kind: DNSManagedZone
+metadata:
+  name: client-name-standard-public-dns # kpt-set: ${client-name}-standard-public-dns
+  namespace: client-name-networking # kpt-set: ${client-name}-networking
+  annotations:
+    cnrm.cloud.google.com/project-id: dns-project-id # kpt-set: ${dns-project-id}
+    config.kubernetes.io/depends-on: resourcemanager.cnrm.cloud.google.com/namespaces/client-name-projects/Project/dns-project-id # kpt-set: resourcemanager.cnrm.cloud.google.com/namespaces/${client-name}-projects/Project/${dns-project-id}
+spec:
+  description: "client-name standard public dns subzone" # kpt-set: ${client-name} standard public dns subzone
+  resourceID: client-name-standard-public-dns # kpt-set: ${client-name}-standard-public-dns
+  dnsName: "dns-name" # kpt-set: ${dns-name}
+  visibility: public
+  dnssecConfig:
+    state: "on"
+  # AU-12
+  cloudLoggingConfig:
+    enableLogging: true
+---
+# Record Set for client DNS subzone in public core DNS zone
+# SC-22
+apiVersion: dns.cnrm.cloud.google.com/v1beta1
+kind: DNSRecordSet
+metadata:
+  name: client-name-standard-core-public-dns-ns-rset # kpt-set: ${client-name}-standard-core-public-dns-ns-rset
+  namespace: client-name-networking # kpt-set: ${client-name}-networking
+  annotations:
+    cnrm.cloud.google.com/project-id: core-dns-project-id # kpt-set: ${core-dns-project-id}
+    config.kubernetes.io/depends-on: dns.cnrm.cloud.google.com/namespaces/client-name-networking/DNSManagedZone/client-name-standard-public-dns # kpt-set: dns.cnrm.cloud.google.com/namespaces/${client-name}-networking/DNSManagedZone/${client-name}-standard-public-dns
+spec:
+  name: "dns-name" # kpt-set: ${dns-name}
+  type: "NS"
+  ttl: 300
+  managedZoneRef:
+    name: core-dns-project-id-standard-core-public-dns # kpt-set: ${core-dns-project-id}-standard-core-public-dns
+    namespace: networking
+  # The nameservers below must be updated to match the same nameservers as the client DNS subzone
+  # Cloud DNS creates NS and SOA records automatically when a zone is created and these cannot be changed
+  # See https://cloud.google.com/dns/docs/zones#create-pub-zone
+  rrdatas: # kpt-set: ${dns-nameservers}
+    - "ns-cloud-a1.googledomains.com."
+    - "ns-cloud-a2.googledomains.com."
+    - "ns-cloud-a3.googledomains.com."
+    - "ns-cloud-a4.googledomains.com."