Skip to content

Commit cf8ddc6

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3398 from sbueringer/pr-avoid-redundant-reconciles
🐛 Avoid redundant reconciles if only generation of Paused condition changed & bump CAPI to main (17th March, 9e7afa749358)
2 parents f3f41bc + b05d8ca commit cf8ddc6

36 files changed

+335
-242
lines changed

‎.golangci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ linters-settings:
138138
- pkg: sigs.k8s.io/cluster-api/exp/api/v1beta1
139139
alias: expv1
140140
# CAPI exp addons
141-
- pkg: sigs.k8s.io/cluster-api/exp/addons/api/v1beta1
141+
- pkg: sigs.k8s.io/cluster-api/api/addons/v1beta1
142142
alias: addonsv1
143143
# CAPI IPAM
144144
- pkg: sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ IMPORT_BOSS_VER := v0.28.1
190190
IMPORT_BOSS := $(abspath $(TOOLS_BIN_DIR)/$(IMPORT_BOSS_BIN))
191191
IMPORT_BOSS_PKG := k8s.io/code-generator/cmd/import-boss
192192

193-
CAPI_HACK_TOOLS_VER := ccaea78cdbf068a1fe072bde78794e98c15c1072 # Note: this a commit ID of from CAPI main, supposed to be in v1.10
193+
CAPI_HACK_TOOLS_VER := 9e7afa749358adc7e0c6ae5408d0d8eeb2affa0a # Note: this a commit ID of from CAPI main, supposed to be in v1.10
194194

195195
BOSKOSCTL_BIN := boskosctl
196196
BOSKOSCTL := $(abspath $(TOOLS_BIN_DIR)/$(BOSKOSCTL_BIN))

‎config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclusteridentities.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,18 +407,23 @@ spec:
407407
description: |-
408408
message is a human readable message indicating details about the transition.
409409
This field may be empty.
410+
maxLength: 10240
411+
minLength: 1
410412
type: string
411413
reason:
412414
description: |-
413415
reason is the reason for the condition's last transition in CamelCase.
414416
The specific API may choose whether or not this field is considered a guaranteed API.
415417
This field may be empty.
418+
maxLength: 256
419+
minLength: 1
416420
type: string
417421
severity:
418422
description: |-
419423
severity provides an explicit classification of Reason code, so the users or machines can immediately
420424
understand the current situation and act accordingly.
421425
The Severity field MUST be set only when Status=False.
426+
maxLength: 32
422427
type: string
423428
status:
424429
description: status of the condition, one of True, False, Unknown.
@@ -428,6 +433,8 @@ spec:
428433
type of condition in CamelCase or in foo.example.com/CamelCase.
429434
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
430435
can be useful (see .node.status.conditions), the ability to deconflict is important.
436+
maxLength: 256
437+
minLength: 1
431438
type: string
432439
required:
433440
- lastTransitionTime

‎config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclusters.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -799,18 +799,23 @@ spec:
799799
description: |-
800800
message is a human readable message indicating details about the transition.
801801
This field may be empty.
802+
maxLength: 10240
803+
minLength: 1
802804
type: string
803805
reason:
804806
description: |-
805807
reason is the reason for the condition's last transition in CamelCase.
806808
The specific API may choose whether or not this field is considered a guaranteed API.
807809
This field may be empty.
810+
maxLength: 256
811+
minLength: 1
808812
type: string
809813
severity:
810814
description: |-
811815
severity provides an explicit classification of Reason code, so the users or machines can immediately
812816
understand the current situation and act accordingly.
813817
The Severity field MUST be set only when Status=False.
818+
maxLength: 32
814819
type: string
815820
status:
816821
description: status of the condition, one of True, False, Unknown.
@@ -820,6 +825,8 @@ spec:
820825
type of condition in CamelCase or in foo.example.com/CamelCase.
821826
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
822827
can be useful (see .node.status.conditions), the ability to deconflict is important.
828+
maxLength: 256
829+
minLength: 1
823830
type: string
824831
required:
825832
- lastTransitionTime

‎config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheredeploymentzones.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,18 +324,23 @@ spec:
324324
description: |-
325325
message is a human readable message indicating details about the transition.
326326
This field may be empty.
327+
maxLength: 10240
328+
minLength: 1
327329
type: string
328330
reason:
329331
description: |-
330332
reason is the reason for the condition's last transition in CamelCase.
331333
The specific API may choose whether or not this field is considered a guaranteed API.
332334
This field may be empty.
335+
maxLength: 256
336+
minLength: 1
333337
type: string
334338
severity:
335339
description: |-
336340
severity provides an explicit classification of Reason code, so the users or machines can immediately
337341
understand the current situation and act accordingly.
338342
The Severity field MUST be set only when Status=False.
343+
maxLength: 32
339344
type: string
340345
status:
341346
description: status of the condition, one of True, False, Unknown.
@@ -345,6 +350,8 @@ spec:
345350
type of condition in CamelCase or in foo.example.com/CamelCase.
346351
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
347352
can be useful (see .node.status.conditions), the ability to deconflict is important.
353+
maxLength: 256
354+
minLength: 1
348355
type: string
349356
required:
350357
- lastTransitionTime

