Merge pull request #572 from eduolivares/bgp-cp-network-split

Decouple BGP network stage from control plane stage

This removes the networking components metallb, NetConfig and NAD from the controlplane stage of BGP.
Our expectation is that this helps to avoid OSPRH-16282 Besides, this would align BGP jobs with Uni jobs and aparently this decoupling will be needed to test adoption.
This change was created using the following PR as inspiration: #489

Reviewed-by: John Fulton <[email protected]>

Author: softwarefactory-project-zuul[bot]

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

automation/vars/bgp_dt01.yaml

@@ -52,7 +52,7 @@ vas:
             namespace: openshift-cluster-node-tuning-operator
             state: present
         name: nncp-configuration
-        path: examples/dt/bgp_dt01/control-plane/nncp
+        path: examples/dt/bgp_dt01/control-plane/networking/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -64,6 +64,18 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
+      - name: networking
+        path: examples/dt/bgp_dt01/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_dt01/control-plane
         wait_conditions:
@@ -74,7 +86,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

dt/bgp/kustomization.yaml

@@ -25,63 +25,9 @@ transformers:
         create: true
 
 components:
-  - ../../lib/networking
-  - networking/bgpmetallb
   - ../../lib/control-plane
 
-resources:
-  - ocp_networks_octavia_netattach.yaml
-
 patches:
-  # Add BGP networks to NetConfig
-  - target:
-      kind: NetConfig
-      name: netconfig
-    patch: |-
-      - op: add
-        path: /spec/networks/-
-        value:
-          dnsDomain: bgpnet0.example.com
-          name: bgpnet0
-          subnets:
-            - _replaced_
-          mtu: 1500
-  - target:
-      kind: NetConfig
-      name: netconfig
-    patch: |-
-      - op: add
-        path: /spec/networks/-
-        value:
-          dnsDomain: bgpnet1.example.com
-          name: bgpnet1
-          subnets:
-            - _replaced_
-          mtu: 1500
-  - target:
-      kind: NetConfig
-      name: netconfig
-    patch: |-
-      - op: add
-        path: /spec/networks/-
-        value:
-          dnsDomain: bgpmainnet.example.com
-          name: bgpmainnet
-          subnets:
-            - _replaced_
-          mtu: 1500
-  - target:
-      kind: NetConfig
-      name: netconfig
-    patch: |-
-      - op: add
-        path: /spec/networks/-
-        value:
-          dnsDomain: bgpmainnetv6.example.com
-          name: bgpmainnetv6
-          subnets:
-            - _replaced_
-          mtu: 1500
   # Enable heat
   - target:
       kind: OpenStackControlPlane
@@ -101,44 +47,6 @@ patches:
           networkAttachment: internalapi
 
 replacements:
-  # BGP NetConfig customizations
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.bgp.subnets.bgpnet0
-    targets:
-      - select:
-          kind: NetConfig
-        fieldPaths:
-          - spec.networks.[name=bgpnet0].subnets
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.bgp.subnets.bgpnet1
-    targets:
-      - select:
-          kind: NetConfig
-        fieldPaths:
-          - spec.networks.[name=bgpnet1].subnets
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.bgp.subnets.bgpmainnet
-    targets:
-      - select:
-          kind: NetConfig
-        fieldPaths:
-          - spec.networks.[name=bgpmainnet].subnets
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.bgp.subnets.bgpmainnetv6
-    targets:
-      - select:
-          kind: NetConfig
-        fieldPaths:
-          - spec.networks.[name=bgpmainnetv6].subnets
-
   # Control plane customization to use glance with swift
   - source:
       kind: ConfigMap
@@ -304,14 +212,3 @@ replacements:
           - spec.octavia.template.octaviaWorker.customServiceConfig
         options:
           create: true
-
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.octavia.net-attach-def
-    targets:
-      - select:
-          kind: NetworkAttachmentDefinition
-          name: octavia
-        fieldPaths:
-          - spec.config

dt/bgp/namespace.yaml

@@ -0,0 +1,125 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+transformers:
+  # Set namespace to OpenStack on all namespaced objects without a namespace
+  - |-
+    apiVersion: builtin
+    kind: NamespaceTransformer
+    metadata:
+      name: _ignored_
+      namespace: openstack
+    setRoleBindingSubjects: none
+    unsetOnly: true
+    fieldSpecs:
+      - path: metadata/name
+        kind: Namespace
+        create: true
+
+components:
+  - ../../../lib/networking
+  - bgpmetallb
+
+resources:
+  - ocp_networks_octavia_netattach.yaml
+
+patches:
+  # Add BGP networks to NetConfig
+  - target:
+      kind: NetConfig
+      name: netconfig
+    patch: |-
+      - op: add
+        path: /spec/networks/-
+        value:
+          dnsDomain: bgpnet0.example.com
+          name: bgpnet0
+          subnets:
+            - _replaced_
+          mtu: 1500
+  - target:
+      kind: NetConfig
+      name: netconfig
+    patch: |-
+      - op: add
+        path: /spec/networks/-
+        value:
+          dnsDomain: bgpnet1.example.com
+          name: bgpnet1
+          subnets:
+            - _replaced_
+          mtu: 1500
+  - target:
+      kind: NetConfig
+      name: netconfig
+    patch: |-
+      - op: add
+        path: /spec/networks/-
+        value:
+          dnsDomain: bgpmainnet.example.com
+          name: bgpmainnet
+          subnets:
+            - _replaced_
+          mtu: 1500
+  - target:
+      kind: NetConfig
+      name: netconfig
+    patch: |-
+      - op: add
+        path: /spec/networks/-
+        value:
+          dnsDomain: bgpmainnetv6.example.com
+          name: bgpmainnetv6
+          subnets:
+            - _replaced_
+          mtu: 1500
+
+replacements:
+  # BGP NetConfig customizations
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.bgp.subnets.bgpnet0
+    targets:
+      - select:
+          kind: NetConfig
+        fieldPaths:
+          - spec.networks.[name=bgpnet0].subnets
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.bgp.subnets.bgpnet1
+    targets:
+      - select:
+          kind: NetConfig
+        fieldPaths:
+          - spec.networks.[name=bgpnet1].subnets
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.bgp.subnets.bgpmainnet
+    targets:
+      - select:
+          kind: NetConfig
+        fieldPaths:
+          - spec.networks.[name=bgpmainnet].subnets
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.bgp.subnets.bgpmainnetv6
+    targets:
+      - select:
+          kind: NetConfig
+        fieldPaths:
+          - spec.networks.[name=bgpmainnetv6].subnets
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.octavia.net-attach-def
+    targets:
+      - select:
+          kind: NetworkAttachmentDefinition
+          name: octavia
+        fieldPaths:
+          - spec.config

dt/bgp/networking/kustomization.yaml

@@ -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
 ```