diff --git a/dt/bgp/kustomization.yaml b/dt/bgp/kustomization.yaml index 71f7ef16b..69783ede5 100644 --- a/dt/bgp/kustomization.yaml +++ b/dt/bgp/kustomization.yaml @@ -33,6 +33,19 @@ resources: - ocp_networks_octavia_netattach.yaml patches: + # Add octavia network to NetConfig + - target: + kind: NetConfig + name: netconfig + patch: |- + - op: add + path: /spec/networks/- + value: + dnsDomain: octavia.example.com + name: octavia + subnets: + - _replaced_ + mtu: 1500 # Add BGP networks to NetConfig - target: kind: NetConfig @@ -101,6 +114,16 @@ patches: networkAttachment: internalapi replacements: + # octavia NetConfig customizations + - source: + kind: ConfigMap + name: network-values + fieldPath: data.octavia.subnets + targets: + - select: + kind: NetConfig + fieldPaths: + - spec.networks.[name=octavia].subnets # BGP NetConfig customizations - source: kind: ConfigMap diff --git a/dt/uni01alpha/kustomization.yaml b/dt/uni01alpha/kustomization.yaml index 9a40b00df..f5921e3ea 100644 --- a/dt/uni01alpha/kustomization.yaml +++ b/dt/uni01alpha/kustomization.yaml @@ -204,12 +204,12 @@ replacements: - source: kind: ConfigMap name: service-values - fieldPath: data.octavia.availabilityZones + fieldPath: data.octavia.lbMgmtNetwork targets: - select: kind: OpenStackControlPlane fieldPaths: - - spec.octavia.template.lbMgmtNetwork.availabilityZones + - spec.octavia.template.lbMgmtNetwork options: create: true diff --git a/examples/dt/bgp/bgp_dt01/control-plane/nncp/values.yaml b/examples/dt/bgp/bgp_dt01/control-plane/nncp/values.yaml index 8605b5db1..42ec18625 100644 --- a/examples/dt/bgp/bgp_dt01/control-plane/nncp/values.yaml +++ b/examples/dt/bgp/bgp_dt01/control-plane/nncp/values.yaml @@ -237,7 +237,17 @@ data: } } octavia: - dnsDomain: octavia.openstack.lab + dnsDomain: octavia.example.com + subnets: + - allocationRanges: + - end: 172.23.0.250 + start: 172.23.0.100 + cidr: 172.23.0.0/24 + name: subnet1 + vlan: 23 + routes: + - destination: 172.24.0.0/16 + nexthop: 172.23.0.150 mtu: 1500 vlan: 23 base_iface: enp7s0 diff --git a/examples/dt/bgp/control-plane/nncp/values.yaml b/examples/dt/bgp/control-plane/nncp/values.yaml index d48374acb..e909663e8 100644 --- a/examples/dt/bgp/control-plane/nncp/values.yaml +++ b/examples/dt/bgp/control-plane/nncp/values.yaml @@ -177,7 +177,19 @@ data: } } octavia: - dnsDomain: octavia.openstack.lab + dnsDomain: octavia.example.com + subnets: + - allocationRanges: + - end: 172.23.0.250 + # we need some extra offset to avoid overlapping with octavia + # controlplane IPs + start: 172.23.0.115 + cidr: 172.23.0.0/24 + name: subnet1 + vlan: 23 + routes: + - destination: 172.24.0.0/16 + nexthop: 172.23.0.150 mtu: 1500 vlan: 23 base_iface: enp8s0 diff --git a/examples/dt/uni01alpha/control-plane/service-values.yaml b/examples/dt/uni01alpha/control-plane/service-values.yaml index fd340e1d8..e5daa184c 100644 --- a/examples/dt/uni01alpha/control-plane/service-values.yaml +++ b/examples/dt/uni01alpha/control-plane/service-values.yaml @@ -94,8 +94,11 @@ data: enabled: true amphoraImageContainerImage: quay.io/gthiemonge/octavia-amphora-image apacheContainerImage: registry.redhat.io/ubi9/httpd-24:latest - availabilityZones: - - zone-1 + lbMgmtNetwork: + availabilityZones: + - zone-1 + createDefaultLbMgmtNetwork: true + manageLbMgmtNetworks: true octaviaAPI: networkAttachments: - internalapi