‎config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1510,10 +1510,18 @@ spec:
15101510
properties:
15111511
address:
15121512
description: address is the machine address.
1513+
maxLength: 256
1514+
minLength: 1
15131515
type: string
15141516
type:
15151517
description: type is the machine address type, one of Hostname,
15161518
ExternalIP, InternalIP, ExternalDNS or InternalDNS.
1519+
enum:
1520+
- Hostname
1521+
- ExternalIP
1522+
- InternalIP
1523+
- ExternalDNS
1524+
- InternalDNS
15171525
type: string
15181526
required:
15191527
- address
@@ -1537,18 +1545,23 @@ spec:
15371545
description: |-
15381546
message is a human readable message indicating details about the transition.
15391547
This field may be empty.
1548+
maxLength: 10240
1549+
minLength: 1
15401550
type: string
15411551
reason:
15421552
description: |-
15431553
reason is the reason for the condition's last transition in CamelCase.
15441554
The specific API may choose whether or not this field is considered a guaranteed API.
15451555
This field may be empty.
1556+
maxLength: 256
1557+
minLength: 1
15461558
type: string
15471559
severity:
15481560
description: |-
15491561
severity provides an explicit classification of Reason code, so the users or machines can immediately
15501562
understand the current situation and act accordingly.
15511563
The Severity field MUST be set only when Status=False.
1564+
maxLength: 32
15521565
type: string
15531566
status:
15541567
description: status of the condition, one of True, False, Unknown.
@@ -1558,6 +1571,8 @@ spec:
15581571
type of condition in CamelCase or in foo.example.com/CamelCase.
15591572
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
15601573
can be useful (see .node.status.conditions), the ability to deconflict is important.
1574+
maxLength: 256
1575+
minLength: 1
15611576
type: string
15621577
required:
15631578
- lastTransitionTime

‎config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherevms.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1592,18 +1592,23 @@ spec:
15921592
description: |-
15931593
message is a human readable message indicating details about the transition.
15941594
This field may be empty.
1595+
maxLength: 10240
1596+
minLength: 1
15951597
type: string
15961598
reason:
15971599
description: |-
15981600
reason is the reason for the condition's last transition in CamelCase.
15991601
The specific API may choose whether or not this field is considered a guaranteed API.
16001602
This field may be empty.
1603+
maxLength: 256
1604+
minLength: 1
16011605
type: string
16021606
severity:
16031607
description: |-
16041608
severity provides an explicit classification of Reason code, so the users or machines can immediately
16051609
understand the current situation and act accordingly.
16061610
The Severity field MUST be set only when Status=False.
1611+
maxLength: 32
16071612
type: string
16081613
status:
16091614
description: status of the condition, one of True, False, Unknown.
@@ -1613,6 +1618,8 @@ spec:
16131618
type of condition in CamelCase or in foo.example.com/CamelCase.
16141619
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
16151620
can be useful (see .node.status.conditions), the ability to deconflict is important.
1621+
maxLength: 256
1622+
minLength: 1
16161623
type: string
16171624
required:
16181625
- lastTransitionTime

‎config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vsphereclusters.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ spec:
4646
properties:
4747
host:
4848
description: host is the hostname on which the API server is serving.
49+
maxLength: 512
4950
type: string
5051
port:
5152
description: port is the port on which the API server is serving.
@@ -76,18 +77,23 @@ spec:
7677
description: |-
7778
message is a human readable message indicating details about the transition.
7879
This field may be empty.
80+
maxLength: 10240
81+
minLength: 1
7982
type: string
8083
reason:
8184
description: |-
8285
reason is the reason for the condition's last transition in CamelCase.
8386
The specific API may choose whether or not this field is considered a guaranteed API.
8487
This field may be empty.
88+
maxLength: 256
89+
minLength: 1
8590
type: string
8691
severity:
8792
description: |-
8893
severity provides an explicit classification of Reason code, so the users or machines can immediately
8994
understand the current situation and act accordingly.
9095
The Severity field MUST be set only when Status=False.
96+
maxLength: 32
9197
type: string
9298
status:
9399
description: status of the condition, one of True, False, Unknown.
@@ -97,6 +103,8 @@ spec:
97103
type of condition in CamelCase or in foo.example.com/CamelCase.
98104
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
99105
can be useful (see .node.status.conditions), the ability to deconflict is important.
106+
maxLength: 256
107+
minLength: 1
100108
type: string
101109
required:
102110
- lastTransitionTime

‎config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vsphereclustertemplates.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ spec:
5555
host:
5656
description: host is the hostname on which the API server
5757
is serving.
58+
maxLength: 512
5859
type: string
5960
port:
6061
description: port is the port on which the API server

‎config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vspheremachines.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,18 +196,23 @@ spec:
196196
description: |-
197197
message is a human readable message indicating details about the transition.
198198
This field may be empty.
199+
maxLength: 10240
200+
minLength: 1
199201
type: string
200202
reason:
201203
description: |-
202204
reason is the reason for the condition's last transition in CamelCase.
203205
The specific API may choose whether or not this field is considered a guaranteed API.
204206
This field may be empty.
207+
maxLength: 256
208+
minLength: 1
205209
type: string
206210
severity:
207211
description: |-
208212
severity provides an explicit classification of Reason code, so the users or machines can immediately
209213
understand the current situation and act accordingly.
210214
The Severity field MUST be set only when Status=False.
215+
maxLength: 32
211216
type: string
212217
status:
213218
description: status of the condition, one of True, False, Unknown.
@@ -217,6 +222,8 @@ spec:
217222
type of condition in CamelCase or in foo.example.com/CamelCase.
218223
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
219224
can be useful (see .node.status.conditions), the ability to deconflict is important.
225+
maxLength: 256
226+
minLength: 1
220227
type: string
221228
required:
222229
- lastTransitionTime

0 commit comments

Comments
 (0)