Skip to content

Commit d95f346

Browse files
authored
Update chart versions (#237)
Signed-off-by: serngawy <[email protected]>
1 parent 1efdc70 commit d95f346

File tree

23 files changed

+2930
-1006
lines changed

23 files changed

+2930
-1006
lines changed

charts/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
OCP_VERSION ?= 4.19
1+
OCP_VERSION ?= 4.20
22
SYNC2CHARTS ?= true
33

4-
DEFAULT_BRANCH ?= release-4.19
4+
DEFAULT_BRANCH ?= release-4.20
55
DEFAULT_ORGREPO ?= https://github.com/openshift
66
# needs overridable branch, as the non-master branch will differ
7-
OPENSHIFT_ASSISTED_BRANCH ?= backplane-2.9
8-
METAL3_BRANCH ?= release-4.19
7+
OPENSHIFT_ASSISTED_BRANCH ?= backplane-2.10
8+
METAL3_BRANCH ?= release-4.20
99

1010
OPENSHIFT_ASSISTED_ORGREPO ?= https://github.com/openshift-assisted
1111

charts/cluster-api-provider-aws/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: cluster-api-provider-aws
33
description: Cluster API provider for AWS
44
type: application
5-
version: "4.19"
6-
appVersion: "4.19"
5+
version: "4.20"
6+
appVersion: "4.20"

charts/cluster-api-provider-aws/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ rosa:
66
manager:
77
cmd: /bin/cluster-api-provider-aws-controller-manager
88
image:
9-
tag: v4.19
9+
tag: v4.20
1010
url: registry.redhat.io/openshift4/ose-aws-cluster-api-controllers-rhel9
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
manager:
22
image:
3-
tag: v4.19
3+
tag: v4.20
44
url: registry.redhat.io/openshift4/ose-baremetal-cluster-api-controllers-rhel9
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
bootstrap:
22
image:
3-
tag: 2.9
3+
tag: 2.10
44
url: quay.io/edge-infrastructure/cluster-api-bootstrap-provider-openshift-assisted
55
controlplane:
66
image:
7-
tag: 2.9
7+
tag: 2.10
88
url: quay.io/edge-infrastructure/cluster-api-controlplane-provider-openshift-assisted

charts/cluster-api/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: cluster-api
33
description: Cluster API
44
type: application
5-
version: "4.19"
6-
appVersion: "4.19"
5+
version: "4.20"
6+
appVersion: "4.20"

charts/cluster-api/crds/apiextensions.k8s.io_v1_customresourcedefinition_clusterclasses.cluster.x-k8s.io.yaml

Lines changed: 315 additions & 27 deletions
Large diffs are not rendered by default.

charts/cluster-api/crds/apiextensions.k8s.io_v1_customresourcedefinition_clusterresourcesetbindings.addons.cluster.x-k8s.io.yaml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.17.2
66
service.beta.openshift.io/inject-cabundle: "true"
77
labels:
88
cluster.x-k8s.io/provider: cluster-api
@@ -45,8 +45,7 @@ spec:
4545
metadata:
4646
type: object
4747
spec:
48-
description: ClusterResourceSetBindingSpec defines the desired state of
49-
ClusterResourceSetBinding.
48+
description: spec is the desired state of ClusterResourceSetBinding.
5049
properties:
5150
bindings:
5251
description: bindings is a list of ClusterResourceSets and their resources.
@@ -140,8 +139,7 @@ spec:
140139
metadata:
141140
type: object
142141
spec:
143-
description: ClusterResourceSetBindingSpec defines the desired state of
144-
ClusterResourceSetBinding.
142+
description: spec is the desired state of ClusterResourceSetBinding.
145143
properties:
146144
bindings:
147145
description: bindings is a list of ClusterResourceSets and their resources.
@@ -232,8 +230,7 @@ spec:
232230
metadata:
233231
type: object
234232
spec:
235-
description: ClusterResourceSetBindingSpec defines the desired state of
236-
ClusterResourceSetBinding.
233+
description: spec is the desired state of ClusterResourceSetBinding.
237234
properties:
238235
bindings:
239236
description: bindings is a list of ClusterResourceSets and their resources.
@@ -244,6 +241,8 @@ spec:
244241
clusterResourceSetName:
245242
description: clusterResourceSetName is the name of the ClusterResourceSet
246243
that is applied to the owner cluster of the binding.
244+
maxLength: 253
245+
minLength: 1
247246
type: string
248247
resources:
249248
description: resources is a list of resources that the ClusterResourceSet
@@ -261,6 +260,8 @@ spec:
261260
description: |-
262261
hash is the hash of a resource's data. This can be used to decide if a resource is changed.
263262
For "ApplyOnce" ClusterResourceSet.spec.strategy, this is no-op as that strategy does not act on change.
263+
maxLength: 256
264+
minLength: 1
264265
type: string
265266
kind:
266267
description: 'kind of the resource. Supported kinds are:
@@ -277,22 +278,27 @@ spec:
277278
name:
278279
description: name of the resource that is in the same
279280
namespace with ClusterResourceSet object.
281+
maxLength: 253
280282
minLength: 1
281283
type: string
282284
required:
283285
- applied
284286
- kind
285287
- name
286288
type: object
289+
maxItems: 100
287290
type: array
288291
required:
289292
- clusterResourceSetName
290293
type: object
294+
maxItems: 100
291295
type: array
292296
clusterName:
293297
description: |-
294298
clusterName is the name of the Cluster this binding applies to.
295299
Note: this field mandatory in v1beta2.
300+
maxLength: 63
301+
minLength: 1
296302
type: string
297303
type: object
298304
type: object

charts/cluster-api/crds/apiextensions.k8s.io_v1_customresourcedefinition_clusterresourcesets.addons.cluster.x-k8s.io.yaml

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.17.2
66
service.beta.openshift.io/inject-cabundle: "true"
77
labels:
88
cluster.x-k8s.io/provider: cluster-api
@@ -45,11 +45,11 @@ spec:
4545
metadata:
4646
type: object
4747
spec:
48-
description: ClusterResourceSetSpec defines the desired state of ClusterResourceSet.
48+
description: spec is the desired state of ClusterResourceSet.
4949
properties:
5050
clusterSelector:
5151
description: |-
52-
Label selector for Clusters. The Clusters that are
52+
clusterSelector is the label selector for Clusters. The Clusters that are
5353
selected by this will be the ones affected by this ClusterResourceSet.
5454
It must match the Cluster labels. This field is immutable.
5555
properties:
@@ -129,7 +129,7 @@ spec:
129129
- clusterSelector
130130
type: object
131131
status:
132-
description: ClusterResourceSetStatus defines the observed state of ClusterResourceSet.
132+
description: status is the observed state of ClusterResourceSet.
133133
properties:
134134
conditions:
135135
description: conditions defines current state of the ClusterResourceSet.
@@ -139,19 +139,19 @@ spec:
139139
properties:
140140
lastTransitionTime:
141141
description: |-
142-
Last time the condition transitioned from one status to another.
142+
lastTransitionTime is the last time the condition transitioned from one status to another.
143143
This should be when the underlying condition changed. If that is not known, then using the time when
144144
the API field changed is acceptable.
145145
format: date-time
146146
type: string
147147
message:
148148
description: |-
149-
A human readable message indicating details about the transition.
149+
message is a human readable message indicating details about the transition.
150150
This field may be empty.
151151
type: string
152152
reason:
153153
description: |-
154-
The reason for the condition's last transition in CamelCase.
154+
reason is the reason for the condition's last transition in CamelCase.
155155
The specific API may choose whether or not this field is considered a guaranteed API.
156156
This field may not be empty.
157157
type: string
@@ -218,11 +218,11 @@ spec:
218218
metadata:
219219
type: object
220220
spec:
221-
description: ClusterResourceSetSpec defines the desired state of ClusterResourceSet.
221+
description: spec is the desired state of ClusterResourceSet.
222222
properties:
223223
clusterSelector:
224224
description: |-
225-
Label selector for Clusters. The Clusters that are
225+
clusterSelector is the label selector for Clusters. The Clusters that are
226226
selected by this will be the ones affected by this ClusterResourceSet.
227227
It must match the Cluster labels. This field is immutable.
228228
Label selector cannot be empty.
@@ -303,7 +303,7 @@ spec:
303303
- clusterSelector
304304
type: object
305305
status:
306-
description: ClusterResourceSetStatus defines the observed state of ClusterResourceSet.
306+
description: status is the observed state of ClusterResourceSet.
307307
properties:
308308
conditions:
309309
description: conditions defines current state of the ClusterResourceSet.
@@ -313,19 +313,19 @@ spec:
313313
properties:
314314
lastTransitionTime:
315315
description: |-
316-
Last time the condition transitioned from one status to another.
316+
lastTransitionTime is the last time the condition transitioned from one status to another.
317317
This should be when the underlying condition changed. If that is not known, then using the time when
318318
the API field changed is acceptable.
319319
format: date-time
320320
type: string
321321
message:
322322
description: |-
323-
A human readable message indicating details about the transition.
323+
message is a human readable message indicating details about the transition.
324324
This field may be empty.
325325
type: string
326326
reason:
327327
description: |-
328-
The reason for the condition's last transition in CamelCase.
328+
reason is the reason for the condition's last transition in CamelCase.
329329
The specific API may choose whether or not this field is considered a guaranteed API.
330330
This field may not be empty.
331331
type: string
@@ -368,8 +368,9 @@ spec:
368368
name: v1beta1
369369
schema:
370370
openAPIV3Schema:
371-
description: ClusterResourceSet is the Schema for the clusterresourcesets
372-
API.
371+
description: |-
372+
ClusterResourceSet is the Schema for the clusterresourcesets API.
373+
For advanced use cases an add-on provider should be used instead.
373374
properties:
374375
apiVersion:
375376
description: |-
@@ -389,11 +390,11 @@ spec:
389390
metadata:
390391
type: object
391392
spec:
392-
description: ClusterResourceSetSpec defines the desired state of ClusterResourceSet.
393+
description: spec is the desired state of ClusterResourceSet.
393394
properties:
394395
clusterSelector:
395396
description: |-
396-
Label selector for Clusters. The Clusters that are
397+
clusterSelector is the label selector for Clusters. The Clusters that are
397398
selected by this will be the ones affected by this ClusterResourceSet.
398399
It must match the Cluster labels. This field is immutable.
399400
Label selector cannot be empty.
@@ -457,12 +458,14 @@ spec:
457458
name:
458459
description: name of the resource that is in the same namespace
459460
with ClusterResourceSet object.
461+
maxLength: 253
460462
minLength: 1
461463
type: string
462464
required:
463465
- kind
464466
- name
465467
type: object
468+
maxItems: 100
466469
type: array
467470
strategy:
468471
description: strategy is the strategy to be used during applying resources.
@@ -475,7 +478,7 @@ spec:
475478
- clusterSelector
476479
type: object
477480
status:
478-
description: ClusterResourceSetStatus defines the observed state of ClusterResourceSet.
481+
description: status is the observed state of ClusterResourceSet.
479482
properties:
480483
conditions:
481484
description: conditions defines current state of the ClusterResourceSet.
@@ -485,27 +488,32 @@ spec:
485488
properties:
486489
lastTransitionTime:
487490
description: |-
488-
Last time the condition transitioned from one status to another.
491+
lastTransitionTime is the last time the condition transitioned from one status to another.
489492
This should be when the underlying condition changed. If that is not known, then using the time when
490493
the API field changed is acceptable.
491494
format: date-time
492495
type: string
493496
message:
494497
description: |-
495-
A human readable message indicating details about the transition.
498+
message is a human readable message indicating details about the transition.
496499
This field may be empty.
500+
maxLength: 10240
501+
minLength: 1
497502
type: string
498503
reason:
499504
description: |-
500-
The reason for the condition's last transition in CamelCase.
505+
reason is the reason for the condition's last transition in CamelCase.
501506
The specific API may choose whether or not this field is considered a guaranteed API.
502507
This field may be empty.
508+
maxLength: 256
509+
minLength: 1
503510
type: string
504511
severity:
505512
description: |-
506513
severity provides an explicit classification of Reason code, so the users or machines can immediately
507514
understand the current situation and act accordingly.
508515
The Severity field MUST be set only when Status=False.
516+
maxLength: 32
509517
type: string
510518
status:
511519
description: status of the condition, one of True, False, Unknown.
@@ -515,6 +523,8 @@ spec:
515523
type of condition in CamelCase or in foo.example.com/CamelCase.
516524
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
517525
can be useful (see .node.status.conditions), the ability to deconflict is important.
526+
maxLength: 256
527+
minLength: 1
518528
type: string
519529
required:
520530
- lastTransitionTime

0 commit comments

Comments
 (0)