[Draft] Add worke node to run test operator on uni04delta

Julia Marciano · gmarcian · commit f8d1259405ad · 2024-11-14T04:37:51.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ examples/dt/uni*/control-plane/control-plane.yaml
 examples/dt/uni*/control-plane/nncp/nncp.yaml
 examples/dt/uni*/data-plane.yaml
 examples/dt/uni*/networker/edpm-networker.yaml
+.idea/
diff --git a/dt/uni04delta-ipv6/nncp/kustomization.yaml b/dt/uni04delta-ipv6/nncp/kustomization.yaml
@@ -55,6 +55,11 @@ patches:
       name: master-2
     patch: *ironicbr_template
 
+  - target:
+      kind: NodeNetworkConfigurationPolicy
+      name: worker-0
+    patch: *ironicbr_template
+
   - target:
       kind: NodeNetworkConfigurationPolicy
       name: master-0
@@ -81,6 +86,11 @@ patches:
       name: master-2
     patch: *ironicvrf_template
 
+  - target:
+      kind: NodeNetworkConfigurationPolicy
+      name: worker-0
+    patch: *ironicvrf_template
+
   - target:
       kind: NodeNetworkConfigurationPolicy
       name: master-0
@@ -118,6 +128,11 @@ patches:
       name: master-2
     patch: *routes
 
+  - target:
+      kind: NodeNetworkConfigurationPolicy
+      name: worker-0
+    patch: *routes
+
 replacements:
 
   - source:
@@ -140,6 +155,12 @@ replacements:
           name: master-2
         fieldPaths:
           - spec.desiredState.interfaces.[name=ironic].bridge.port.0.name
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: worker-0
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=ironic].bridge.port.0.name
+
 
   - source:
       kind: ConfigMap
@@ -174,6 +195,17 @@ replacements:
         fieldPaths:
           - spec.desiredState.interfaces.[name=ironic].ipv6.address.0.ip
 
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.node_3.ironic_ip
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: worker-0
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=ironic].ipv6.address.0.ip
+
   - source:
       kind: ConfigMap
       name: network-values
@@ -194,6 +226,12 @@ replacements:
           name: master-2
         fieldPaths:
           - spec.desiredState.interfaces.[name=ironic].ipv6.address.0.prefix-length
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: worker-0
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=ironic].ipv6.address.0.prefix-length
+
 
   - source:
       kind: ConfigMap
@@ -215,6 +253,11 @@ replacements:
           name: master-2
         fieldPaths:
           - spec.desiredState.routes.config.0.next-hop-address
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: worker-0
+        fieldPaths:
+          - spec.desiredState.routes.config.0.next-hop-address
 
   - source:
       kind: ConfigMap
@@ -239,6 +282,13 @@ replacements:
         fieldPaths:
           - spec.desiredState.routes.config.1.next-hop-address
           - spec.desiredState.routes.config.2.next-hop-address
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: worker-0
+        fieldPaths:
+          - spec.desiredState.routes.config.1.next-hop-address
+          - spec.desiredState.routes.config.2.next-hop-address
+
 
   - source:
       kind: ConfigMap
@@ -260,3 +310,8 @@ replacements:
           name: master-2
         fieldPaths:
           - spec.desiredState.routes.config.1.destination
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: worker-0
+        fieldPaths:
+          - spec.desiredState.routes.config.1.destination
diff --git a/examples/dt/uni04delta-ipv6/control-plane/nncp/kustomization.yaml b/examples/dt/uni04delta-ipv6/control-plane/nncp/kustomization.yaml
@@ -5,3 +5,130 @@ components:
   - ../../../../../dt/uni04delta-ipv6/nncp
 resources:
   - values.yaml
+  - ocp_worker_nodes.yaml
+
+replacements:
+  # Static Node IPs: node-3
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.node_3.internalapi_ip
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: node-3
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=internalapi].ipv6.address.0.ip
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.node_3.tenant_ip
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: node-3
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=tenant].ipv6.address.0.ip
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.node_3.ctlplane_ip
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: node-3
+        fieldPaths:
+          - spec.desiredState.interfaces.[type=linux-bridge].ipv6.address.0.ip
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.node_3.storage_ip
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: node-3
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=storage].ipv6.address.0.ip
+
+  # prefix-length: node-3
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.ctlplane.prefix-length
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: node-3
+        fieldPaths:
+          - spec.desiredState.interfaces.[type=linux-bridge].ipv6.address.0.prefix-length
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.internalapi.prefix-length
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: node-3
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=internalapi].ipv6.address.0.prefix-length
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.tenant.prefix-length
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: node-3
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=tenant].ipv6.address.0.prefix-length
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.storage.prefix-length
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: node-3
+        fieldPaths:
+          - spec.desiredState.interfaces.[name=storage].ipv6.address.0.prefix-length
+
+  - source:
+      kind: ConfigMap
+      name: network-values
+      fieldPath: data.node_3.name
+    targets:
+      - select:
+          kind: NodeNetworkConfigurationPolicy
+          name: node-3
+        fieldPaths:
+          - metadata.name
+          - spec.nodeSelector.[kubernetes.io/hostname]
+
+patches:
+  - target:
+      kind: NodeNetworkConfigurationPolicy
+      name: master-0
+    patch: |-
+      - op: add
+        path: /spec/nodeSelector/node-role.kubernetes.io~1master
+        value: ""
+      - op: remove
+        path: /spec/nodeSelector/node-role.kubernetes.io~1worker
+  - target:
+      kind: NodeNetworkConfigurationPolicy
+      name: master-1
+    patch: |-
+      - op: add
+        path: /spec/nodeSelector/node-role.kubernetes.io~1master
+        value: ""
+      - op: remove
+        path: /spec/nodeSelector/node-role.kubernetes.io~1worker
+  - target:
+      kind: NodeNetworkConfigurationPolicy
+      name: master-2
+    patch: |-
+      - op: add
+        path: /spec/nodeSelector/node-role.kubernetes.io~1master
+        value: ""
+      - op: remove
+        path: /spec/nodeSelector/node-role.kubernetes.io~1worker
diff --git a/examples/dt/uni04delta-ipv6/control-plane/nncp/ocp_worker_nodes.yaml b/examples/dt/uni04delta-ipv6/control-plane/nncp/ocp_worker_nodes.yaml
@@ -0,0 +1,7 @@
+---
+apiVersion: nmstate.io/v1
+kind: NodeNetworkConfigurationPolicy
+metadata:
+  name: node-3
+  labels:
+    osp/nncm-config-type: standard
diff --git a/examples/dt/uni04delta-ipv6/control-plane/nncp/values.yaml b/examples/dt/uni04delta-ipv6/control-plane/nncp/values.yaml
@@ -32,6 +32,15 @@ data:
     ctlplane_ip: "2620:cf:cf:aaaa::12"
     storage_ip: "2620:cf:cf:cccc::12"
     ironic_ip: "2620:cf:cf:ffff::12"
+  node_3:
+    name: ocp-worker-0
+    node_name: master-0.ocp.openstack.lab
+    internalapi_ip: "2620:cf:cf:bbbb::13"
+    tenant_ip: "2620:cf:cf:eeee::13"
+    ctlplane_ip: "2620:cf:cf:aaaa::13"
+    storage_ip: "2620:cf:cf:cccc::13"
+    ironic_ip: "2620:cf:cf:ffff::13"
+
   # networks
   ctlplane:
     dnsDomain: ctlplane.example.com
