Skip to content

Commit a3d7d0c

Browse files
nikatzanikatza
committed
wip
1 parent db7cc45 commit a3d7d0c

File tree

3 files changed

+50
-55
lines changed

3 files changed

+50
-55
lines changed

‎Tiltfile‎

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -39,76 +39,72 @@ def device_yaml():
3939
return encode_yaml_stream(decoded)
4040

4141
k8s_yaml(device_yaml())
42-
k8s_resource(new_name='leaf1', objects=['leaf1:device', 'secret-basic-auth:secret'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=True)
42+
k8s_resource(new_name='leaf1', objects=['leaf1:device', 'secret-basic-auth:secret'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
4343

4444
k8s_yaml('./config/samples/v1alpha1_interface.yaml')
45-
# k8s_resource(new_name='lo0', objects=['lo0:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
46-
# k8s_resource(new_name='lo1', objects=['lo1:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
47-
# k8s_resource(new_name='eth1-1', objects=['eth1-1:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
48-
# k8s_resource(new_name='eth1-2', objects=['eth1-2:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
45+
k8s_resource(new_name='lo0', objects=['lo0:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
46+
k8s_resource(new_name='lo1', objects=['lo1:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
47+
k8s_resource(new_name='eth1-1', objects=['eth1-1:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
48+
k8s_resource(new_name='eth1-2', objects=['eth1-2:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
4949
k8s_resource(new_name='eth1-10', objects=['eth1-10:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
5050
k8s_resource(new_name='eth1-30', objects=['eth1-30:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
5151
k8s_resource(new_name='eth1-31', objects=['eth1-31:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
5252
k8s_resource(new_name='eth1-32', objects=['eth1-32:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
53-
#k8s_resource(new_name='svi-10', objects=['svi-10:interface'], resource_deps=['vlan-10'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
53+
k8s_resource(new_name='svi-10', objects=['svi-10:interface'], resource_deps=['vlan-10'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
5454
k8s_resource(new_name='po1', objects=['po1:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
5555
k8s_resource(new_name='po2', objects=['po2:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
5656

57-
58-
5957
k8s_yaml('./config/samples/v1alpha1_banner.yaml')
60-
# k8s_resource(new_name='banner', objects=['banner:banner'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
58+
k8s_resource(new_name='banner', objects=['banner:banner'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
6159

6260
k8s_yaml('./config/samples/v1alpha1_user.yaml')
63-
# k8s_resource(new_name='user', objects=['user:user', 'user-password:secret', 'user-ssh-key:secret'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
61+
k8s_resource(new_name='user', objects=['user:user', 'user-password:secret', 'user-ssh-key:secret'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
6462

6563
k8s_yaml('./config/samples/v1alpha1_dns.yaml')
66-
# k8s_resource(new_name='dns', objects=['dns:dns'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
64+
k8s_resource(new_name='dns', objects=['dns:dns'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
6765

6866
k8s_yaml('./config/samples/v1alpha1_ntp.yaml')
69-
# k8s_resource(new_name='ntp', objects=['ntp:ntp'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
67+
k8s_resource(new_name='ntp', objects=['ntp:ntp'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
7068

7169
k8s_yaml('./config/samples/v1alpha1_acl.yaml')
72-
# k8s_resource(new_name='acl', objects=['acl:accesscontrollist'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
70+
k8s_resource(new_name='acl', objects=['acl:accesscontrollist'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
7371

7472
k8s_yaml('./config/samples/v1alpha1_certificate.yaml')
75-
# k8s_resource(new_name='trustpoint', objects=['network-operator:issuer', 'network-operator-ca:certificate', 'trustpoint:certificate'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
73+
k8s_resource(new_name='trustpoint', objects=['network-operator:issuer', 'network-operator-ca:certificate', 'trustpoint:certificate'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
7674

7775
k8s_yaml('./config/samples/v1alpha1_snmp.yaml')
78-
# k8s_resource(new_name='snmp', objects=['snmp:snmp'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
76+
k8s_resource(new_name='snmp', objects=['snmp:snmp'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
7977

8078
k8s_yaml('./config/samples/v1alpha1_syslog.yaml')
81-
# k8s_resource(new_name='syslog', objects=['syslog:syslog'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
79+
k8s_resource(new_name='syslog', objects=['syslog:syslog'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
8280

8381
k8s_yaml('./config/samples/v1alpha1_managementaccess.yaml')
84-
# k8s_resource(new_name='managementaccess', objects=['managementaccess:managementaccess'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
82+
k8s_resource(new_name='managementaccess', objects=['managementaccess:managementaccess'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
8583

8684
k8s_yaml('./config/samples/v1alpha1_isis.yaml')
87-
# k8s_resource(new_name='underlay', objects=['underlay:isis'], resource_deps=['lo0', 'lo1', 'eth1-1', 'eth1-2'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
85+
k8s_resource(new_name='underlay', objects=['underlay:isis'], resource_deps=['lo0', 'lo1', 'eth1-1', 'eth1-2'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
8886

8987
k8s_yaml('./config/samples/v1alpha1_vrf.yaml')
90-
# k8s_resource(new_name='vrf-admin', objects=['vrf-cc-admin:vrf'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
88+
k8s_resource(new_name='vrf-admin', objects=['vrf-cc-admin:vrf'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
9189
k8s_resource(new_name='vrf-vpckeepalive', objects=['vrf-vpckeepalive:vrf'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
9290

9391
k8s_yaml('./config/samples/v1alpha1_pim.yaml')
94-
# k8s_resource(new_name='pim', objects=['pim:pim'], resource_deps=['lo0', 'lo1', 'eth1-1', 'eth1-2'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
92+
k8s_resource(new_name='pim', objects=['pim:pim'], resource_deps=['lo0', 'lo1', 'eth1-1', 'eth1-2'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
9593

9694
k8s_yaml('./config/samples/v1alpha1_bgp.yaml')
97-
# k8s_resource(new_name='bgp', objects=['bgp:bgp'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
95+
k8s_resource(new_name='bgp', objects=['bgp:bgp'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
9896

9997
k8s_yaml('./config/samples/v1alpha1_bgppeer.yaml')
100-
# k8s_resource(new_name='peer-spine1', objects=['leaf1-spine1:bgppeer'], resource_deps=['bgp', 'lo0'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
101-
# k8s_resource(new_name='peer-spine2', objects=['leaf1-spine2:bgppeer'], resource_deps=['bgp', 'lo0'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
98+
k8s_resource(new_name='peer-spine1', objects=['leaf1-spine1:bgppeer'], resource_deps=['bgp', 'lo0'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
99+
k8s_resource(new_name='peer-spine2', objects=['leaf1-spine2:bgppeer'], resource_deps=['bgp', 'lo0'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
102100

103101
k8s_yaml('./config/samples/v1alpha1_ospf.yaml')
104-
#k8s_resource(new_name='ospf-underlay', objects=['underlay:ospf'], resource_deps=['lo0', 'lo1', 'eth1-1', 'eth1-2'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
102+
k8s_resource(new_name='ospf-underlay', objects=['underlay:ospf'], resource_deps=['lo0', 'lo1', 'eth1-1', 'eth1-2'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
105103

106104
k8s_yaml('./config/samples/v1alpha1_vlan.yaml')
107-
# k8s_resource(new_name='vlan-10', objects=['vlan-10:vlan'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
105+
k8s_resource(new_name='vlan-10', objects=['vlan-10:vlan'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
108106

109107
k8s_yaml('./config/samples/cisco/nx/v1alpha1_vpc.yaml')
110-
# don't add a resource dependency to the interfaces here, otherwise we create a deadlock as the multichassis ID depends
111-
# on the vPC being created first.
112108
k8s_resource(new_name='vpc', objects=['leaf1-vpc:vpc'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
113109

114110
k8s_yaml('./config/samples/v1alpha1_evi.yaml')

‎config/samples/cisco/nx/v1alpha1_vpc.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
deviceRef:
1111
name: leaf1
1212
domainId: 5
13-
adminState: enabled
13+
adminState: enabled
1414
rolePriority: 100
1515
systemPriority: 10
1616
delayRestoreSVI: 140
@@ -27,6 +27,8 @@ spec:
2727
keepalive:
2828
source: 10.1.1.1
2929
destination: 10.1.1.2
30+
vrfRef:
31+
name: vpc-keepalive
3032
autoRecovery:
3133
enabled: true
3234
reloadDelay: 360

‎config/samples/v1alpha1_interface.yaml‎

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ spec:
182182
deviceRef:
183183
name: leaf1
184184
name: po1
185-
description: vPC to Host1
185+
description: vPC Peer-Link
186186
adminState: Up
187187
type: Aggregate
188188
mtu: 1500
@@ -196,31 +196,6 @@ spec:
196196
memberInterfaceRefs:
197197
- name: eth1-31
198198
- name: eth1-32
199-
multichassis:
200-
id: 10
201-
enabled: true
202-
---
203-
apiVersion: networking.metal.ironcore.dev/v1alpha1
204-
kind: Interface
205-
metadata:
206-
labels:
207-
app.kubernetes.io/name: network-operator
208-
app.kubernetes.io/managed-by: kustomize
209-
networking.metal.ironcore.dev/device-name: leaf1
210-
name: svi-10
211-
spec:
212-
deviceRef:
213-
name: leaf1
214-
name: vlan10
215-
description: SVI for VLAN 10
216-
adminState: Up
217-
type: RoutedVLAN
218-
mtu: 1500
219-
vlanRef:
220-
name: vlan-10
221-
ipv4:
222-
addresses:
223-
- 192.168.10.254/24
224199
---
225200
apiVersion: networking.metal.ironcore.dev/v1alpha1
226201
kind: Interface
@@ -249,4 +224,26 @@ spec:
249224
- name: eth1-10
250225
multichassis:
251226
enabled: true
252-
id: 1
227+
id: 2
228+
---
229+
apiVersion: networking.metal.ironcore.dev/v1alpha1
230+
kind: Interface
231+
metadata:
232+
labels:
233+
app.kubernetes.io/name: network-operator
234+
app.kubernetes.io/managed-by: kustomize
235+
networking.metal.ironcore.dev/device-name: leaf1
236+
name: svi-10
237+
spec:
238+
deviceRef:
239+
name: leaf1
240+
name: vlan10
241+
description: SVI for VLAN 10
242+
adminState: Up
243+
type: RoutedVLAN
244+
mtu: 1500
245+
vlanRef:
246+
name: vlan-10
247+
ipv4:
248+
addresses:
249+
- 192.168.10.254/24

0 commit comments

Comments
 (0)