Skip to content

Commit da0aed1

Browse files
eduolivareseduolivares
committed
Add BGP DT04 IPv6
OSPRH-9552 Depends-On: openstack-k8s-operators/ci-framework#3117
1 parent 737c21a commit da0aed1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+5300
-584
lines changed

‎automation/mocks/bgp_dt04_ipv6.yaml‎

Lines changed: 866 additions & 0 deletions
Large diffs are not rendered by default.

‎automation/net-env/bgp.yaml‎

Lines changed: 0 additions & 506 deletions
This file was deleted.

‎automation/vars/bgp_dt04_ipv6.yaml‎

Lines changed: 198 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,198 @@
1+
---
2+
vas:
3+
bgp_dt04_ipv6:
4+
stages:
5+
- pre_stage_run:
6+
- name: Apply taint on worker-3
7+
type: cr
8+
definition:
9+
spec:
10+
taints:
11+
- effect: NoSchedule
12+
key: testOperator
13+
value: 'true'
14+
- effect: NoExecute
15+
key: testOperator
16+
value: 'true'
17+
kind: Node
18+
resource_name: worker-3.ocp.openstack.lab
19+
state: patched
20+
- name: Disable rp_filters on OCP nodes
21+
type: cr
22+
definition:
23+
spec:
24+
profile:
25+
- data: |
26+
[main]
27+
summary=Optimize systems running OpenShift (provider specific parent profile)
28+
include=-provider-${f:exec:cat:/var/lib/ocp-tuned/provider},openshift
29+
30+
[sysctl]
31+
net.ipv4.conf.enp8s0.rp_filter=0
32+
net.ipv4.conf.enp9s0.rp_filter=0
33+
name: openshift-no-reapply-sysctl
34+
recommend:
35+
- match:
36+
# applied to all nodes except worker-3, because worker-3 has no enp8s0
37+
- label: kubernetes.io/hostname
38+
value: worker-0.ocp.openstack.lab
39+
- label: kubernetes.io/hostname
40+
value: worker-1.ocp.openstack.lab
41+
- label: kubernetes.io/hostname
42+
value: worker-2.ocp.openstack.lab
43+
- label: node-role.kubernetes.io/master
44+
operand:
45+
tunedConfig:
46+
reapply_sysctl: false
47+
priority: 15
48+
profile: openshift-no-reapply-sysctl
49+
api_version: tuned.openshift.io/v1
50+
kind: Tuned
51+
resource_name: openshift-no-reapply-sysctl
52+
namespace: openshift-cluster-node-tuning-operator
53+
state: present
54+
name: nncp-configuration
55+
path: examples/dt/bgp_dt04_ipv6/control-plane/networking/nncp
56+
wait_conditions:
57+
- >-
58+
oc -n openstack wait nncp
59+
-l osp/nncm-config-type=standard
60+
--for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured
61+
--timeout=300s
62+
values:
63+
- name: network-values
64+
src_file: values.yaml
65+
build_output: nncp.yaml
66+
67+
- name: networking
68+
path: examples/dt/bgp_dt04_ipv6/control-plane/networking
69+
wait_conditions:
70+
- >-
71+
oc -n metallb-system wait pod
72+
-l app=metallb -l component=speaker
73+
--for condition=Ready
74+
values:
75+
- name: network-values
76+
src_file: nncp/values.yaml
77+
build_output: networking.yaml
78+
- name: control-plane
79+
path: examples/dt/bgp_dt04_ipv6/control-plane
80+
wait_conditions:
81+
- >-
82+
oc -n openstack wait openstackcontrolplane
83+
controlplane
84+
--for condition=Ready
85+
--timeout=30m
86+
values:
87+
- name: network-values
88+
src_file: networking/nncp/values.yaml
89+
- name: service-values
90+
src_file: service-values.yaml
91+
build_output: control-plane.yaml
92+
post_stage_run:
93+
- name: Create BGPConfiguration after controplane is deployed
94+
type: cr
95+
definition:
96+
spec: {}
97+
api_version: network.openstack.org/v1beta1
98+
kind: BGPConfiguration
99+
resource_name: bgpconfiguration
100+
namespace: openstack
101+
state: present
102+
103+
- name: edpm-computes-r0-nodeset
104+
path: examples/dt/bgp_dt04_ipv6/edpm/computes/r0
105+
wait_conditions:
106+
- >-
107+
oc -n openstack wait openstackdataplanenodeset
108+
r0-compute-nodes
109+
--for condition=SetupReady
110+
--timeout=600s
111+
values:
112+
- name: edpm-r0-compute-nodeset-values
113+
src_file: values.yaml
114+
build_output: edpm-r0-compute-nodeset.yaml
115+
116+
- name: edpm-computes-r1-nodeset
117+
path: examples/dt/bgp_dt04_ipv6/edpm/computes/r1
118+
wait_conditions:
119+
- >-
120+
oc -n openstack wait openstackdataplanenodeset
121+
r1-compute-nodes
122+
--for condition=SetupReady
123+
--timeout=600s
124+
values:
125+
- name: edpm-r1-compute-nodeset-values
126+
src_file: values.yaml
127+
build_output: edpm-r1-compute-nodeset.yaml
128+
129+
- name: edpm-computes-r2-nodeset
130+
path: examples/dt/bgp_dt04_ipv6/edpm/computes/r2
131+
wait_conditions:
132+
- >-
133+
oc -n openstack wait openstackdataplanenodeset
134+
r2-compute-nodes
135+
--for condition=SetupReady
136+
--timeout=600s
137+
values:
138+
- name: edpm-r2-compute-nodeset-values
139+
src_file: values.yaml
140+
build_output: edpm-r2-compute-nodeset.yaml
141+
142+
- name: edpm-networkers-r0-nodeset
143+
path: examples/dt/bgp_dt04_ipv6/edpm/networkers/r0
144+
wait_conditions:
145+
- >-
146+
oc -n openstack wait openstackdataplanenodeset
147+
r0-networker-nodes
148+
--for condition=SetupReady
149+
--timeout=600s
150+
values:
151+
- name: edpm-r0-networker-nodeset-values
152+
src_file: values.yaml
153+
build_output: edpm-r0-networker-nodeset.yaml
154+
155+
- name: edpm-networkers-r1-nodeset
156+
path: examples/dt/bgp_dt04_ipv6/edpm/networkers/r1
157+
wait_conditions:
158+
- >-
159+
oc -n openstack wait openstackdataplanenodeset
160+
r1-networker-nodes
161+
--for condition=SetupReady
162+
--timeout=600s
163+
values:
164+
- name: edpm-r1-networker-nodeset-values
165+
src_file: values.yaml
166+
build_output: edpm-r1-networker-nodeset.yaml
167+
168+
- name: edpm-networkers-r2-nodeset
169+
path: examples/dt/bgp_dt04_ipv6/edpm/networkers/r2
170+
wait_conditions:
171+
- >-
172+
oc -n openstack wait openstackdataplanenodeset
173+
r2-networker-nodes
174+
--for condition=SetupReady
175+
--timeout=600s
176+
values:
177+
- name: edpm-r2-networker-nodeset-values
178+
src_file: values.yaml
179+
build_output: edpm-r2-networker-nodeset.yaml
180+
181+
- name: edpm-deployment
182+
path: examples/dt/bgp_dt04_ipv6/edpm/deployment
183+
wait_conditions:
184+
- >-
185+
oc -n openstack wait openstackdataplanedeployment
186+
edpm-deployment
187+
--for condition=Ready
188+
--timeout=120m
189+
values:
190+
- name: edpm-deployment-values
191+
src_file: values.yaml
192+
build_output: edpm-deployment.yaml
193+
post_stage_run:
194+
- name: Wait until computes are ready
195+
type: playbook
196+
source: "../../playbooks/bgp-l3-computes-ready.yml"
197+
extra_vars:
198+
num_computes: 3

