Decouple bgp-l3-xl networking stage from controlplane stage

Similar to previous commit, but applying to the bgp-l3-xl DT.

Author: eduolivares

automation/vars/bgp-l3-xl.yaml

@@ -64,7 +64,7 @@ vas:
             namespace: openshift-cluster-node-tuning-operator
             state: present
         name: nncp-configuration
-        path: examples/dt/bgp-l3-xl/control-plane/nncp
+        path: examples/dt/bgp-l3-xl/control-plane/networking/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -76,6 +76,18 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
+      - name: networking
+        path: examples/dt/bgp-l3-xl/control-plane/networking
+        wait_conditions:
+          - >-
+            oc -n metallb-system wait pod
+            -l app=metallb -l component=speaker
+            --for condition=Ready
+        values:
+          - name: network-values
+            src_file: nncp/values.yaml
+        build_output: networking.yaml
+
       - name: control-plane
         path: examples/dt/bgp-l3-xl/control-plane
         wait_conditions:
@@ -86,7 +98,7 @@ vas:
             --timeout=30m
         values:
           - name: network-values
-            src_file: nncp/values.yaml
+            src_file: networking/nncp/values.yaml
           - name: service-values
             src_file: service-values.yaml
         build_output: control-plane.yaml

examples/dt/bgp-l3-xl/control-plane.md

@@ -16,19 +16,19 @@ Change to the bgp-l3-xl/control-plane directory
 ```
 cd architecture/examples/dt/bgp-l3-xl/control-plane
 ```
-Edit the [nncp/values.yaml](control-plane/nncp/values.yaml) and
+Edit the [networking/nncp/values.yaml](control-plane/networking/nncp/values.yaml) and
 [service-values.yaml](control-plane/service-values.yaml) files to suit
 your environment.
 ```
-vi nncp/values.yaml
+vi networking/nncp/values.yaml
 vi service-values.yaml
 ```
 
 ## Apply node network configuration
 
 Generate the node network configuration
 ```
-kustomize build nncp > nncp.yaml
+kustomize build networking/nncp > nncp.yaml
 ```
 Apply the NNCP CRs
 ```
@@ -39,9 +39,20 @@ Wait for NNCPs to be available
 oc wait nncp -l osp/nncm-config-type=standard --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured --timeout=300s
 ```
 
-## Apply networking and control-plane configuration
+## Apply the remaining networking configuration
 
-Generate the control-plane and networking CRs.
+Generate the networking CRs.
+```
+kustomize build networking > networking.yaml
+```
+Apply the CRs
+```
+oc apply -f networking.yaml
+```
+
+## Apply control-plane configuration
+
+Generate the control-plane CRs.
 ```
 kustomize build > control-plane.yaml
 ```

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

@@ -6,10 +6,8 @@ components:
   - ../../../../dt/bgp/
 
 resources:
-  - nncp/values.yaml
+  - networking/nncp/values.yaml
   - service-values.yaml
-  - metallb_bgppeers.yaml
-  - ocp_networks_netattach.yaml
 
 transformers:
   # Set namespace to OpenStack on all namespaced objects without a namespace
@@ -26,296 +24,7 @@ transformers:
         kind: Namespace
         create: true
 
-patches:
-  # Add BGPPeer to BGPAdvertisement
-  - target:
-      kind: BGPAdvertisement
-    patch: |-
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-3-0
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-3-1
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-4-0
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-4-1
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-5-0
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-5-1
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-6-0
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-6-1
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-7-0
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-7-1
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-8-0
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-8-1
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-9-0
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-9-1
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-10-0
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-10-1
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-11-0
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-11-1
-      - op: add
-        path: /spec/peers/-
-        value: bgp-peer-node-12-0
-  - target:
-      kind: NetworkAttachmentDefinition
-      labelSelector: "osp/net-attach-def-type=bgp"
-    path: ocp_network_template.yaml
-
-  # All L2Advertisements are removed
-  - target:
-      kind: L2Advertisement
-    patch: |-
-      kind: L2Advertisement
-      metadata:
-        name: .*
-      $patch: delete
-
 replacements:
-  # BGP peer IP addresses
-  # node3
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_3.bgp_peers.0
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-3-0
-        fieldPaths:
-          - spec.peerAddress
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_3.bgp_peers.1
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-3-1
-        fieldPaths:
-          - spec.peerAddress
-  # node4
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_4.bgp_peers.0
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-4-0
-        fieldPaths:
-          - spec.peerAddress
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_4.bgp_peers.1
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-4-1
-        fieldPaths:
-          - spec.peerAddress
-  # node5
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_5.bgp_peers.0
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-5-0
-        fieldPaths:
-          - spec.peerAddress
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_5.bgp_peers.1
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-5-1
-        fieldPaths:
-          - spec.peerAddress
-  # node6
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_6.bgp_peers.0
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-6-0
-        fieldPaths:
-          - spec.peerAddress
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_6.bgp_peers.1
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-6-1
-        fieldPaths:
-          - spec.peerAddress
-  # node7
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_7.bgp_peers.0
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-7-0
-        fieldPaths:
-          - spec.peerAddress
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_7.bgp_peers.1
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-7-1
-        fieldPaths:
-          - spec.peerAddress
-  # node8
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_8.bgp_peers.0
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-8-0
-        fieldPaths:
-          - spec.peerAddress
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_8.bgp_peers.1
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-8-1
-        fieldPaths:
-          - spec.peerAddress
-  # node9
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_9.bgp_peers.0
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-9-0
-        fieldPaths:
-          - spec.peerAddress
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_9.bgp_peers.1
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-9-1
-        fieldPaths:
-          - spec.peerAddress
-  # node10
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_10.bgp_peers.0
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-10-0
-        fieldPaths:
-          - spec.peerAddress
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_10.bgp_peers.1
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-10-1
-        fieldPaths:
-          - spec.peerAddress
-  # node11
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_11.bgp_peers.0
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-11-0
-        fieldPaths:
-          - spec.peerAddress
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_11.bgp_peers.1
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-11-1
-        fieldPaths:
-          - spec.peerAddress
-  # node12
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.node_12.bgp_peers.0
-    targets:
-      - select:
-          kind: BGPPeer
-          name: bgp-peer-node-12-0
-        fieldPaths:
-          - spec.peerAddress
-
-  # BGP NetworkAttachmentDefinition customization
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.bgp.net-attach-def.node12
-    targets:
-      - select:
-          kind: NetworkAttachmentDefinition
-          name: bgpnet-worker-9
-        fieldPaths:
-          - spec.config
   # disable OCP workers as gateway nodes
   - source:
       kind: ConfigMap