From 09947fede41fbb91d342bd67614abcef11828132 Mon Sep 17 00:00:00 2001
From: Pinghao Wu <xdavidwuph@gmail.com>
Date: Mon, 3 Mar 2025 11:17:25 +0800
Subject: [PATCH] flux: upgrade to 2.5.1
---
.../egloga/flux-system/gotk-components.yaml | 155 +++++++++++++-----
1 file changed, 116 insertions(+), 39 deletions(-)
diff --git a/clusters/egloga/flux-system/gotk-components.yaml b/clusters/egloga/flux-system/gotk-components.yaml
index 2128f7c..a399eef 100644
--- a/clusters/egloga/flux-system/gotk-components.yaml
+++ b/clusters/egloga/flux-system/gotk-components.yaml
@@ -1,6 +1,6 @@
---
# This manifest was generated by flux. DO NOT EDIT.
-# Flux Version: v2.4.0
+# Flux Version: v2.5.1
# Components: source-controller,kustomize-controller,helm-controller,notification-controller
apiVersion: v1
kind: Namespace
@@ -8,7 +8,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
pod-security.kubernetes.io/warn: restricted
pod-security.kubernetes.io/warn-version: latest
name: flux-system
@@ -19,7 +19,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: allow-egress
namespace: flux-system
spec:
@@ -39,7 +39,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: allow-scraping
namespace: flux-system
spec:
@@ -59,7 +59,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: allow-webhooks
namespace: flux-system
spec:
@@ -78,7 +78,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: critical-pods-flux-system
namespace: flux-system
spec:
@@ -98,7 +98,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: crd-controller-flux-system
rules:
- apiGroups:
@@ -192,7 +192,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
rbac.authorization.k8s.io/aggregate-to-admin: "true"
rbac.authorization.k8s.io/aggregate-to-edit: "true"
name: flux-edit-flux-system
@@ -218,7 +218,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
rbac.authorization.k8s.io/aggregate-to-admin: "true"
rbac.authorization.k8s.io/aggregate-to-edit: "true"
rbac.authorization.k8s.io/aggregate-to-view: "true"
@@ -243,7 +243,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: cluster-reconciler-flux-system
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -263,7 +263,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: crd-controller-flux-system
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -298,7 +298,7 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: buckets.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
@@ -1287,7 +1287,7 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: gitrepositories.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
@@ -1389,11 +1389,12 @@ spec:
type: string
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
proxySecretRef:
description: |-
@@ -2549,7 +2550,7 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: helmcharts.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
@@ -3530,7 +3531,7 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: helmrepositories.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
@@ -4379,7 +4380,7 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: ocirepositories.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
@@ -4809,7 +4810,7 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: source-controller
namespace: flux-system
---
@@ -4820,7 +4821,7 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
control-plane: controller
name: source-controller
namespace: flux-system
@@ -4841,7 +4842,7 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
control-plane: controller
name: source-controller
namespace: flux-system
@@ -4886,7 +4887,7 @@ spec:
resourceFieldRef:
containerName: manager
resource: limits.memory
- image: ghcr.io/fluxcd/source-controller:v1.4.1
+ image: ghcr.io/fluxcd/source-controller:v1.5.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
@@ -4948,7 +4949,7 @@ metadata:
app.kubernetes.io/component: kustomize-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: kustomizations.kustomize.toolkit.fluxcd.io
spec:
group: kustomize.toolkit.fluxcd.io
@@ -5043,6 +5044,17 @@ spec:
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
@@ -5070,6 +5082,42 @@ spec:
Force instructs the controller to recreate resources
when patching fails due to an immutable field change.
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:
@@ -5454,6 +5502,14 @@ spec:
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.
@@ -6668,7 +6724,7 @@ metadata:
app.kubernetes.io/component: kustomize-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: kustomize-controller
namespace: flux-system
---
@@ -6679,7 +6735,7 @@ metadata:
app.kubernetes.io/component: kustomize-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
control-plane: controller
name: kustomize-controller
namespace: flux-system
@@ -6718,7 +6774,7 @@ spec:
resourceFieldRef:
containerName: manager
resource: limits.memory
- image: ghcr.io/fluxcd/kustomize-controller:v1.4.0
+ image: ghcr.io/fluxcd/kustomize-controller:v1.5.1
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
@@ -6773,7 +6829,7 @@ metadata:
app.kubernetes.io/component: helm-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: helmreleases.helm.toolkit.fluxcd.io
spec:
group: helm.toolkit.fluxcd.io
@@ -7140,6 +7196,11 @@ spec:
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
disableWait:
description: |-
DisableWait disables the waiting for resources to be ready after a Helm
@@ -7554,6 +7615,11 @@ spec:
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
disableWait:
description: |-
DisableWait disables the waiting for resources to be ready after a Helm
@@ -10458,7 +10524,7 @@ metadata:
app.kubernetes.io/component: helm-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: helm-controller
namespace: flux-system
---
@@ -10469,7 +10535,7 @@ metadata:
app.kubernetes.io/component: helm-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
control-plane: controller
name: helm-controller
namespace: flux-system
@@ -10508,7 +10574,7 @@ spec:
resourceFieldRef:
containerName: manager
resource: limits.memory
- image: ghcr.io/fluxcd/helm-controller:v1.1.0
+ image: ghcr.io/fluxcd/helm-controller:v1.2.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
@@ -10563,7 +10629,7 @@ metadata:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: alerts.notification.toolkit.fluxcd.io
spec:
group: notification.toolkit.fluxcd.io
@@ -11117,8 +11183,9 @@ spec:
- name
type: object
summary:
- description: Summary holds a short description of the impact and affected
- cluster.
+ description: |-
+ Summary holds a short description of the impact and affected cluster.
+ Deprecated: Use EventMetadata instead.
maxLength: 255
type: string
suspend:
@@ -11144,7 +11211,7 @@ metadata:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: providers.notification.toolkit.fluxcd.io
spec:
group: notification.toolkit.fluxcd.io
@@ -11684,7 +11751,7 @@ metadata:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: receivers.notification.toolkit.fluxcd.io
spec:
group: notification.toolkit.fluxcd.io
@@ -11743,6 +11810,16 @@ spec:
Secret references.
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:
@@ -12356,7 +12433,7 @@ metadata:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
name: notification-controller
namespace: flux-system
---
@@ -12367,7 +12444,7 @@ metadata:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
control-plane: controller
name: notification-controller
namespace: flux-system
@@ -12388,7 +12465,7 @@ metadata:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
control-plane: controller
name: webhook-receiver
namespace: flux-system
@@ -12409,7 +12486,7 @@ metadata:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v2.4.0
+ app.kubernetes.io/version: v2.5.1
control-plane: controller
name: notification-controller
namespace: flux-system
@@ -12447,7 +12524,7 @@ spec:
resourceFieldRef:
containerName: manager
resource: limits.memory
- image: ghcr.io/fluxcd/notification-controller:v1.4.0
+ image: ghcr.io/fluxcd/notification-controller:v1.5.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
--
2.45.2