Decouple uni07eta network stage from control plane stage

dsariel · dsariel · commit 8c575e214155 · 2025-02-07T11:34:44.000+02:00
diff --git a/automation/vars/uni07eta-adoption.yaml b/automation/vars/uni07eta-adoption.yaml
@@ -0,0 +1,27 @@
+---
+vas:
+  uni07eta-adoption:
+    stages:
+      - path: examples/dt/un07eta/control-plane/networking/nncp
+        wait_conditions:
+          - >-
+            oc -n openstack wait nncp
+            -l osp/nncm-config-type=standard
+            --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured
+            --timeout=5m
+        values:
+          - name: network-values
+            src_file: values.yaml
+        build_output: nncp.yaml
+
+      - path: examples/dt/un07eta/control-plane/networking
+        wait_conditions:
+          - >-
+            oc -n metallb-system wait pod
+            -l app=metallb -l component=speaker
+            --for condition=Ready
+            --timeout=5m
+        values:
+          - name: network-values
+            src_file: nncp/values.yaml
+        build_output: networking.yaml
diff --git a/automation/vars/uni07eta.yaml b/automation/vars/uni07eta.yaml
@@ -2,7 +2,7 @@
 vas:
   uni07eta:
     stages:
-      - path: examples/dt/uni07eta/control-plane/nncp
+      - path: examples/dt/uni07eta/control-plane/networking/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -14,6 +14,18 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
+      - path: examples/dt/uni07eta/control-plane/networking
+        wait_conditions:
+          - >-
+            oc -n metallb-system wait pod
+            -l app=metallb -l component=speaker
+            --for condition=Ready
+            --timeout=5m
+        values:
+          - name: network-values
+            src_file: nncp/values.yaml
+        build_output: network.yaml
+
       - path: examples/dt/uni07eta/control-plane
         wait_conditions:
           - >-
@@ -23,7 +35,7 @@ vas:
             --timeout=60m
         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
diff --git a/dt/uni07eta/kustomization.yaml b/dt/uni07eta/kustomization.yaml
@@ -24,9 +24,6 @@ transformers:
           create: true
 
 components:
-  - ../../lib/networking/metallb
-  - ../../lib/networking/netconfig
-  - ../../lib/networking/nad
   - ../../lib/control-plane
 
 resources:
@@ -344,13 +341,14 @@ replacements:
         options:
           create: true
 
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.octavia.net-attach-def
-    targets:
-      - select:
-          kind: NetworkAttachmentDefinition
-          name: octavia
-        fieldPaths:
-          - spec.config
+# # TODO: check this again
+# - source:
+#     kind: ConfigMap
+#     name: network-values
+#     fieldPath: data.octavia.net-attach-def
+#   targets:
+#     - select:
+#         kind: NetworkAttachmentDefinition
+#         name: octavia
+#       fieldPaths:
+#         - spec.config
diff --git a/dt/uni07eta/networking/kustomization.yaml b/dt/uni07eta/networking/kustomization.yaml
@@ -0,0 +1,22 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+transformers:
+  - |-
+      apiVersion: builtin
+      kind: NamespaceTransformer
+      metadata:
+        name: _ignored_
+        namespace: openstack
+      setRoleBindingSubjects: none
+      unsetOnly: true
+      fieldSpecs:
+        - path: metadata/name
+          kind: Namespace
+          create: true
+
+components:
+  - ../../../lib/networking/metallb
+  - ../../../lib/networking/netconfig
+  - ../../../lib/networking/nad
diff --git a/dt/uni07eta/nncp/kustomization.yaml b/dt/uni07eta/nncp/kustomization.yaml
@@ -185,3 +185,14 @@ replacements:
           name: master-2
         fieldPaths:
           - spec.desiredState.interfaces.[name=octavia].vlan.id
+
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.octavia.net-attach-def
+    targets:
+      - select:
+          kind: NetworkAttachmentDefinition
+          name: octavia
+        fieldPaths:
+          - spec.config
diff --git a/examples/dt/uni07eta/control-plane.md b/examples/dt/uni07eta/control-plane.md
@@ -28,12 +28,12 @@ cd architecture/examples/dt/uni07eta
 ```
 
 Edit [control-plane/service-values.yaml](control-plane/service-values.yaml) and
-[control-plane/nncp/values.yaml](control-plane/nncp/values.yaml).
+[control-plane/networking/nncp/values.yaml](control-plane/networking/nncp/values.yaml).
 
 Apply node network configuration
 
 ```bash
-pushd control-plane/nncp
+pushd control-plane/networking/nncp
 kustomize build > nncp.yaml
 oc apply -f nncp.yaml
 oc wait nncp \
@@ -43,6 +43,18 @@ oc wait nncp \
 popd
 ```
 
+## Apply remaining networking configuration
+
+Generate the reminaing networking configuration
+```
+kustomize build control-plane/networking > networking.yaml
+```
+Apply the networking CRs
+```
+oc apply -f networking.yaml
+```
+
+
 Generate the control-plane and networking CRs.
 
 ```bash
diff --git a/examples/dt/uni07eta/control-plane/kustomization.yaml b/examples/dt/uni07eta/control-plane/kustomization.yaml
@@ -6,5 +6,5 @@ components:
   - ../../../../dt/uni07eta
 
 resources:
-  - nncp/values.yaml
+  - networking/nncp/values.yaml
   - service-values.yaml
diff --git a/examples/dt/uni07eta/control-plane/networking/kustomization.yaml b/examples/dt/uni07eta/control-plane/networking/kustomization.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+components:
+  - ../../../../../dt/uni07eta/networking
+
+resources:
+  - nncp/values.yaml
diff --git a/examples/dt/uni07eta/control-plane/networking/nncp/kustomization.yaml b/examples/dt/uni07eta/control-plane/networking/nncp/kustomization.yaml
@@ -3,7 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 components:
-  - ../../../../../dt/uni07eta/nncp
+  - ../../../../../../dt/uni07eta/nncp
 
 resources:
   - values.yaml
diff --git a/examples/dt/uni07eta/control-plane/networking/nncp/values.yaml b/examples/dt/uni07eta/control-plane/networking/nncp/values.yaml
diff --git a/examples/dt/uni07eta/kustomization.yaml b/examples/dt/uni07eta/kustomization.yaml
@@ -6,4 +6,5 @@ components:
   - ../../../dt/uni07eta/edpm
 
 resources:
+  - control-plane/networking/nncp/values.yaml
   - values.yaml
diff --git a/zuul.d/validations.yaml b/zuul.d/validations.yaml
@@ -312,7 +312,8 @@
     - dt/uni07eta
     - examples/dt/uni07eta
     - examples/dt/uni07eta/control-plane
-    - examples/dt/uni07eta/control-plane/nncp
+    - examples/dt/uni07eta/control-plane/networking
+    - examples/dt/uni07eta/control-plane/networking/nncp
     - examples/dt/uni07eta/edpm
     - examples/dt/uni07eta/networker
     - examples/dt/uni07eta/networker/nodeset
