Skip to content

Commit e826c29

Browse files
committed
Update fluxcd-kustomize-controller module to v1.5.1
Signed-off-by: Lukáš Kubín <[email protected]>
1 parent 5c7d399 commit e826c29

7 files changed

+2084
-1958
lines changed

fluxcd-kustomize-controller/README.md

+614-5
Large diffs are not rendered by default.

fluxcd-kustomize-controller/crds/[email protected]

-1,822
This file was deleted.

fluxcd-kustomize-controller/kcl.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
2-
name = "fluxcd-kustomize-controller"
3-
edition = "v0.9.0"
4-
version = "v1.3.2"
2+
name = "kustomize-controller"
3+
edition = "*"
4+
version = "v1.5.1"
5+
description = "KCL package for https://github.com/fluxcd/kustomize-controller CRDs"
56

67
[dependencies]
78
k8s = "1.31.2"
8-

fluxcd-kustomize-controller/v1/kustomize_toolkit_fluxcd_io_v1_kustomization.k

+74-40
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ _regex_match = regex.match
88

99

1010
schema Kustomization:
11-
"""
11+
r"""
1212
Kustomization is the Schema for the kustomizations API.
1313

1414
Attributes
@@ -38,7 +38,7 @@ schema Kustomization:
3838

3939

4040
schema KustomizeToolkitFluxcdIoV1KustomizationSpec:
41-
"""
41+
r"""
4242
KustomizationSpec defines the configuration to calculate the desired state
4343
from a Source using Kustomize.
4444

@@ -50,13 +50,22 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpec:
5050
Components specifies relative paths to specifications of other Components.
5151
decryption : KustomizeToolkitFluxcdIoV1KustomizationSpecDecryption, default is Undefined, optional
5252
decryption
53+
deletionPolicy : str, default is Undefined, optional
54+
DeletionPolicy can be used to control garbage collection when this
55+
Kustomization is deleted. Valid values are ('MirrorPrune', 'Delete',
56+
'Orphan'). 'MirrorPrune' mirrors the Prune field (orphan if false,
57+
delete if true). Defaults to 'MirrorPrune'.
5358
dependsOn : [KustomizeToolkitFluxcdIoV1KustomizationSpecDependsOnItems0], default is Undefined, optional
5459
DependsOn may contain a meta.NamespacedObjectReference slice
5560
with references to Kustomization resources that must be ready before this
5661
Kustomization can be reconciled.
5762
force : bool, default is Undefined, optional
5863
Force instructs the controller to recreate resources
5964
when patching fails due to an immutable field change.
65+
healthCheckExprs : [KustomizeToolkitFluxcdIoV1KustomizationSpecHealthCheckExprsItems0], default is Undefined, optional
66+
HealthCheckExprs is a list of healthcheck expressions for evaluating the
67+
health of custom resources using Common Expression Language (CEL).
68+
The expressions are evaluated only when Wait or HealthChecks are specified.
6069
healthChecks : [KustomizeToolkitFluxcdIoV1KustomizationSpecHealthChecksItems0], default is Undefined, optional
6170
A list of resources to be included in the health assessment.
6271
images : [KustomizeToolkitFluxcdIoV1KustomizationSpecImagesItems0], default is Undefined, optional
@@ -114,10 +123,14 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpec:
114123

115124
decryption?: KustomizeToolkitFluxcdIoV1KustomizationSpecDecryption
116125

126+
deletionPolicy?: "MirrorPrune" | "Delete" | "Orphan"
127+
117128
dependsOn?: [KustomizeToolkitFluxcdIoV1KustomizationSpecDependsOnItems0]
118129

119130
force?: bool = False
120131

132+
healthCheckExprs?: [KustomizeToolkitFluxcdIoV1KustomizationSpecHealthCheckExprsItems0]
133+
121134
healthChecks?: [KustomizeToolkitFluxcdIoV1KustomizationSpecHealthChecksItems0]
122135

123136
images?: [KustomizeToolkitFluxcdIoV1KustomizationSpecImagesItems0]
@@ -166,7 +179,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpec:
166179

167180

168181
schema KustomizeToolkitFluxcdIoV1KustomizationSpecCommonMetadata:
169-
"""
182+
r"""
170183
CommonMetadata specifies the common labels and annotations that are
171184
applied to all resources. Any existing label or annotation will be
172185
overridden if its key matches a common one.
@@ -186,7 +199,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpecCommonMetadata:
186199

187200

