fix NAD

openstack-k8s-operators · Apr 19, 2024 · 2295f26 · 2295f26
1 parent bb6cf1b
commit 2295f26
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/dt/bgp/kustomization.yaml b/dt/bgp/kustomization.yaml
@@ -75,7 +75,6 @@ patches:
           subnets:
             - _replaced_
           mtu: 1500
-
   # Enable octavia and heat
   - target:
       kind: OpenStackControlPlane
@@ -91,6 +90,15 @@ patches:
       - op: replace
         path: /spec/heat/enabled
         value: true
+  # Connect ovnNorthd to internalapi
+  - target:
+      kind: OpenStackControlPlane
+      name: controlplane
+    patch: |-
+      - op: add
+        path: /spec/ovn/template/ovnNorthd
+        value:
+          networkAttachment: internalapi
 
 replacements:
   # BGP NetConfig customizations

diff --git a/dt/bgp/networking/nad/kustomization.yaml b/dt/bgp/networking/nad/kustomization.yaml
@@ -8,7 +8,7 @@ resources:
 patches:
   - target:
       kind: NetworkAttachmentDefinition
-      labelSelector: "osp/net-attach-def-type=standard"
+      labelSelector: "osp/net-attach-def-type=bgp"
     path: ocp_network_template.yaml
 
 replacements:

diff --git a/dt/bgp/networking/nad/ocp_networks_netattach.yaml b/dt/bgp/networking/nad/ocp_networks_netattach.yaml
@@ -5,44 +5,44 @@ metadata:
   name: bgpnet-0-0
   labels:
     osp/net: bgpnet-0-0
-    osp/net-attach-def-type: standard
+    osp/net-attach-def-type: bgp
 ---
 apiVersion: k8s.cni.cncf.io/v1
 kind: NetworkAttachmentDefinition
 metadata:
   name: bgpnet-0-1
   labels:
     osp/net: bgpnet-0-1
-    osp/net-attach-def-type: standard
+    osp/net-attach-def-type: bgp
 ---
 apiVersion: k8s.cni.cncf.io/v1
 kind: NetworkAttachmentDefinition
 metadata:
   name: bgpnet-1-0
   labels:
     osp/net: bgpnet-1-0
-    osp/net-attach-def-type: standard
+    osp/net-attach-def-type: bgp
 ---
 apiVersion: k8s.cni.cncf.io/v1
 kind: NetworkAttachmentDefinition
 metadata:
   name: bgpnet-1-1
   labels:
     osp/net: bgpnet-1-1
-    osp/net-attach-def-type: standard
+    osp/net-attach-def-type: bgp
 ---
 apiVersion: k8s.cni.cncf.io/v1
 kind: NetworkAttachmentDefinition
 metadata:
   name: bgpnet-2-0
   labels:
     osp/net: bgpnet-2-0
-    osp/net-attach-def-type: standard
+    osp/net-attach-def-type: bgp
 ---
 apiVersion: k8s.cni.cncf.io/v1
 kind: NetworkAttachmentDefinition
 metadata:
   name: bgpnet-2-1
   labels:
     osp/net: bgpnet-2-1
-    osp/net-attach-def-type: standard
+    osp/net-attach-def-type: bgp