Skip to content

Commit e10b63a

Browse files
eduolivareseduolivares
committed
[BGP] Remove tenant and external networks from controlplane
tenant and external networks were not used on RHOSO BGP controlplane configurations, so they have been removed from: - NNCP - IPAddressPools - NetworkAttachmentDefinitions OSPRH-26038 Signed-off-by: Eduardo Olivares <eolivare@redhat.com>
1 parent e9fd520 commit e10b63a

File tree

17 files changed

+252
-226
lines changed

17 files changed

+252
-226
lines changed

‎dt/bgp/networking/kustomization.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ transformers:
1818
create: true
1919
2020
components:
21-
- ../../../lib/networking/metallb
22-
- ../../../lib/networking/nad
21+
- metallb
22+
- nad
2323
- netconfig
24-
- bgpmetallb
2524

2625
resources:
2726
- ocp_networks_octavia_netattach.yaml

‎dt/bgp/networking/metallb/ip-addresses/kustomization.yaml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1alpha1
3+
kind: Component
4+
5+
replacements:
6+
# IPAddressPool addresses
7+
- source:
8+
kind: ConfigMap
9+
name: network-values
10+
fieldPath: data.ctlplane.lb_addresses
11+
targets:
12+
- select:
13+
kind: IPAddressPool
14+
name: ctlplane
15+
fieldPaths:
16+
- spec.addresses
17+
- source:
18+
kind: ConfigMap
19+
name: network-values
20+
fieldPath: data.internalapi.lb_addresses
21+
targets:
22+
- select:
23+
kind: IPAddressPool
24+
name: internalapi
25+
fieldPaths:
26+
- spec.addresses
27+
- source:
28+
kind: ConfigMap
29+
name: network-values
30+
fieldPath: data.storage.lb_addresses
31+
targets:
32+
- select:
33+
kind: IPAddressPool
34+
name: storage
35+
fieldPaths:
36+
- spec.addresses
37+
38+
# Loadbalancer address pools (duplicate for metallb.io group)
39+
- source:
40+
kind: ConfigMap
41+
name: network-values
42+
fieldPath: data.ctlplane.lb_addresses
43+
targets:
44+
- select:
45+
group: metallb.io
46+
kind: IPAddressPool
47+
name: ctlplane
48+
fieldPaths:
49+
- spec.addresses
50+
- source:
51+
kind: ConfigMap
52+
name: network-values
53+
fieldPath: data.internalapi.lb_addresses
54+
targets:
55+
- select:
56+
group: metallb.io
57+
kind: IPAddressPool
58+
name: internalapi
59+
fieldPaths:
60+
- spec.addresses
61+
- source:
62+
kind: ConfigMap
63+
name: network-values
64+
fieldPath: data.storage.lb_addresses
65+
targets:
66+
- select:
67+
group: metallb.io
68+
kind: IPAddressPool
69+
name: storage
70+
fieldPaths:
71+
- spec.addresses

dt/bgp/networking/bgpmetallb/kustomization.yaml renamed to dt/bgp/networking/metallb/kustomization.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,9 @@
22
apiVersion: kustomize.config.k8s.io/v1alpha1
33
kind: Component
44

5+
components:
6+
- ../../../../lib/networking/metallb/base
7+
- ip-addresses
8+
59
resources:
610
- metallb_bgpadvertisements.yaml

dt/bgp/networking/bgpmetallb/metallb_bgpadvertisements.yaml renamed to dt/bgp/networking/metallb/metallb_bgpadvertisements.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ spec:
99
- ctlplane
1010
- internalapi
1111
- storage
12-
- tenant
1312
peers: []

‎dt/bgp/networking/nad/kustomization.yaml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1alpha1
3+
kind: Component
4+
5+
resources:
6+
- ocp_networks_netattach.yaml
7+
8+
patches:
9+
- target:
10+
kind: NetworkAttachmentDefinition
11+
labelSelector: "osp/net-attach-def-type=standard"
12+
path: ocp_network_template.yaml
13+
14+
replacements:
15+
# NetworkAttachmentDefinition JSON config
16+
- source:
17+
kind: ConfigMap
18+
name: network-values
19+
fieldPath: data.ctlplane.net-attach-def
20+
targets:
21+
- select:
22+
kind: NetworkAttachmentDefinition
23+
name: ctlplane
24+
fieldPaths:
25+
- spec.config
26+
- source:
27+
kind: ConfigMap
28+
name: network-values
29+
fieldPath: data.internalapi.net-attach-def
30+
targets:
31+
- select:
32+
kind: NetworkAttachmentDefinition
33+
name: internalapi
34+
fieldPaths:
35+
- spec.config
36+
- source:
37+
kind: ConfigMap
38+
name: network-values
39+
fieldPath: data.storage.net-attach-def
40+
targets:
41+
- select:
42+
kind: NetworkAttachmentDefinition
43+
name: storage
44+
fieldPaths:
45+
- spec.config
46+
- source:
47+
kind: ConfigMap
48+
name: network-values
49+
fieldPath: data.datacentre.net-attach-def
50+
targets:
51+
- select:
52+
kind: NetworkAttachmentDefinition
53+
name: datacentre
54+
fieldPaths:
55+
- spec.config