188201
schema KustomizeToolkitFluxcdIoV1KustomizationSpecDecryption:
189-
"""
202+
r"""
190203
Decrypt Kubernetes secrets before applying them on the cluster.
191204

192205
Attributes
@@ -204,7 +217,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpecDecryption:
204217

205218

206219
schema KustomizeToolkitFluxcdIoV1KustomizationSpecDecryptionSecretRef:
207-
"""
220+
r"""
208221
The secret name containing the private OpenPGP keys used for decryption.
209222

210223
Attributes
@@ -218,7 +231,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpecDecryptionSecretRef:
218231

219232

220233
schema KustomizeToolkitFluxcdIoV1KustomizationSpecDependsOnItems0:
221-
"""
234+
r"""
222235
NamespacedObjectReference contains enough information to locate the referenced Kubernetes resource object in any
223236
namespace.
224237

@@ -236,8 +249,41 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpecDependsOnItems0:
236249
namespace?: str
237250

238251

239-
schema KustomizeToolkitFluxcdIoV1KustomizationSpecHealthChecksItems0:
252+
schema KustomizeToolkitFluxcdIoV1KustomizationSpecHealthCheckExprsItems0:
253+
r"""
254+
CustomHealthCheck defines the health check for custom resources.
255+
256+
Attributes
257+
----------
258+
apiVersion : str, default is Undefined, required
259+
APIVersion of the custom resource under evaluation.
260+
current : str, default is Undefined, required
261+
Current is the CEL expression that determines if the status
262+
of the custom resource has reached the desired state.
263+
failed : str, default is Undefined, optional
264+
Failed is the CEL expression that determines if the status
265+
of the custom resource has failed to reach the desired state.
266+
inProgress : str, default is Undefined, optional
267+
InProgress is the CEL expression that determines if the status
268+
of the custom resource has not yet reached the desired state.
269+
kind : str, default is Undefined, required
270+
Kind of the custom resource under evaluation.
240271
"""
272+
273+
274+
apiVersion: str
275+
276+
current: str
277+
278+
failed?: str
279+
280+
inProgress?: str
281+
282+
kind: str
283+
284+
285+
schema KustomizeToolkitFluxcdIoV1KustomizationSpecHealthChecksItems0:
286+
r"""
241287
NamespacedObjectKindReference contains enough information to locate the typed referenced Kubernetes resource object
242288
in any namespace.
243289

@@ -264,7 +310,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpecHealthChecksItems0:
264310

265311

266312
schema KustomizeToolkitFluxcdIoV1KustomizationSpecImagesItems0:
267-
"""
313+
r"""
268314
Image contains an image name, a new name, a new tag or digest, which will replace the original name and tag.
269315

270316
Attributes
@@ -291,7 +337,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpecImagesItems0:
291337

292338

293339
schema KustomizeToolkitFluxcdIoV1KustomizationSpecKubeConfig:
294-
"""
340+
r"""
295341
The KubeConfig for reconciling the Kustomization on a remote cluster.
296342
When used in combination with KustomizationSpec.ServiceAccountName,
297343
forces the controller to act on behalf of that Service Account at the
@@ -311,7 +357,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpecKubeConfig:
311357

312358

313359
schema KustomizeToolkitFluxcdIoV1KustomizationSpecKubeConfigSecretRef:
314-
"""
360+
r"""
315361
SecretRef holds the name of a secret that contains a key with
316362
the kubeconfig file as the value. If no key is set, the key will default
317363
to 'value'.
@@ -336,7 +382,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpecKubeConfigSecretRef:
336382

337383

338384
schema KustomizeToolkitFluxcdIoV1KustomizationSpecPatchesItems0:
339-
"""
385+
r"""
340386
Patch contains an inline StrategicMerge or JSON6902 patch, and the target the patch should
341387
be applied to.
342388

@@ -356,7 +402,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpecPatchesItems0:
356402

357403

358404
schema KustomizeToolkitFluxcdIoV1KustomizationSpecPatchesItems0Target:
359-
"""
405+
r"""
360406
Target points to the resources that the patch document should be applied to.
361407

362408
Attributes
@@ -405,7 +451,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpecPatchesItems0Target:
405451

406452

407453
schema KustomizeToolkitFluxcdIoV1KustomizationSpecPostBuild:
408-
"""
454+
r"""
409455
PostBuild describes which actions to perform on the YAML manifest
410456
generated by building the kustomize overlay.
411457

@@ -416,7 +462,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpecPostBuild:
416462
The variables defined in your YAML manifests that match any of the keys
417463
defined in the map will be substituted with the set value.
418464
Includes support for bash string replacement functions
419-
e.g. $\{var:=default\}, $\{var:position\} and $\{var/substring/replacement\}.
465+
e.g. ${var:=default}, ${var:position} and ${var/substring/replacement}.
420466
substituteFrom : [KustomizeToolkitFluxcdIoV1KustomizationSpecPostBuildSubstituteFromItems0], default is Undefined, optional
421467
SubstituteFrom holds references to ConfigMaps and Secrets containing
422468
the variables and their values to be substituted in the YAML manifests.
@@ -432,7 +478,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpecPostBuild:
432478

433479

434480
schema KustomizeToolkitFluxcdIoV1KustomizationSpecPostBuildSubstituteFromItems0:
435-
"""
481+
r"""
436482
SubstituteReference contains a reference to a resource containing
437483
the variables name and value.
438484

@@ -463,7 +509,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpecPostBuildSubstituteFromItems0:
463509

464510

465511
schema KustomizeToolkitFluxcdIoV1KustomizationSpecSourceRef:
466-
"""
512+
r"""
467513
Reference of the source where the kustomization file is.
468514

469515
Attributes
@@ -490,7 +536,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationSpecSourceRef:
490536

491537

492538
schema KustomizeToolkitFluxcdIoV1KustomizationStatus:
493-
"""
539+
r"""
494540
KustomizationStatus defines the observed state of a kustomization.
495541

496542
Attributes
@@ -499,6 +545,12 @@ schema KustomizeToolkitFluxcdIoV1KustomizationStatus:
499545
conditions
500546
inventory : KustomizeToolkitFluxcdIoV1KustomizationStatusInventory, default is Undefined, optional
501547
inventory
548+
lastAppliedOriginRevision : str, default is Undefined, optional
549+
The last successfully applied origin revision.
550+
Equals the origin revision of the applied Artifact from the referenced Source.
551+
Usually present on the Metadata of the applied Artifact and depends on the
552+
Source type, e.g. for OCI it's the value associated with the key
553+
"org.opencontainers.image.revision".
502554
lastAppliedRevision : str, default is Undefined, optional
503555
The last successfully applied revision.
504556
Equals the Revision of the applied Artifact from the referenced Source.
@@ -517,6 +569,8 @@ schema KustomizeToolkitFluxcdIoV1KustomizationStatus:
517569

518570
inventory?: KustomizeToolkitFluxcdIoV1KustomizationStatusInventory
519571

572+
lastAppliedOriginRevision?: str
573+
520574
lastAppliedRevision?: str
521575

522576
lastAttemptedRevision?: str
@@ -527,24 +581,8 @@ schema KustomizeToolkitFluxcdIoV1KustomizationStatus:
527581

528582

529583
schema KustomizeToolkitFluxcdIoV1KustomizationStatusConditionsItems0:
530-
"""
584+
r"""
531585
Condition contains details for one aspect of the current state of this API Resource.
532-
---
533-
This struct is intended for direct use as an array at the field path .status.conditions. For example,
534-
535-
536-
type FooStatus struct{
537-
// Represents the observations of a foo's current state.
538-
// Known .status.conditions.type are: "Available", "Progressing", and "Degraded"
539-
// +patchMergeKey=type
540-
// +patchStrategy=merge
541-
// +listType=map
542-
// +listMapKey=type
543-
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
544-
545-
546-
// other fields
547-
}
548586

549587
Attributes
550588
----------
@@ -568,10 +606,6 @@ schema KustomizeToolkitFluxcdIoV1KustomizationStatusConditionsItems0:
568606
status of the condition, one of True, False, Unknown.
569607
$type : str, default is Undefined, required
570608
type of condition in CamelCase or in foo.example.com/CamelCase.
571-
---
572-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
573-
useful (see .node.status.conditions), the ability to deconflict is important.
574-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
575609
"""
576610

577611

@@ -599,7 +633,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationStatusConditionsItems0:
599633

600634

601635
schema KustomizeToolkitFluxcdIoV1KustomizationStatusInventory:
602-
"""
636+
r"""
603637
Inventory contains the list of Kubernetes resource object references that
604638
have been successfully applied.
605639

@@ -614,7 +648,7 @@ schema KustomizeToolkitFluxcdIoV1KustomizationStatusInventory:
614648

615649

616650
schema KustomizeToolkitFluxcdIoV1KustomizationStatusInventoryEntriesItems0:
617-
"""
651+
r"""
618652
ResourceRef contains the information necessary to locate a resource within a cluster.
619653

620654
Attributes

0 commit comments

Comments
 (0)