Merge pull request #103 from stefanprodan/flux-v2.5.0

Update Flux to v2.5.0

Author: stefanprodan

README.md

@@ -1,6 +1,6 @@
 # flux-aio
 
-[![flux](https://img.shields.io/badge/flux-v2.4.0-9cf)](https://fluxcd.io)
+[![flux](https://img.shields.io/badge/flux-v2.5.0-9cf)](https://fluxcd.io)
 [![test](https://github.com/stefanprodan/flux-aio/workflows/test/badge.svg)](https://github.com/stefanprodan/flux-aio/actions)
 [![license](https://img.shields.io/github/license/stefanprodan/flux-aio.svg)](https://github.com/stefanprodan/flux-aio/blob/main/LICENSE)
 [![release](https://img.shields.io/github/release/stefanprodan/flux-aio/all.svg)](https://github.com/stefanprodan/flux-aio/releases)
@@ -18,7 +18,7 @@ This distribution is optimized for running [Flux](https://fluxcd.io) on:
 - Serverless clusters for cost optimisation (EKS Fargate)
 
 The versioning of this distribution follows semver with the following format:
-`<flux version>-<distribution release number>`, e.g. `2.4.0-0`.
+`<flux version>-<distribution release number>`, e.g. `2.5.0-0`.
 
 ## Documentation
 

modules/flux-aio/templates/crds.cue

@@ -668,9 +668,12 @@ customresourcedefinition: "alerts.notification.toolkit.fluxcd.io": {
 								type: "object"
 							}
 							summary: {
-								description: "Summary holds a short description of the impact and affected cluster."
-								maxLength:   255
-								type:        "string"
+								description: """
+	Summary holds a short description of the impact and affected cluster.
+	Deprecated: Use EventMetadata instead.
+	"""
+								maxLength: 255
+								type:      "string"
 							}
 							suspend: {
 								description: """
@@ -2005,12 +2008,13 @@ customresourcedefinition: "gitrepositories.source.toolkit.fluxcd.io": {
 							}
 							provider: {
 								description: """
-	Provider used for authentication, can be 'azure', 'generic'.
+	Provider used for authentication, can be 'azure', 'github', 'generic'.
 	When not specified, defaults to 'generic'.
 	"""
 								enum: [
 									"generic",
 									"azure",
+									"github",
 								]
 								type: "string"
 							}
@@ -5087,6 +5091,13 @@ customresourcedefinition: "helmreleases.helm.toolkit.fluxcd.io": {
 										description: """
 	DisableSchemaValidation prevents the Helm install action from validating
 	the values against the JSON Schema.
+	"""
+										type: "boolean"
+									}
+									disableTakeOwnership: {
+										description: """
+	DisableTakeOwnership disables taking ownership of existing resources
+	during the Helm install action. Defaults to false.
 	"""
 										type: "boolean"
 									}
@@ -5604,6 +5615,13 @@ customresourcedefinition: "helmreleases.helm.toolkit.fluxcd.io": {
 										description: """
 	DisableSchemaValidation prevents the Helm upgrade action from validating
 	the values against the JSON Schema.
+	"""
+										type: "boolean"
+									}
+									disableTakeOwnership: {
+										description: """
+	DisableTakeOwnership disables taking ownership of existing resources
+	during the Helm upgrade action. Defaults to false.
 	"""
 										type: "boolean"
 									}
@@ -11909,6 +11927,14 @@ customresourcedefinition: "imageupdateautomations.image.toolkit.fluxcd.io": {
 	"""
 												type: "string"
 											}
+											messageTemplateValues: {
+												additionalProperties: type: "string"
+												description: """
+	MessageTemplateValues provides additional values to be available to the
+	templating rendering.
+	"""
+												type: "object"
+											}
 											signingKey: {
 												description: "SigningKey provides the option to sign commits with a GPG key"
 												properties: secretRef: {
@@ -12370,6 +12396,20 @@ customresourcedefinition: "kustomizations.kustomize.toolkit.fluxcd.io": {
 								required: ["provider"]
 								type: "object"
 							}
+							deletionPolicy: {
+								description: """
+	DeletionPolicy can be used to control garbage collection when this
+	Kustomization is deleted. Valid values are ('MirrorPrune', 'Delete',
+	'Orphan'). 'MirrorPrune' mirrors the Prune field (orphan if false,
+	delete if true). Defaults to 'MirrorPrune'.
+	"""
+								enum: [
+									"MirrorPrune",
+									"Delete",
+									"Orphan",
+								]
+								type: "string"
+							}
 							dependsOn: {
 								description: """
 	DependsOn may contain a meta.NamespacedObjectReference slice
@@ -12404,6 +12444,54 @@ customresourcedefinition: "kustomizations.kustomize.toolkit.fluxcd.io": {
 	"""
 								type: "boolean"
 							}
+							healthCheckExprs: {
+								description: """
+	HealthCheckExprs is a list of healthcheck expressions for evaluating the
+	health of custom resources using Common Expression Language (CEL).
+	The expressions are evaluated only when Wait or HealthChecks are specified.
+	"""
+								items: {
+									description: "CustomHealthCheck defines the health check for custom resources."
+									properties: {
+										apiVersion: {
+											description: "APIVersion of the custom resource under evaluation."
+											type:        "string"
+										}
+										current: {
+											description: """
+	Current is the CEL expression that determines if the status
+	of the custom resource has reached the desired state.
+	"""
+											type: "string"
+										}
+										failed: {
+											description: """
+	Failed is the CEL expression that determines if the status
+	of the custom resource has failed to reach the desired state.
+	"""
+											type: "string"
+										}
+										inProgress: {
+											description: """
+	InProgress is the CEL expression that determines if the status
+	of the custom resource has not yet reached the desired state.
+	"""
+											type: "string"
+										}
+										kind: {
+											description: "Kind of the custom resource under evaluation."
+											type:        "string"
+										}
+									}
+									required: [
+										"apiVersion",
+										"current",
+										"kind",
+									]
+									type: "object"
+								}
+								type: "array"
+							}
 							healthChecks: {
 								description: "A list of resources to be included in the health assessment."
 								items: {
@@ -12885,6 +12973,16 @@ customresourcedefinition: "kustomizations.kustomize.toolkit.fluxcd.io": {
 								required: ["entries"]
 								type: "object"
 							}
+							lastAppliedOriginRevision: {
+								description: """
+	The last successfully applied origin revision.
+	Equals the origin revision of the applied Artifact from the referenced Source.
+	Usually present on the Metadata of the applied Artifact and depends on the
+	Source type, e.g. for OCI it's the value associated with the key
+	"org.opencontainers.image.revision".
+	"""
+								type: "string"
+							}
 							lastAppliedRevision: {
 								description: """
 	The last successfully applied revision.
@@ -15614,6 +15712,18 @@ customresourcedefinition: "receivers.notification.toolkit.fluxcd.io": {
 								pattern:     "^([0-9]+(\\.[0-9]+)?(ms|s|m|h))+$"
 								type:        "string"
 							}
+							resourceFilter: {
+								description: """
+	ResourceFilter is a CEL expression expected to return a boolean that is
+	evaluated for each resource referenced in the Resources field when a
+	webhook is received. If the expression returns false then the controller
+	will not request a reconciliation for the resource.
+	When the expression is specified the controller will parse it and mark
+	the object as terminally failed if the expression is invalid or does not
+	return a boolean.
+	"""
+								type: "string"
+							}
 							resources: {
 								description: "A list of resources to be notified about changes."
 								items: {

modules/flux-aio/values.cue

@@ -3,26 +3,26 @@
 package main
 
 values: {
-	version: "v2.4.0"
+	version: "v2.5.0"
 	controllers: {
 		source: image: {
 			repository: "ghcr.io/fluxcd/source-controller"
-			tag:        "v1.4.1"
+			tag:        "v1.5.0"
 			digest:     ""
 		}
 		kustomize: image: {
 			repository: "ghcr.io/fluxcd/kustomize-controller"
-			tag:        "v1.4.0"
+			tag:        "v1.5.0"
 			digest:     ""
 		}
 		notification: image: {
 			repository: "ghcr.io/fluxcd/notification-controller"
-			tag:        "v1.4.0"
+			tag:        "v1.5.0"
 			digest:     ""
 		}
 		helm: image: {
 			repository: "ghcr.io/fluxcd/helm-controller"
-			tag:        "v1.1.0"
+			tag:        "v1.2.0"
 			digest:     ""
 		}
 	}