‎dt/bgp/networking/nad/ocp_network_template.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
apiVersion: nmstate.io/v1
3+
kind: NetworkAttachmentDefinition
4+
metadata:
5+
name: _ignored_
6+
spec:
7+
config: |
8+
_replaced_

‎dt/bgp/networking/nad/ocp_networks_netattach.yaml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
apiVersion: k8s.cni.cncf.io/v1
3+
kind: NetworkAttachmentDefinition
4+
metadata:
5+
name: ctlplane
6+
labels:
7+
osp/net: ctlplane
8+
osp/net-attach-def-type: standard
9+
---
10+
apiVersion: k8s.cni.cncf.io/v1
11+
kind: NetworkAttachmentDefinition
12+
metadata:
13+
name: internalapi
14+
labels:
15+
osp/net: internalapi
16+
osp/net-attach-def-type: standard
17+
---
18+
apiVersion: k8s.cni.cncf.io/v1
19+
kind: NetworkAttachmentDefinition
20+
metadata:
21+
name: storage
22+
labels:
23+
osp/net: storage
24+
osp/net-attach-def-type: standard
25+
---
26+
apiVersion: k8s.cni.cncf.io/v1
27+
kind: NetworkAttachmentDefinition
28+
metadata:
29+
name: tenant
30+
labels:
31+
osp/net: tenant
32+
osp/net-attach-def-type: standard
33+
---
34+
apiVersion: k8s.cni.cncf.io/v1
35+
kind: NetworkAttachmentDefinition
36+
metadata:
37+
name: datacentre
38+
labels:
39+
osp/net: datacentre
40+
osp/net-attach-def-type: standard

‎examples/dt/bgp-l3-xl/control-plane/networking/kustomization.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,24 @@ patches:
101101
name: .*
102102
$patch: delete
103103
104+
# tenant IPAddressPool removed
105+
- target:
106+
kind: IPAddressPool
107+
patch: |-
108+
kind: IPAddressPool
109+
metadata:
110+
name: tenant
111+
$patch: delete
112+
113+
# tenant NAD removed
114+
- target:
115+
kind: NetworkAttachmentDefinition
116+
patch: |-
117+
kind: NetworkAttachmentDefinition
118+
metadata:
119+
name: tenant
120+
$patch: delete
121+
104122
replacements:
105123
# BGP peer IP addresses
106124
# node3

