Merge pull request openstack-k8s-operators#489 from abays/hci_va_network_reorg

Decouple VA1 network stage from control plane stage

This removes the networking components...

MetalLB
NetConfig
Net-attach-def

...from the control plane stage of VA1 and gives them their own separate stage in between the NNCP stage and the control plane stage.  This is needed for the UniGamma adoption job, which relies upon this VA.  They want to create the NNCPs, MetalLB CRs, NetConfig CR and Net-attach-defs, but do NOT want to create the OpenStackControlPlane.  Now they can do so by creating an automation file with only two stages, one for NNCPs and the other for the other networking components.
I have tested this in my local env and the VA deployed successfully via CIFMW.

Reviewed-by: Andrew Bays <andrew.bays@gmail.com>
Reviewed-by: Harald <hjensas@redhat.com>
Reviewed-by: John Fulton <johfulto@redhat.com>

Author: softwarefactory-project-zuul[bot]

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/networking/nncp
         wait_conditions:
           - >-
             oc -n openstack wait nncp
@@ -14,12 +14,12 @@ vas:
             src_file: values.yaml
         build_output: nncp.yaml
 
-      - path: examples/va/hci/control-plane
+      - path: examples/va/hci/control-plane/networking
         wait_conditions:
           - >-
-            oc -n openstack wait nncp
-            -l osp/nncm-config-type=standard
-            --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured
+            oc -n metallb-system wait pod
+            -l app=metallb -l component=speaker
+            --for condition=Ready
             --timeout=5m
         values:
           - name: network-values

automation/vars/hci.yaml

@@ -2,7 +2,7 @@
 vas:
   hci:
     stages:
-      - path: examples/va/hci/control-plane/nncp
+      - path: examples/va/hci/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/va/hci/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/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: networking/nncp/values.yaml
         build_output: ../control-plane.yaml
 
       - path: examples/va/hci/edpm-pre-ceph/nodeset

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/networking/nncp/values.yaml](control-plane/networking/nncp/values.yaml) file to suit your environment.
 ```
-vi control-plane/nncp/values.yaml
+vi control-plane/networking/nncp/values.yaml
 ```
 
 ## Apply node network configuration
 
 Generate the node network configuration
 ```
-kustomize build control-plane/nncp > nncp.yaml
+kustomize build control-plane/networking/nncp > nncp.yaml
 ```
 Apply the NNCP CRs
 ```
@@ -34,13 +34,24 @@ 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 remaining networking configuration
 
-Generate the control-plane and networking CRs.
+Generate the reminaing networking configuration
+```
+kustomize build control-plane/networking > networking.yaml
+```
+Apply the networking CRs
+```
+oc apply -f networking.yaml
+```
+
+## Apply control-plane configuration
+
+Generate the control-plane CR.
 ```
 kustomize build control-plane > control-plane.yaml
 ```
-Apply the CRs
+Apply the CR
 ```
 oc apply -f control-plane.yaml
 ```

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
+  - networking/nncp/values.yaml
   - service-values.yaml

examples/va/hci/control-plane/networking/kustomization.yaml

@@ -0,0 +1,9 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+components:
+  - ../../../../../va/hci/networking
+
+resources:
+  - nncp/values.yaml

…les/va/hci/control-plane/nncp/.gitignore …control-plane/networking/nncp/.gitignoreexamples/va/hci/control-plane/nncp/.gitignore renamed to examples/va/hci/control-plane/networking/nncp/.gitignore examples/va/hci/control-plane/nncp/.gitignore renamed to examples/va/hci/control-plane/networking/nncp/.gitignore

@@ -18,7 +18,7 @@ transformers:
         create: true
 
 components:
-  - ../../../../../lib/nncp
+  - ../../../../../../lib/nncp
 
 resources:
   - values.yaml

…ci/control-plane/nncp/kustomization.yaml …plane/networking/nncp/kustomization.yamlexamples/va/hci/control-plane/nncp/kustomization.yaml renamed to examples/va/hci/control-plane/networking/nncp/kustomization.yaml examples/va/hci/control-plane/nncp/kustomization.yaml renamed to examples/va/hci/control-plane/networking/nncp/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/networking/nncp/values.yaml
   - edpm-pre-ceph/nodeset/values.yaml
   - service-values.yaml
   - values.yaml

…es/va/hci/control-plane/nncp/values.yaml …ontrol-plane/networking/nncp/values.yamlexamples/va/hci/control-plane/nncp/values.yaml renamed to examples/va/hci/control-plane/networking/nncp/values.yaml examples/va/hci/control-plane/nncp/values.yaml renamed to examples/va/hci/control-plane/networking/nncp/values.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