Skip to content

Commit 6fe6426

Browse files
authored
Merge pull request #223 from dennybaa/dennybaa/update-crossplane
chore(crossplane): bump crossplane to v1.16.0
2 parents cf057e8 + e5addea commit 6fe6426

23 files changed

+4049
-3136
lines changed
Lines changed: 1309 additions & 2420 deletions
Large diffs are not rendered by default.

crossplane/kcl.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "crossplane"
3-
version = "1.15.3"
3+
version = "1.16.0"
44
description = "`crossplane` is the crossplane spec definition"
55

66
[dependencies]

crossplane/v1beta1/meta_pkg_crossplane_io_v1beta1_function.k renamed to crossplane/meta/v1beta1/meta_pkg_crossplane_io_v1beta1_function.k

File renamed without changes.

crossplane/v1/apiextensions_crossplane_io_v1_composite_resource_definition.k

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@ import k8s.apimachinery.pkg.apis.meta.v1
66

77

88
schema CompositeResourceDefinition:
9-
"""
10-
A CompositeResourceDefinition defines a new kind of composite infrastructure
11-
resource. The new resource is composed of other composite or managed
12-
infrastructure resources.
9+
r"""
10+
A CompositeResourceDefinition defines the schema for a new custom Kubernetes
11+
API.
12+
13+
14+
Read the Crossplane documentation for
15+
[more information about CustomResourceDefinitions](https://docs.crossplane.io/latest/concepts/composite-resource-definitions).
1316

1417
Attributes
1518
----------
@@ -38,7 +41,7 @@ schema CompositeResourceDefinition:
3841

3942

4043
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpec:
41-
"""
44+
r"""
4245
CompositeResourceDefinitionSpec specifies the desired state of the definition.
4346

4447
Attributes
@@ -108,7 +111,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpec:
108111

109112

110113
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecClaimNames:
111-
"""
114+
r"""
112115
ClaimNames specifies the names of an optional composite resource claim.
113116
When claim names are specified Crossplane will create a namespaced
114117
'composite resource claim' CRD that corresponds to the defined composite
@@ -157,7 +160,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecClaimNames:
157160

158161

159162
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecConversion:
160-
"""
163+
r"""
161164
Conversion defines all conversion settings for the defined Composite resource.
162165

163166
Attributes
@@ -178,7 +181,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecConversion:
178181

179182

180183
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecConversionWebhook:
181-
"""
184+
r"""
182185
webhook describes how to call the conversion webhook. Required when `strategy` is set to `"Webhook"`.
183186

184187
Attributes
@@ -201,7 +204,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecConversionWebho
201204

202205

203206
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecConversionWebhookClientConfig:
204-
"""
207+
r"""
205208
clientConfig is the instructions for how to call the webhook if strategy is `Webhook`.
206209

207210
Attributes
@@ -253,7 +256,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecConversionWebho
253256

254257

255258
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecConversionWebhookClientConfigService:
256-
"""
259+
r"""
257260
service is a reference to the service for this webhook. Either
258261
service or url must be specified.
259262

@@ -287,7 +290,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecConversionWebho
287290

288291

289292
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecDefaultCompositionRef:
290-
"""
293+
r"""
291294
DefaultCompositionRef refers to the Composition resource that will be used
292295
in case no composition selector is given.
293296

@@ -302,7 +305,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecDefaultComposit
302305

303306

304307
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecEnforcedCompositionRef:
305-
"""
308+
r"""
306309
EnforcedCompositionRef refers to the Composition resource that will be used
307310
by all composite instances whose schema is defined by this definition.
308311

@@ -317,7 +320,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecEnforcedComposi
317320

318321

319322
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecMetadata:
320-
"""
323+
r"""
321324
Metadata specifies the desired metadata for the defined composite resource and claim CRD's.
322325

323326
Attributes
@@ -343,7 +346,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecMetadata:
343346

344347

345348
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecNames:
346-
"""
349+
r"""
347350
Names specifies the resource and kind names of the defined composite
348351
resource.
349352

@@ -386,7 +389,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecNames:
386389

387390

388391
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecVersionsItems0:
389-
"""
392+
r"""
390393
CompositeResourceDefinitionVersion describes a version of an XR.
391394

392395
Attributes
@@ -439,7 +442,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecVersionsItems0:
439442

440443

441444
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecVersionsItems0AdditionalPrinterColumnsItems0:
442-
"""
445+
r"""
443446
CustomResourceColumnDefinition specifies a column for server side printing.
444447

445448
Attributes
@@ -479,7 +482,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecVersionsItems0A
479482

480483

481484
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecVersionsItems0Schema:
482-
"""
485+
r"""
483486
Schema describes the schema used for validation, pruning, and defaulting
484487
of this version of the defined composite resource. Fields required by all
485488
composite resources will be injected into this schema automatically, and
@@ -499,7 +502,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionSpecVersionsItems0S
499502

500503

501504
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionStatus:
502-
"""
505+
r"""
503506
CompositeResourceDefinitionStatus shows the observed state of the definition.
504507

505508
Attributes
@@ -517,7 +520,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionStatus:
517520

518521

519522
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionStatusConditionsItems0:
520-
"""
523+
r"""
521524
A Condition that may apply to a resource.
522525

523526
Attributes
@@ -528,6 +531,10 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionStatusConditionsIte
528531
message : str, default is Undefined, optional
529532
A Message containing details about this condition's last transition from
530533
one status to another, if any.
534+
observedGeneration : int, default is Undefined, optional
535+
ObservedGeneration represents the .metadata.generation that the condition was set based upon.
536+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
537+
with respect to the current state of the instance.
531538
reason : str, default is Undefined, required
532539
A Reason for this condition's last transition from one status to another.
533540
status : str, default is Undefined, required
@@ -542,6 +549,8 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionStatusConditionsIte
542549

543550
message?: str
544551

552+
observedGeneration?: int
553+
545554
reason: str
546555

547556
status: str
@@ -550,7 +559,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionStatusConditionsIte
550559

551560

552561
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionStatusControllers:
553-
"""
562+
r"""
554563
Controllers represents the status of the controllers that power this
555564
composite resource definition.
556565

@@ -569,7 +578,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionStatusControllers:
569578

570579

571580
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionStatusControllersCompositeResourceClaimType:
572-
"""
581+
r"""
573582
The CompositeResourceClaimTypeRef is the type of composite resource claim
574583
that Crossplane is currently reconciling for this definition. Its version
575584
will eventually become consistent with the definition's referenceable
@@ -591,7 +600,7 @@ schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionStatusControllersCo
591600

592601

593602
schema ApiextensionsCrossplaneIoV1CompositeResourceDefinitionStatusControllersCompositeResourceType:
594-
"""
603+
r"""
595604
The CompositeResourceTypeRef is the type of composite resource that
596605
Crossplane is currently reconciling for this definition. Its version will
597606
eventually become consistent with the definition's referenceable version.

0 commit comments

Comments
 (0)