‎examples/dt/bgp-l3-xl/metallb/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
Observe CRs which will be generated.
44
```
5-
kustomize build examples/dt/bgp/bgp_dt01/metallb/
5+
kustomize build examples/dt/bgp_dt01/metallb/
66
```
77

88
Apply the metallb kustomization from this directory.
99
```
10-
oc apply -k examples/dt/bgp/bgp_dt01/metallb/
10+
oc apply -k examples/dt/bgp_dt01/metallb/
1111
```
1212

1313
Then, check that a speaker is running on the OCP tester node.

‎examples/dt/bgp_dt01/control-plane.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ oc project openstack
1414
```
1515
Change to the bgp_dt01/control-plane directory
1616
```
17-
cd architecture/examples/dt/bgp/bgp_dt01/control-plane
17+
cd architecture/examples/dt/bgp_dt01/control-plane
1818
```
19-
Edit the [networking/nncp/values.yaml](networking/control-plane/nncp/values.yaml) and
19+
Edit the [networking/nncp/values.yaml](control-plane/networking/nncp/values.yaml) and
2020
[service-values.yaml](control-plane/service-values.yaml) files to suit
2121
your environment.
2222
```
23-
vi nncp/values.yaml
23+
vi networking/nncp/values.yaml
2424
vi service-values.yaml
2525
```
2626

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

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,92 @@ transformers:
2525
create: true
2626
2727
replacements:
28+
# BGP peer IP addresses
29+
# node3
30+
- source:
31+
kind: ConfigMap
32+
name: network-values
33+
fieldPath: data.node_3.bgp_peers.0
34+
targets:
35+
- select:
36+
kind: BGPPeer
37+
name: bgp-peer-node-3-0
38+
fieldPaths:
39+
- spec.peerAddress
40+
- source:
41+
kind: ConfigMap
42+
name: network-values
43+
fieldPath: data.node_3.bgp_peers.1
44+
targets:
45+
- select:
46+
kind: BGPPeer
47+
name: bgp-peer-node-3-1
48+
fieldPaths:
49+
- spec.peerAddress
50+
# node4
51+
- source:
52+
kind: ConfigMap
53+
name: network-values
54+
fieldPath: data.node_4.bgp_peers.0
55+
targets:
56+
- select:
57+
kind: BGPPeer
58+
name: bgp-peer-node-4-0
59+
fieldPaths:
60+
- spec.peerAddress
61+
- source:
62+
kind: ConfigMap
63+
name: network-values
64+
fieldPath: data.node_4.bgp_peers.1
65+
targets:
66+
- select:
67+
kind: BGPPeer
68+
name: bgp-peer-node-4-1
69+
fieldPaths:
70+
- spec.peerAddress
71+
# node5
72+
- source:
73+
kind: ConfigMap
74+
name: network-values
75+
fieldPath: data.node_5.bgp_peers.0
76+
targets:
77+
- select:
78+
kind: BGPPeer
79+
name: bgp-peer-node-5-0
80+
fieldPaths:
81+
- spec.peerAddress
82+
- source:
83+
kind: ConfigMap
84+
name: network-values
85+
fieldPath: data.node_5.bgp_peers.1
86+
targets:
87+
- select:
88+
kind: BGPPeer
89+
name: bgp-peer-node-5-1
90+
fieldPaths:
91+
- spec.peerAddress
92+
# node6
93+
- source:
94+
kind: ConfigMap
95+
name: network-values
96+
fieldPath: data.node_6.bgp_peers.0
97+
targets:
98+
- select:
99+
kind: BGPPeer
100+
name: bgp-peer-node-6-0
101+
fieldPaths:
102+
- spec.peerAddress
103+
# BGP NetworkAttachmentDefinition customization
104+
- source:
105+
kind: ConfigMap
106+
name: network-values
107+
fieldPath: data.bgp.net-attach-def.node6
108+
targets:
109+
- select:
110+
kind: NetworkAttachmentDefinition
111+
name: bgpnet-worker-3
112+
fieldPaths:
113+
- spec.config
28114
# disable OCP workers as gateway nodes
29115
- source:
30116
kind: ConfigMap

0 commit comments

Comments
 (0)