‎examples/dt/bgp-l3-xl/control-plane/networking/nncp/values.yaml‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ data:
1111
node_3:
1212
name: worker-0
1313
internalapi_ip: 172.17.0.5
14-
tenant_ip: 172.19.0.5
1514
ctlplane_ip: 192.168.122.10
1615
storage_ip: 172.18.0.5
1716
bgp_ip:
@@ -62,7 +61,6 @@ data:
6261
node_4:
6362
name: worker-1
6463
internalapi_ip: 172.17.0.6
65-
tenant_ip: 172.19.0.6
6664
ctlplane_ip: 192.168.122.11
6765
storage_ip: 172.18.0.6
6866
bgp_ip:
@@ -113,7 +111,6 @@ data:
113111
node_5:
114112
name: worker-2
115113
internalapi_ip: 172.17.0.7
116-
tenant_ip: 172.19.0.7
117114
ctlplane_ip: 192.168.122.12
118115
storage_ip: 172.18.0.7
119116
bgp_ip:
@@ -164,7 +161,6 @@ data:
164161
node_6:
165162
name: worker-3
166163
internalapi_ip: 172.17.0.8
167-
tenant_ip: 172.19.0.8
168164
ctlplane_ip: 192.168.122.13
169165
storage_ip: 172.18.0.8
170166
bgp_ip:
@@ -215,7 +211,6 @@ data:
215211
node_7:
216212
name: worker-4
217213
internalapi_ip: 172.17.0.9
218-
tenant_ip: 172.19.0.9
219214
ctlplane_ip: 192.168.122.14
220215
storage_ip: 172.18.0.9
221216
bgp_ip:
@@ -266,7 +261,6 @@ data:
266261
node_8:
267262
name: worker-5
268263
internalapi_ip: 172.17.0.10
269-
tenant_ip: 172.19.0.10
270264
ctlplane_ip: 192.168.122.15
271265
storage_ip: 172.18.0.10
272266
bgp_ip:
@@ -317,7 +311,6 @@ data:
317311
node_9:
318312
name: worker-6
319313
internalapi_ip: 172.17.0.11
320-
tenant_ip: 172.19.0.11
321314
ctlplane_ip: 192.168.122.16
322315
storage_ip: 172.18.0.11
323316
bgp_ip:
@@ -368,7 +361,6 @@ data:
368361
node_10:
369362
name: worker-7
370363
internalapi_ip: 172.17.0.12
371-
tenant_ip: 172.19.0.12
372364
ctlplane_ip: 192.168.122.17
373365
storage_ip: 172.18.0.12
374366
bgp_ip:
@@ -419,7 +411,6 @@ data:
419411
node_11:
420412
name: worker-8
421413
internalapi_ip: 172.17.0.13
422-
tenant_ip: 172.19.0.13
423414
ctlplane_ip: 192.168.122.18
424415
storage_ip: 172.18.0.13
425416
bgp_ip:
@@ -471,7 +462,6 @@ data:
471462
node_12:
472463
name: worker-9
473464
internalapi_ip: 172.17.0.14
474-
tenant_ip: 172.19.0.14
475465
ctlplane_ip: 192.168.122.19
476466
storage_ip: 172.18.0.14
477467
bgp_ip:
@@ -627,39 +617,6 @@ data:
627617
"range_end": "172.18.0.70"
628618
}
629619
}
630-
tenant:
631-
dnsDomain: tenant.example.com
632-
subnets:
633-
- allocationRanges:
634-
- end: 172.19.0.250
635-
start: 172.19.0.100
636-
cidr: 172.19.0.0/24
637-
name: subnet1
638-
vlan: 22
639-
mtu: 1500
640-
prefix-length: 24
641-
iface: tenant
642-
vlan: 22
643-
base_iface: enp7s0
644-
lb_addresses:
645-
- 172.19.0.80-172.19.0.90
646-
net-attach-def: |
647-
{
648-
"cniVersion": "0.3.1",
649-
"name": "tenant",
650-
"type": "bridge",
651-
"bridge": "tenant",
652-
"isDefaultGateway": true,
653-
"forceAddress": false,
654-
"ipMasq": false,
655-
"hairpinMode": true,
656-
"ipam": {
657-
"type": "whereabouts",
658-
"range": "172.19.0.0/24",
659-
"range_start": "172.19.0.30",
660-
"range_end": "172.19.0.70"
661-
}
662-
}
663620
octavia:
664621
dnsDomain: octavia.openstack.lab
665622
mtu: 1500
@@ -684,17 +641,6 @@ data:
684641
]
685642
}
686643
}
687-
external:
688-
dnsDomain: external.example.com
689-
subnets:
690-
- allocationRanges:
691-
- end: 10.0.0.250
692-
start: 10.0.0.100
693-
cidr: 10.0.0.0/24
694-
gateway: 10.0.0.1
695-
name: subnet1
696-
mtu: 1500
697-
698644
bgp:
699645
prefix-length: 30
700646
prefix-length-worker-9: 24

‎examples/dt/bgp_dt01/control-plane/networking/kustomization.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,24 @@ patches:
6464
name: .*
6565
$patch: delete
6666
67+
# tenant IPAddressPool removed
68+
- target:
69+
kind: IPAddressPool
70+
patch: |-
71+
kind: IPAddressPool
72+
metadata:
73+
name: tenant
74+
$patch: delete
75+
76+
# tenant NAD removed
77+
- target:
78+
kind: NetworkAttachmentDefinition
79+
patch: |-
80+
kind: NetworkAttachmentDefinition
81+
metadata:
82+
name: tenant
83+
$patch: delete
84+
6785
replacements:
6886
# BGP peer IP addresses
6987
# node3

0 commit comments

Comments
 (0)