Skip to content

Commit 2da2387

Browse files
weave-gitops-botweave-gitops-bot
weave-gitops-bot
and
weave-gitops-bot
authored
chore: Upgrade Flux to 2.5.0 (#4767)
Signed-off-by: weave-gitops-bot <[email protected]> Co-authored-by: weave-gitops-bot <[email protected]>
1 parent f8ddf47 commit 2da2387

File tree

2 files changed

+87
-3
lines changed

2 files changed

+87
-3
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ BUILD_TIME?=$(shell date +'%Y-%m-%d_%T')
77
BRANCH?=$(shell which git > /dev/null && git rev-parse --abbrev-ref HEAD)
88
GIT_COMMIT?=$(shell which git > /dev/null && git log -n1 --pretty='%h')
99
VERSION?=$(shell which git > /dev/null && git describe --always --match "v*")
10-
FLUX_VERSION=2.4.0
10+
FLUX_VERSION=2.5.0
1111
CHART_VERSION=$(shell which yq > /dev/null && yq e '.version' charts/gitops-server/Chart.yaml)
1212
TIER=oss
1313

‎tools/testcrds/flux.yaml

Lines changed: 86 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,9 @@ spec:
551551
- name
552552
type: object
553553
summary:
554-
description: Summary holds a short description of the impact and affected cluster.
554+
description: |-
555+
Summary holds a short description of the impact and affected cluster.
556+
Deprecated: Use EventMetadata instead.
555557
maxLength: 255
556558
type: string
557559
suspend:
@@ -1640,11 +1642,12 @@ spec:
16401642
type: string
16411643
provider:
16421644
description: |-
1643-
Provider used for authentication, can be 'azure', 'generic'.
1645+
Provider used for authentication, can be 'azure', 'github', 'generic'.
16441646
When not specified, defaults to 'generic'.
16451647
enum:
16461648
- generic
16471649
- azure
1650+
- github
16481651
type: string
16491652
proxySecretRef:
16501653
description: |-
@@ -4093,6 +4096,11 @@ spec:
40934096
DisableSchemaValidation prevents the Helm install action from validating
40944097
the values against the JSON Schema.
40954098
type: boolean
4099+
disableTakeOwnership:
4100+
description: |-
4101+
DisableTakeOwnership disables taking ownership of existing resources
4102+
during the Helm install action. Defaults to false.
4103+
type: boolean
40964104
disableWait:
40974105
description: |-
40984106
DisableWait disables the waiting for resources to be ready after a Helm
@@ -4489,6 +4497,11 @@ spec:
44894497
DisableSchemaValidation prevents the Helm upgrade action from validating
44904498
the values against the JSON Schema.
44914499
type: boolean
4500+
disableTakeOwnership:
4501+
description: |-
4502+
DisableTakeOwnership disables taking ownership of existing resources
4503+
during the Helm upgrade action. Defaults to false.
4504+
type: boolean
44924505
disableWait:
44934506
description: |-
44944507
DisableWait disables the waiting for resources to be ready after a Helm
@@ -9461,6 +9474,13 @@ spec:
94619474
MessageTemplate provides a template for the commit message,
94629475
into which will be interpolated the details of the change made.
94639476
type: string
9477+
messageTemplateValues:
9478+
additionalProperties:
9479+
type: string
9480+
description: |-
9481+
MessageTemplateValues provides additional values to be available to the
9482+
templating rendering.
9483+
type: object
94649484
signingKey:
94659485
description: SigningKey provides the option to sign commits with a GPG key
94669486
properties:
@@ -9839,6 +9859,17 @@ spec:
98399859
required:
98409860
- provider
98419861
type: object
9862+
deletionPolicy:
9863+
description: |-
9864+
DeletionPolicy can be used to control garbage collection when this
9865+
Kustomization is deleted. Valid values are ('MirrorPrune', 'Delete',
9866+
'Orphan'). 'MirrorPrune' mirrors the Prune field (orphan if false,
9867+
delete if true). Defaults to 'MirrorPrune'.
9868+
enum:
9869+
- MirrorPrune
9870+
- Delete
9871+
- Orphan
9872+
type: string
98429873
dependsOn:
98439874
description: |-
98449875
DependsOn may contain a meta.NamespacedObjectReference slice
@@ -9865,6 +9896,41 @@ spec:
98659896
Force instructs the controller to recreate resources
98669897
when patching fails due to an immutable field change.
98679898
type: boolean
9899+
healthCheckExprs:
9900+
description: |-
9901+
HealthCheckExprs is a list of healthcheck expressions for evaluating the
9902+
health of custom resources using Common Expression Language (CEL).
9903+
The expressions are evaluated only when Wait or HealthChecks are specified.
9904+
items:
9905+
description: CustomHealthCheck defines the health check for custom resources.
9906+
properties:
9907+
apiVersion:
9908+
description: APIVersion of the custom resource under evaluation.
9909+
type: string
9910+
current:
9911+
description: |-
9912+
Current is the CEL expression that determines if the status
9913+
of the custom resource has reached the desired state.
9914+
type: string
9915+
failed:
9916+
description: |-
9917+
Failed is the CEL expression that determines if the status
9918+
of the custom resource has failed to reach the desired state.
9919+
type: string
9920+
inProgress:
9921+
description: |-
9922+
InProgress is the CEL expression that determines if the status
9923+
of the custom resource has not yet reached the desired state.
9924+
type: string
9925+
kind:
9926+
description: Kind of the custom resource under evaluation.
9927+
type: string
9928+
required:
9929+
- apiVersion
9930+
- current
9931+
- kind
9932+
type: object
9933+
type: array
98689934
healthChecks:
98699935
description: A list of resources to be included in the health assessment.
98709936
items:
@@ -10237,6 +10303,14 @@ spec:
1023710303
required:
1023810304
- entries
1023910305
type: object
10306+
lastAppliedOriginRevision:
10307+
description: |-
10308+
The last successfully applied origin revision.
10309+
Equals the origin revision of the applied Artifact from the referenced Source.
10310+
Usually present on the Metadata of the applied Artifact and depends on the
10311+
Source type, e.g. for OCI it's the value associated with the key
10312+
"org.opencontainers.image.revision".
10313+
type: string
1024010314
lastAppliedRevision:
1024110315
description: |-
1024210316
The last successfully applied revision.
@@ -12426,6 +12500,16 @@ spec:
1242612500
description: Interval at which to reconcile the Receiver with its Secret references.
1242712501
pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
1242812502
type: string
12503+
resourceFilter:
12504+
description: |-
12505+
ResourceFilter is a CEL expression expected to return a boolean that is
12506+
evaluated for each resource referenced in the Resources field when a
12507+
webhook is received. If the expression returns false then the controller
12508+
will not request a reconciliation for the resource.
12509+
When the expression is specified the controller will parse it and mark
12510+
the object as terminally failed if the expression is invalid or does not
12511+
return a boolean.
12512+
type: string
1242912513
resources:
1243012514
description: A list of resources to be notified about changes.
1243112515
items:

0 commit comments

Comments
 (0)