Decouple VA1 network stage from control plane stage

openstack-k8s-operators · Jan 30, 2025 · 527e2fc · 527e2fc
1 parent 44608a4
commit 527e2fc
Show file tree

Hide file tree

Showing 10 changed files with 108 additions and 62 deletions.
diff --git a/automation/vars/hci-adoption.yaml b/automation/vars/hci-adoption.yaml
@@ -2,7 +2,7 @@
 vas:
   hci-adoption:
     stages:
-      - path: examples/va/hci/control-plane/nncp
+      - path: examples/va/hci/control-plane/network/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -23,5 +23,5 @@ vas:
             --timeout=5m
         values:
           - name: network-values
-            src_file: nncp/values.yaml
+            src_file: network/nncp/values.yaml
         build_output: networking.yaml
diff --git a/automation/vars/hci.yaml b/automation/vars/hci.yaml
@@ -2,7 +2,7 @@
 vas:
   hci:
     stages:
-      - path: examples/va/hci/control-plane/nncp
+      - path: examples/va/hci/control-plane/network/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -14,6 +14,18 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
+      - path: examples/va/hci/control-plane/network
+        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/va/hci/control-plane
         wait_conditions:
           - >-
@@ -23,7 +35,7 @@ vas:
           - name: service-values
             src_file: service-values.yaml
           - name: network-values
-            src_file: nncp/values.yaml
+            src_file: network/nncp/values.yaml
         build_output: ../control-plane.yaml
 
       - path: examples/va/hci/edpm-pre-ceph/nodeset

diff --git a/examples/va/hci/control-plane.md b/examples/va/hci/control-plane.md
@@ -14,16 +14,16 @@ Change to the hci directory
 ```
 cd architecture/examples/va/hci
 ```
-Edit the [control-plane/nncp/values.yaml](control-plane/nncp/values.yaml) file to suit your environment.
+Edit the [control-plane/network/nncp/values.yaml](control-plane/network/nncp/values.yaml) file to suit your environment.
 ```
-vi control-plane/nncp/values.yaml
+vi control-plane/network/nncp/values.yaml
 ```
 
 ## Apply node network configuration
 
 Generate the node network configuration
 ```
-kustomize build control-plane/nncp > nncp.yaml
+kustomize build control-plane/network/nncp > nncp.yaml
 ```
 Apply the NNCP CRs
 ```
@@ -34,6 +34,17 @@ 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 remaining networking configuration
+
+Generate the reminaing network configuration
+```
+kustomize build control-plane/network > network.yaml
+```
+Apply the network CRs
+```
+oc apply -f network.yaml
+```
+
 ## Apply networking and control-plane configuration
 
 Generate the control-plane and networking CRs.

diff --git a/examples/va/hci/control-plane/kustomization.yaml b/examples/va/hci/control-plane/kustomization.yaml
@@ -9,5 +9,5 @@ components:
   ## https://github.com/kubernetes-sigs/kustomize/blob/master/examples/remoteBuild.md
 
 resources:
-  - nncp/values.yaml
+  - network/nncp/values.yaml
   - service-values.yaml
diff --git a/examples/va/hci/control-plane/network/kustomization.yaml b/examples/va/hci/control-plane/network/kustomization.yaml
@@ -0,0 +1,75 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+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/metallb
+  - ../../../../../lib/networking/netconfig
+  - ../../../../../lib/networking/nad
+
+resources:
+  - nncp/values.yaml
+
+# Add storagemgmt network template, as it is needed for CephHCI
+patches:
+  - target:
+      version: v1beta1
+      kind: NetConfig
+      name: netconfig
+    patch: |-
+      - op: add
+        path: /spec/networks/-
+        value:
+          dnsDomain: _replaced_
+          name: storagemgmt
+          subnets:
+            - _replaced_
+          mtu: 1500
+
+# Add storagemgmt network replacements
+replacements:
+  # NetConfig dnsDomain specific to this VA
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storagemgmt.dnsDomain
+    targets:
+      - select:
+          kind: NetConfig
+        fieldPaths:
+          - spec.networks.[name=storagemgmt].dnsDomain
+  # NetConfig MTU specific to this VA
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storagemgmt.mtu
+    targets:
+      - select:
+          kind: NetConfig
+        fieldPaths:
+          - spec.networks.[name=storagemgmt].mtu
+  # NetConfig subnets specific to this VA
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storagemgmt.subnets
+    targets:
+      - select:
+          kind: NetConfig
+        fieldPaths:
+          - spec.networks.[name=storagemgmt].subnets
diff --git a/...ples/va/hci/control-plane/nncp/.gitignore → ...hci/control-plane/network/nncp/.gitignore b/...ples/va/hci/control-plane/nncp/.gitignore → ...hci/control-plane/network/nncp/.gitignore
diff --git a/...hci/control-plane/nncp/kustomization.yaml → ...rol-plane/network/nncp/kustomization.yaml b/...hci/control-plane/nncp/kustomization.yaml → ...rol-plane/network/nncp/kustomization.yaml
@@ -18,7 +18,7 @@ transformers:
         create: true
 
 components:
-  - ../../../../../lib/nncp
+  - ../../../../../../lib/nncp
 
 resources:
   - values.yaml
diff --git a/...les/va/hci/control-plane/nncp/values.yaml → ...ci/control-plane/network/nncp/values.yaml b/...les/va/hci/control-plane/nncp/values.yaml → ...ci/control-plane/network/nncp/values.yaml
diff --git a/examples/va/hci/kustomization.yaml b/examples/va/hci/kustomization.yaml
@@ -10,7 +10,7 @@ components:
   ## https://github.com/kubernetes-sigs/kustomize/blob/master/examples/remoteBuild.md
 
 resources:
-  - control-plane/nncp/values.yaml
+  - control-plane/network/nncp/values.yaml
   - edpm-pre-ceph/nodeset/values.yaml
   - service-values.yaml
   - values.yaml
diff --git a/va/hci/kustomization.yaml b/va/hci/kustomization.yaml
@@ -18,56 +18,4 @@ transformers:
         create: true
 
 components:
-  - ../../lib/networking/metallb
-  - ../../lib/networking/netconfig
-  - ../../lib/networking/nad
   - ../../lib/control-plane
-
-# Add storagemgmt network template, as it is needed for CephHCI
-patches:
-  - target:
-      version: v1beta1
-      kind: NetConfig
-      name: netconfig
-    patch: |-
-      - op: add
-        path: /spec/networks/-
-        value:
-          dnsDomain: _replaced_
-          name: storagemgmt
-          subnets:
-            - _replaced_
-          mtu: 1500
-
-# Add storagemgmt network replacements
-replacements:
-  # NetConfig dnsDomain specific to this VA
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.storagemgmt.dnsDomain
-    targets:
-      - select:
-          kind: NetConfig
-        fieldPaths:
-          - spec.networks.[name=storagemgmt].dnsDomain
-  # NetConfig MTU specific to this VA
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.storagemgmt.mtu
-    targets:
-      - select:
-          kind: NetConfig
-        fieldPaths:
-          - spec.networks.[name=storagemgmt].mtu
-  # NetConfig subnets specific to this VA
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.storagemgmt.subnets
-    targets:
-      - select:
-          kind: NetConfig
-        fieldPaths:
-          - spec.networks.[name=storagemgmt].subnets