[BGP] Remove tenant and external networks from controlplane and dataplane

dt/bgp/networking/kustomization.yaml

@@ -18,10 +18,9 @@ transformers:
         create: true
 
 components:
-  - ../../../lib/networking/metallb
-  - ../../../lib/networking/nad
+  - metallb
+  - nad
   - netconfig
-  - bgpmetallb
 
 resources:
   - ocp_networks_octavia_netattach.yaml

dt/bgp/networking/metallb/ip-addresses/kustomization.yaml

@@ -0,0 +1,71 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+replacements:
+  # IPAddressPool addresses
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.ctlplane.lb_addresses
+    targets:
+      - select:
+          kind: IPAddressPool
+          name: ctlplane
+        fieldPaths:
+          - spec.addresses
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.internalapi.lb_addresses
+    targets:
+      - select:
+          kind: IPAddressPool
+          name: internalapi
+        fieldPaths:
+          - spec.addresses
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storage.lb_addresses
+    targets:
+      - select:
+          kind: IPAddressPool
+          name: storage
+        fieldPaths:
+          - spec.addresses
+
+  # Loadbalancer address pools (duplicate for metallb.io group)
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.ctlplane.lb_addresses
+    targets:
+      - select:
+          group: metallb.io
+          kind: IPAddressPool
+          name: ctlplane
+        fieldPaths:
+          - spec.addresses
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.internalapi.lb_addresses
+    targets:
+      - select:
+          group: metallb.io
+          kind: IPAddressPool
+          name: internalapi
+        fieldPaths:
+          - spec.addresses
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storage.lb_addresses
+    targets:
+      - select:
+          group: metallb.io
+          kind: IPAddressPool
+          name: storage
+        fieldPaths:
+          - spec.addresses

dt/bgp/networking/bgpmetallb/kustomization.yaml → dt/bgp/networking/metallb/kustomization.yaml

@@ -2,5 +2,9 @@
 apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 
+components:
+  - ../../../../lib/networking/metallb/base
+  - ip-addresses
+
 resources:
   - metallb_bgpadvertisements.yaml

dt/bgp/networking/bgpmetallb/metallb_bgpadvertisements.yaml → dt/bgp/networking/metallb/metallb_bgpadvertisements.yaml

@@ -9,5 +9,4 @@ spec:
     - ctlplane
     - internalapi
     - storage
-    - tenant
   peers: []

dt/bgp/networking/nad/kustomization.yaml

@@ -0,0 +1,55 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - ocp_networks_netattach.yaml
+
+patches:
+  - target:
+      kind: NetworkAttachmentDefinition
+      labelSelector: "osp/net-attach-def-type=standard"
+    path: ocp_network_template.yaml
+
+replacements:
+  # NetworkAttachmentDefinition JSON config
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.ctlplane.net-attach-def
+    targets:
+      - select:
+          kind: NetworkAttachmentDefinition
+          name: ctlplane
+        fieldPaths:
+          - spec.config
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.internalapi.net-attach-def
+    targets:
+      - select:
+          kind: NetworkAttachmentDefinition
+          name: internalapi
+        fieldPaths:
+          - spec.config
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storage.net-attach-def
+    targets:
+      - select:
+          kind: NetworkAttachmentDefinition
+          name: storage
+        fieldPaths:
+          - spec.config
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.datacentre.net-attach-def
+    targets:
+      - select:
+          kind: NetworkAttachmentDefinition
+          name: datacentre
+        fieldPaths:
+          - spec.config

dt/bgp/networking/nad/ocp_network_template.yaml

@@ -0,0 +1,8 @@
+---
+apiVersion: nmstate.io/v1
+kind: NetworkAttachmentDefinition
+metadata:
+  name: _ignored_
+spec:
+  config: |
+    _replaced_

dt/bgp/networking/nad/ocp_networks_netattach.yaml

@@ -0,0 +1,40 @@
+---
+apiVersion: k8s.cni.cncf.io/v1
+kind: NetworkAttachmentDefinition
+metadata:
+  name: ctlplane
+  labels:
+    osp/net: ctlplane
+    osp/net-attach-def-type: standard
+---
+apiVersion: k8s.cni.cncf.io/v1
+kind: NetworkAttachmentDefinition
+metadata:
+  name: internalapi
+  labels:
+    osp/net: internalapi
+    osp/net-attach-def-type: standard
+---
+apiVersion: k8s.cni.cncf.io/v1
+kind: NetworkAttachmentDefinition
+metadata:
+  name: storage
+  labels:
+    osp/net: storage
+    osp/net-attach-def-type: standard
+---
+apiVersion: k8s.cni.cncf.io/v1
+kind: NetworkAttachmentDefinition
+metadata:
+  name: tenant
+  labels:
+    osp/net: tenant
+    osp/net-attach-def-type: standard
+---
+apiVersion: k8s.cni.cncf.io/v1
+kind: NetworkAttachmentDefinition
+metadata:
+  name: datacentre
+  labels:
+    osp/net: datacentre
+    osp/net-attach-def-type: standard

dt/bgp/networking/netconfig/kustomization.yaml

@@ -39,39 +39,6 @@ replacements:
         fieldPaths:
           - spec.networks.[name=ctlplane].subnets
 
-  # NetConfig dnsDomain
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.tenant.dnsDomain
-    targets:
-      - select:
-          kind: NetConfig
-        fieldPaths:
-          - spec.networks.[name=tenant].dnsDomain
-
-  # NetConfig MTU
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.tenant.mtu
-    targets:
-      - select:
-          kind: NetConfig
-        fieldPaths:
-          - spec.networks.[name=tenant].mtu
-
-  # NetConfig subnets
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.tenant.subnets
-    targets:
-      - select:
-          kind: NetConfig
-        fieldPaths:
-          - spec.networks.[name=tenant].subnets
-
   # BGP NetConfig subnets
   - source:
       kind: ConfigMap

dt/bgp/networking/netconfig/netconfig.yaml

@@ -11,11 +11,6 @@ spec:
       subnets:
         - _replaced_
       mtu: 1500
-    - dnsDomain: _replaced_
-      name: tenant
-      subnets:
-        - _replaced_
-      mtu: 1500
     - dnsDomain: bgpnet0.example.com
       name: bgpnet0
       subnets:

examples/dt/bgp-l3-xl/control-plane/networking/kustomization.yaml

@@ -101,6 +101,24 @@ patches:
         name: .*
       $patch: delete
 
+  # tenant IPAddressPool removed
+  - target:
+      kind: IPAddressPool
+    patch: |-
+      kind: IPAddressPool
+      metadata:
+        name: tenant
+      $patch: delete
+
+  # tenant NAD removed
+  - target:
+      kind: NetworkAttachmentDefinition
+    patch: |-
+      kind: NetworkAttachmentDefinition
+      metadata:
+        name: tenant
+      $patch: delete
+
 replacements:
   # BGP peer IP addresses
   # node3