Skip to content

Commit ae226db

Browse files
justinsbjustinsb
committed
autogen: update expected test values for WellKnownServices
1 parent 50776a7 commit ae226db

18 files changed

+125
-90
lines changed

‎pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ AvailabilityZone: zone-1
55
ConfigDrive: false
66
Flavor: blc.2-4
77
FloatingIP: null
8-
ForAPIServer: false
98
GroupName: node
109
ID: null
1110
Image: image-node
@@ -76,6 +75,7 @@ UserData:
7675
task:
7776
Lifecycle: ""
7877
Name: node
78+
WellKnownServices: null
7979
---
8080
Lifecycle: ""
8181
Name: apiserver-aggregator-ca

‎pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ AvailabilityZone: zone-1
55
ConfigDrive: false
66
Flavor: blc.2-4
77
FloatingIP: null
8-
ForAPIServer: false
98
GroupName: node
109
ID: null
1110
Image: image-node
@@ -75,6 +74,7 @@ UserData:
7574
task:
7675
Lifecycle: ""
7776
Name: node
77+
WellKnownServices: null
7878
---
7979
Lifecycle: ""
8080
Name: apiserver-aggregator-ca

‎pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ AvailabilityZone: zone-1
55
ConfigDrive: false
66
Flavor: blc.2-4
77
FloatingIP: null
8-
ForAPIServer: false
98
GroupName: node
109
ID: null
1110
Image: image-node
@@ -75,6 +74,7 @@ UserData:
7574
task:
7675
Lifecycle: ""
7776
Name: node
77+
WellKnownServices: null
7878
---
7979
Lifecycle: ""
8080
Name: apiserver-aggregator-ca

‎pkg/model/openstackmodel/tests/servergroup/configures-allowed-address-pairs-with-annotations.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ AvailabilityZone: zone-1
55
ConfigDrive: false
66
Flavor: blc.2-4
77
FloatingIP: null
8-
ForAPIServer: false
98
GroupName: node
109
ID: null
1110
Image: image-node
@@ -77,6 +76,7 @@ UserData:
7776
task:
7877
Lifecycle: ""
7978
Name: node
79+
WellKnownServices: null
8080
---
8181
Lifecycle: ""
8282
Name: apiserver-aggregator-ca

‎pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ AvailabilityZone: zone-1
55
ConfigDrive: false
66
Flavor: blc.2-4
77
FloatingIP: null
8-
ForAPIServer: false
98
GroupName: node
109
ID: null
1110
Image: image-node
@@ -74,6 +73,7 @@ UserData:
7473
task:
7574
Lifecycle: ""
7675
Name: node
76+
WellKnownServices: null
7777
---
7878
Lifecycle: ""
7979
Name: apiserver-aggregator-ca

‎pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml

+30-18
Original file line numberDiff line numberDiff line change
@@ -4,59 +4,66 @@ Name: master
44
Lifecycle: ""
55
Name: node
66
---
7-
ForAPIServer: true
87
ID: null
98
IP: null
109
LB: null
1110
Lifecycle: Sync
1211
Name: fip-master-1-cluster
12+
WellKnownServices:
13+
- kube-apiserver
14+
- kops-controller
1315
---
14-
ForAPIServer: true
1516
ID: null
1617
IP: null
1718
LB: null
1819
Lifecycle: Sync
1920
Name: fip-master-2-cluster
21+
WellKnownServices:
22+
- kube-apiserver
23+
- kops-controller
2024
---
21-
ForAPIServer: true
2225
ID: null
2326
IP: null
2427
LB: null
2528
Lifecycle: Sync
2629
Name: fip-master-3-cluster
30+
WellKnownServices:
31+
- kube-apiserver
32+
- kops-controller
2733
---
28-
ForAPIServer: false
2934
ID: null
3035
IP: null
3136
LB: null
3237
Lifecycle: Sync
3338
Name: fip-node-1-cluster
39+
WellKnownServices: null
3440
---
35-
ForAPIServer: false
3641
ID: null
3742
IP: null
3843
LB: null
3944
Lifecycle: Sync
4045
Name: fip-node-2-cluster
46+
WellKnownServices: null
4147
---
42-
ForAPIServer: false
4348
ID: null
4449
IP: null
4550
LB: null
4651
Lifecycle: Sync
4752
Name: fip-node-3-cluster
53+
WellKnownServices: null
4854
---
4955
AvailabilityZone: zone-1
5056
ConfigDrive: false
5157
Flavor: blc.1-2
5258
FloatingIP:
53-
ForAPIServer: true
5459
ID: null
5560
IP: null
5661
LB: null
5762
Lifecycle: Sync
5863
Name: fip-master-1-cluster
59-
ForAPIServer: false
64+
WellKnownServices:
65+
- kube-apiserver
66+
- kops-controller
6067
GroupName: master
6168
ID: null
6269
Image: image
@@ -134,18 +141,20 @@ UserData:
134141
task:
135142
Lifecycle: ""
136143
Name: master
144+
WellKnownServices: null
137145
---
138146
AvailabilityZone: zone-2
139147
ConfigDrive: false
140148
Flavor: blc.1-2
141149
FloatingIP:
142-
ForAPIServer: true
143150
ID: null
144151
IP: null
145152
LB: null
146153
Lifecycle: Sync
147154
Name: fip-master-2-cluster
148-
ForAPIServer: false
155+
WellKnownServices:
156+
- kube-apiserver
157+
- kops-controller
149158
GroupName: master
150159
ID: null
151160
Image: image
@@ -223,18 +232,20 @@ UserData:
223232
task:
224233
Lifecycle: ""
225234
Name: master
235+
WellKnownServices: null
226236
---
227237
AvailabilityZone: zone-3
228238
ConfigDrive: false
229239
Flavor: blc.1-2
230240
FloatingIP:
231-
ForAPIServer: true
232241
ID: null
233242
IP: null
234243
LB: null
235244
Lifecycle: Sync
236245
Name: fip-master-3-cluster
237-
ForAPIServer: false
246+
WellKnownServices:
247+
- kube-apiserver
248+
- kops-controller
238249
GroupName: master
239250
ID: null
240251
Image: image
@@ -312,18 +323,18 @@ UserData:
312323
task:
313324
Lifecycle: ""
314325
Name: master
326+
WellKnownServices: null
315327
---
316328
AvailabilityZone: zone-1
317329
ConfigDrive: false
318330
Flavor: blc.1-2
319331
FloatingIP:
320-
ForAPIServer: false
321332
ID: null
322333
IP: null
323334
LB: null
324335
Lifecycle: Sync
325336
Name: fip-node-1-cluster
326-
ForAPIServer: false
337+
WellKnownServices: null
327338
GroupName: node
328339
ID: null
329340
Image: image
@@ -392,18 +403,18 @@ UserData:
392403
task:
393404
Lifecycle: ""
394405
Name: node
406+
WellKnownServices: null
395407
---
396408
AvailabilityZone: zone-2
397409
ConfigDrive: false
398410
Flavor: blc.1-2
399411
FloatingIP:
400-
ForAPIServer: false
401412
ID: null
402413
IP: null
403414
LB: null
404415
Lifecycle: Sync
405416
Name: fip-node-2-cluster
406-
ForAPIServer: false
417+
WellKnownServices: null
407418
GroupName: node
408419
ID: null
409420
Image: image
@@ -472,18 +483,18 @@ UserData:
472483
task:
473484
Lifecycle: ""
474485
Name: node
486+
WellKnownServices: null
475487
---
476488
AvailabilityZone: zone-3
477489
ConfigDrive: false
478490
Flavor: blc.1-2
479491
FloatingIP:
480-
ForAPIServer: false
481492
ID: null
482493
IP: null
483494
LB: null
484495
Lifecycle: Sync
485496
Name: fip-node-3-cluster
486-
ForAPIServer: false
497+
WellKnownServices: null
487498
GroupName: node
488499
ID: null
489500
Image: image
@@ -552,6 +563,7 @@ UserData:
552563
task:
553564
Lifecycle: ""
554565
Name: node
566+
WellKnownServices: null
555567
---
556568
Lifecycle: ""
557569
Name: apiserver-aggregator-ca

