Skip to content

Commit fe0e040

Browse files
Danil-GrigorevDanil-Grigorev
authored
Bump CAPIO to v0.21.0 (#1504)
Signed-off-by: Danil-Grigorev <[email protected]>
1 parent 232bddc commit fe0e040

File tree

19 files changed

+463
-395
lines changed

19 files changed

+463
-395
lines changed

‎charts/rancher-turtles/templates/rancher-turtles-components.yaml‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,6 +1301,13 @@ spec:
13011301
description: Manager defines the properties that can be enabled
13021302
on the controller manager for the additional provider deployment.
13031303
properties:
1304+
additionalArgs:
1305+
additionalProperties:
1306+
type: string
1307+
description: |-
1308+
AdditionalArgs is a map of additional options that will be passed
1309+
in as container args to the provider's controller manager.
1310+
type: object
13041311
cacheNamespace:
13051312
description: |-
13061313
CacheNamespace if specified restricts the manager's cache to watch objects in
@@ -1436,7 +1443,7 @@ spec:
14361443
minimum: 1
14371444
type: integer
14381445
metrics:
1439-
description: Metrics contains thw controller metrics configuration
1446+
description: Metrics contains the controller metrics configuration
14401447
properties:
14411448
bindAddress:
14421449
description: |-
@@ -2875,6 +2882,13 @@ spec:
28752882
description: Manager defines the properties that can be enabled on
28762883
the controller manager for the provider.
28772884
properties:
2885+
additionalArgs:
2886+
additionalProperties:
2887+
type: string
2888+
description: |-
2889+
AdditionalArgs is a map of additional options that will be passed
2890+
in as container args to the provider's controller manager.
2891+
type: object
28782892
cacheNamespace:
28792893
description: |-
28802894
CacheNamespace if specified restricts the manager's cache to watch objects in
@@ -3009,7 +3023,7 @@ spec:
30093023
minimum: 1
30103024
type: integer
30113025
metrics:
3012-
description: Metrics contains thw controller metrics configuration
3026+
description: Metrics contains the controller metrics configuration
30133027
properties:
30143028
bindAddress:
30153029
description: |-
@@ -3118,27 +3132,32 @@ spec:
31183132
properties:
31193133
lastTransitionTime:
31203134
description: |-
3121-
Last time the condition transitioned from one status to another.
3135+
lastTransitionTime is the last time the condition transitioned from one status to another.
31223136
This should be when the underlying condition changed. If that is not known, then using the time when
31233137
the API field changed is acceptable.
31243138
format: date-time
31253139
type: string
31263140
message:
31273141
description: |-
3128-
A human readable message indicating details about the transition.
3142+
message is a human readable message indicating details about the transition.
31293143
This field may be empty.
3144+
maxLength: 10240
3145+
minLength: 1
31303146
type: string
31313147
reason:
31323148
description: |-
3133-
The reason for the condition's last transition in CamelCase.
3149+
reason is the reason for the condition's last transition in CamelCase.
31343150
The specific API may choose whether or not this field is considered a guaranteed API.
31353151
This field may be empty.
3152+
maxLength: 256
3153+
minLength: 1
31363154
type: string
31373155
severity:
31383156
description: |-
31393157
severity provides an explicit classification of Reason code, so the users or machines can immediately
31403158
understand the current situation and act accordingly.
31413159
The Severity field MUST be set only when Status=False.
3160+
maxLength: 32
31423161
type: string
31433162
status:
31443163
description: status of the condition, one of True, False, Unknown.
@@ -3148,6 +3167,8 @@ spec:
31483167
type of condition in CamelCase or in foo.example.com/CamelCase.
31493168
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
31503169
can be useful (see .node.status.conditions), the ability to deconflict is important.
3170+
maxLength: 256
3171+
minLength: 1
31513172
type: string
31523173
required:
31533174
- lastTransitionTime

‎charts/rancher-turtles/templates/rancher-turtles-exp-day2-components.yaml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,27 +181,32 @@ spec:
181181
properties:
182182
lastTransitionTime:
183183
description: |-
184-
Last time the condition transitioned from one status to another.
184+
lastTransitionTime is the last time the condition transitioned from one status to another.
185185
This should be when the underlying condition changed. If that is not known, then using the time when
186186
the API field changed is acceptable.
187187
format: date-time
188188
type: string
189189
message:
190190
description: |-
191-
A human readable message indicating details about the transition.
191+
message is a human readable message indicating details about the transition.
192192
This field may be empty.
193+
maxLength: 10240
194+
minLength: 1
193195
type: string
194196
reason:
195197
description: |-
196-
The reason for the condition's last transition in CamelCase.
198+
reason is the reason for the condition's last transition in CamelCase.
197199
The specific API may choose whether or not this field is considered a guaranteed API.
198200
This field may be empty.
201+
maxLength: 256
202+
minLength: 1
199203
type: string
200204
severity:
201205
description: |-
202206
severity provides an explicit classification of Reason code, so the users or machines can immediately
203207
understand the current situation and act accordingly.
204208
The Severity field MUST be set only when Status=False.
209+
maxLength: 32
205210
type: string
206211
status:
207212
description: status of the condition, one of True, False, Unknown.
@@ -211,6 +216,8 @@ spec:
211216
type of condition in CamelCase or in foo.example.com/CamelCase.
212217
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
213218
can be useful (see .node.status.conditions), the ability to deconflict is important.
219+
maxLength: 256
220+
minLength: 1
214221
type: string
215222
required:
216223
- lastTransitionTime

‎config/crd/bases/turtles-capi.cattle.io_capiproviders.yaml‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,6 +1301,13 @@ spec:
13011301
description: Manager defines the properties that can be enabled
13021302
on the controller manager for the additional provider deployment.
13031303
properties:
1304+
additionalArgs:
1305+
additionalProperties:
1306+
type: string
1307+
description: |-
1308+
AdditionalArgs is a map of additional options that will be passed
1309+
in as container args to the provider's controller manager.
1310+
type: object
13041311
cacheNamespace:
13051312
description: |-
13061313
CacheNamespace if specified restricts the manager's cache to watch objects in
@@ -1436,7 +1443,7 @@ spec:
14361443
minimum: 1
14371444
type: integer
14381445
metrics:
1439-
description: Metrics contains thw controller metrics configuration
1446+
description: Metrics contains the controller metrics configuration
14401447
properties:
14411448
bindAddress:
14421449
description: |-
@@ -2875,6 +2882,13 @@ spec:
28752882
description: Manager defines the properties that can be enabled on
28762883
the controller manager for the provider.
28772884
properties:
2885+
additionalArgs:
2886+
additionalProperties:
2887+
type: string
2888+
description: |-
2889+
AdditionalArgs is a map of additional options that will be passed
2890+
in as container args to the provider's controller manager.
2891+
type: object
28782892
cacheNamespace:
28792893
description: |-
28802894
CacheNamespace if specified restricts the manager's cache to watch objects in
@@ -3009,7 +3023,7 @@ spec:
30093023
minimum: 1
30103024
type: integer
30113025
metrics:
3012-
description: Metrics contains thw controller metrics configuration
3026+
description: Metrics contains the controller metrics configuration
30133027
properties:
30143028
bindAddress:
30153029
description: |-
@@ -3118,27 +3132,32 @@ spec:
31183132
properties:
31193133
lastTransitionTime:
31203134
description: |-
3121-
Last time the condition transitioned from one status to another.
3135+
lastTransitionTime is the last time the condition transitioned from one status to another.
31223136
This should be when the underlying condition changed. If that is not known, then using the time when
31233137
the API field changed is acceptable.
31243138
format: date-time
31253139
type: string
31263140
message:
31273141
description: |-
3128-
A human readable message indicating details about the transition.
3142+
message is a human readable message indicating details about the transition.
31293143
This field may be empty.
3144+
maxLength: 10240
3145+
minLength: 1
31303146
type: string
31313147
reason:
31323148
description: |-
3133-
The reason for the condition's last transition in CamelCase.
3149+
reason is the reason for the condition's last transition in CamelCase.
31343150
The specific API may choose whether or not this field is considered a guaranteed API.
31353151
This field may be empty.
3152+
maxLength: 256
3153+
minLength: 1
31363154
type: string
31373155
severity:
31383156
description: |-
31393157
severity provides an explicit classification of Reason code, so the users or machines can immediately
31403158
understand the current situation and act accordingly.
31413159
The Severity field MUST be set only when Status=False.
3160+
maxLength: 32
31423161
type: string
31433162
status:
31443163
description: status of the condition, one of True, False, Unknown.
@@ -3148,6 +3167,8 @@ spec:
31483167
type of condition in CamelCase or in foo.example.com/CamelCase.
31493168
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
31503169
can be useful (see .node.status.conditions), the ability to deconflict is important.
3170+
maxLength: 256
3171+
minLength: 1
31513172
type: string
31523173
required:
31533174
- lastTransitionTime

‎exp/day2/config/crd/bases/turtles-capi.cattle.io_etcdsnapshotrestores.yaml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,27 +66,32 @@ spec:
6666
properties:
6767
lastTransitionTime:
6868
description: |-
69-
Last time the condition transitioned from one status to another.
69+
lastTransitionTime is the last time the condition transitioned from one status to another.
7070
This should be when the underlying condition changed. If that is not known, then using the time when
7171
the API field changed is acceptable.
7272
format: date-time
7373
type: string
7474
message:
7575
description: |-
76-
A human readable message indicating details about the transition.
76+
message is a human readable message indicating details about the transition.
7777
This field may be empty.
78+
maxLength: 10240
79+
minLength: 1
7880
type: string
7981
reason:
8082
description: |-
81-
The reason for the condition's last transition in CamelCase.
83+
reason is the reason for the condition's last transition in CamelCase.
8284
The specific API may choose whether or not this field is considered a guaranteed API.
8385
This field may be empty.
86+
maxLength: 256
87+
minLength: 1
8488
type: string
8589
severity:
8690
description: |-
8791
severity provides an explicit classification of Reason code, so the users or machines can immediately
8892
understand the current situation and act accordingly.
8993
The Severity field MUST be set only when Status=False.
94+
maxLength: 32
9095
type: string
9196
status:
9297
description: status of the condition, one of True, False, Unknown.
@@ -96,6 +101,8 @@ spec:
96101
type of condition in CamelCase or in foo.example.com/CamelCase.
97102
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
98103
can be useful (see .node.status.conditions), the ability to deconflict is important.
104+
maxLength: 256
105+
minLength: 1
99106
type: string
100107
required:
101108
- lastTransitionTime

‎exp/day2/go.mod‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ require (
1010
github.com/rancher/cluster-api-provider-rke2 v0.17.1
1111
github.com/rancher/turtles v0.0.0-00010101000000-000000000000
1212
github.com/spf13/pflag v1.0.6
13-
k8s.io/api v0.31.6
14-
k8s.io/apimachinery v0.31.6
15-
k8s.io/client-go v0.31.6
16-
k8s.io/component-base v0.31.6
13+
k8s.io/api v0.32.5
14+
k8s.io/apimachinery v0.32.5
15+
k8s.io/client-go v0.32.5
16+
k8s.io/component-base v0.32.5
1717
k8s.io/klog/v2 v2.130.1
18-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
19-
sigs.k8s.io/cluster-api v1.9.5
20-
sigs.k8s.io/cluster-api-operator v0.18.1
21-
sigs.k8s.io/controller-runtime v0.19.6
18+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
19+
sigs.k8s.io/cluster-api v1.10.2
20+
sigs.k8s.io/cluster-api-operator v0.21.0
21+
sigs.k8s.io/controller-runtime v0.20.4
2222
)
2323

2424
require (
@@ -33,26 +33,26 @@ require (
3333
github.com/coreos/ignition/v2 v2.21.0 // indirect
3434
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 // indirect
3535
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
36-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
36+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3737
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
38-
github.com/fsnotify/fsnotify v1.7.0 // indirect
38+
github.com/fsnotify/fsnotify v1.8.0 // indirect
3939
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
40-
github.com/go-logr/logr v1.4.2 // indirect
40+
github.com/go-logr/logr v1.4.3 // indirect
4141
github.com/go-logr/zapr v1.3.0 // indirect
42-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
42+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4343
github.com/go-openapi/jsonreference v0.20.2 // indirect
44-
github.com/go-openapi/swag v0.22.4 // indirect
44+
github.com/go-openapi/swag v0.23.0 // indirect
4545
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4646
github.com/gobuffalo/flect v1.0.3 // indirect
4747
github.com/gogo/protobuf v1.3.2 // indirect
48-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4948
github.com/golang/protobuf v1.5.4 // indirect
49+
github.com/google/btree v1.1.3 // indirect
5050
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
5151
github.com/google/go-cmp v0.7.0 // indirect
5252
github.com/google/gofuzz v1.2.0 // indirect
5353
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
5454
github.com/google/uuid v1.6.0 // indirect
55-
github.com/imdario/mergo v0.3.16 // indirect
55+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5656
github.com/josharian/intern v1.0.0 // indirect
5757
github.com/json-iterator/go v1.1.12 // indirect
5858
github.com/mailru/easyjson v0.7.7 // indirect
@@ -65,29 +65,32 @@ require (
6565
github.com/prometheus/client_model v0.6.1 // indirect
6666
github.com/prometheus/common v0.62.0 // indirect
6767
github.com/prometheus/procfs v0.15.1 // indirect
68+
github.com/spf13/cobra v1.9.1 // indirect
6869
github.com/stretchr/testify v1.10.0 // indirect
6970
github.com/vincent-petithory/dataurl v1.0.0 // indirect
7071
github.com/x448/float16 v0.8.4 // indirect
72+
go.opentelemetry.io/otel v1.34.0 // indirect
73+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
7174
go.uber.org/automaxprocs v1.6.0 // indirect
7275
go.uber.org/multierr v1.11.0 // indirect
7376
go.uber.org/zap v1.27.0 // indirect
74-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
7577
golang.org/x/net v0.38.0 // indirect
76-
golang.org/x/oauth2 v0.28.0 // indirect
78+
golang.org/x/oauth2 v0.30.0 // indirect
79+
golang.org/x/sync v0.14.0 // indirect
7780
golang.org/x/sys v0.32.0 // indirect
7881
golang.org/x/term v0.30.0 // indirect
7982
golang.org/x/text v0.24.0 // indirect
8083
golang.org/x/time v0.10.0 // indirect
8184
golang.org/x/tools v0.31.0 // indirect
82-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
85+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
8386
google.golang.org/protobuf v1.36.5 // indirect
87+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8488
gopkg.in/inf.v0 v0.9.1 // indirect
85-
gopkg.in/yaml.v2 v2.4.0 // indirect
8689
gopkg.in/yaml.v3 v3.0.1 // indirect
87-
k8s.io/apiextensions-apiserver v0.31.6 // indirect
88-
k8s.io/cluster-bootstrap v0.31.3 // indirect
89-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
90-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
91-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
90+
k8s.io/apiextensions-apiserver v0.32.5 // indirect
91+
k8s.io/cluster-bootstrap v0.32.3 // indirect
92+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
93+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
94+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
9295
sigs.k8s.io/yaml v1.4.0 // indirect
9396
)

0 commit comments

Comments
 (0)