‎pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer-dns-none.yaml

+8-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Name: node-b
1616
Lifecycle: ""
1717
Name: node-c
1818
---
19-
ForAPIServer: true
2019
ID: null
2120
IP: null
2221
LB:
@@ -37,12 +36,13 @@ LB:
3736
VipSubnet: null
3837
Lifecycle: Sync
3938
Name: fip-api.cluster
39+
WellKnownServices:
40+
- kube-apiserver
4041
---
4142
AvailabilityZone: zone-1
4243
ConfigDrive: false
4344
Flavor: blc.1-2
4445
FloatingIP: null
45-
ForAPIServer: false
4646
GroupName: master-a
4747
ID: null
4848
Image: image
@@ -114,12 +114,12 @@ UserData:
114114
task:
115115
Lifecycle: ""
116116
Name: master-a
117+
WellKnownServices: null
117118
---
118119
AvailabilityZone: zone-2
119120
ConfigDrive: false
120121
Flavor: blc.1-2
121122
FloatingIP: null
122-
ForAPIServer: false
123123
GroupName: master-b
124124
ID: null
125125
Image: image
@@ -191,12 +191,12 @@ UserData:
191191
task:
192192
Lifecycle: ""
193193
Name: master-b
194+
WellKnownServices: null
194195
---
195196
AvailabilityZone: zone-3
196197
ConfigDrive: false
197198
Flavor: blc.1-2
198199
FloatingIP: null
199-
ForAPIServer: false
200200
GroupName: master-c
201201
ID: null
202202
Image: image
@@ -268,12 +268,12 @@ UserData:
268268
task:
269269
Lifecycle: ""
270270
Name: master-c
271+
WellKnownServices: null
271272
---
272273
AvailabilityZone: zone-1
273274
ConfigDrive: false
274275
Flavor: blc.1-2
275276
FloatingIP: null
276-
ForAPIServer: false
277277
GroupName: node-a
278278
ID: null
279279
Image: image
@@ -342,12 +342,12 @@ UserData:
342342
task:
343343
Lifecycle: ""
344344
Name: node-a
345+
WellKnownServices: null
345346
---
346347
AvailabilityZone: zone-2
347348
ConfigDrive: false
348349
Flavor: blc.1-2
349350
FloatingIP: null
350-
ForAPIServer: false
351351
GroupName: node-b
352352
ID: null
353353
Image: image
@@ -416,12 +416,12 @@ UserData:
416416
task:
417417
Lifecycle: ""
418418
Name: node-b
419+
WellKnownServices: null
419420
---
420421
AvailabilityZone: zone-3
421422
ConfigDrive: false
422423
Flavor: blc.1-2
423424
FloatingIP: null
424-
ForAPIServer: false
425425
GroupName: node-c
426426
ID: null
427427
Image: image
@@ -490,6 +490,7 @@ UserData:
490490
task:
491491
Lifecycle: ""
492492
Name: node-c
493+
WellKnownServices: null
493494
---
494495
Lifecycle: ""
495496
Name: apiserver-aggregator-ca

0 commit comments

Comments
 (0)