diff --git a/base/flux/gotk-components.yaml b/base/flux/gotk-components.yaml
index 550ef615eab88b8c8c7039252402c9b71fe93aca..0f286ac78ad813f7e8cfee1888e2d2e793d571d0 100644
--- a/base/flux/gotk-components.yaml
+++ b/base/flux/gotk-components.yaml
@@ -1,6 +1,6 @@
---
# This manifest was generated by flux. DO NOT EDIT.
-# Flux Version: v0.34.0
+# Flux Version: v0.35.0
# 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: v0.34.0
+ app.kubernetes.io/version: v0.35.0
pod-security.kubernetes.io/warn: restricted
pod-security.kubernetes.io/warn-version: latest
name: flux-system
@@ -17,12 +17,13 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.7.0
+ controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
labels:
+ app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: alerts.notification.toolkit.fluxcd.io
spec:
group: notification.toolkit.fluxcd.io
@@ -154,14 +155,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
@@ -240,12 +239,13 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.7.0
+ controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
labels:
+ app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: buckets.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
@@ -407,14 +407,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
@@ -571,6 +569,7 @@ spec:
type: boolean
interval:
description: Interval at which to check the Endpoint for updates.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
type: string
provider:
default: generic
@@ -603,6 +602,7 @@ spec:
timeout:
default: 60s
description: Timeout for fetch operations, defaults to 60s.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$
type: string
required:
- bucketName
@@ -660,14 +660,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
@@ -757,12 +755,13 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.7.0
+ controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
labels:
+ app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: gitrepositories.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
@@ -993,14 +992,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
@@ -1216,6 +1213,7 @@ spec:
type: array
interval:
description: Interval at which to check the GitRepository for updates.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
type: string
recurseSubmodules:
description: RecurseSubmodules enables the initialization of all submodules
@@ -1267,6 +1265,7 @@ spec:
default: 60s
description: Timeout for Git operations like cloning, defaults to
60s.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$
type: string
url:
description: URL specifies the Git repository URL, it can be an HTTP/S
@@ -1352,14 +1351,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
@@ -1419,8 +1416,8 @@ spec:
type: array
contentConfigChecksum:
description: 'ContentConfigChecksum is a checksum of all the configurations
- related to the content of the source artifact: - .spec.ignore -
- .spec.recurseSubmodules - .spec.included and the checksum of the
+ related to the content of the source artifact: - .spec.ignore -
+ .spec.recurseSubmodules - .spec.included and the checksum of the
included artifacts observed in .status.observedGeneration version
of the object. This can be used to determine if the content of the
included repository has changed. It has the format of `<algo>:<checksum>`,
@@ -1505,12 +1502,13 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.7.0
+ controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
labels:
+ app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: helmcharts.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
@@ -1697,14 +1695,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
@@ -1857,6 +1853,7 @@ spec:
interval:
description: Interval is the interval at which to check the Source
for updates.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
type: string
reconcileStrategy:
default: ChartVersion
@@ -1973,14 +1970,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
@@ -2078,12 +2073,13 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.7.0
+ controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
labels:
+ app.kubernetes.io/component: helm-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: helmreleases.helm.toolkit.fluxcd.io
spec:
group: helm.toolkit.fluxcd.io
@@ -2141,6 +2137,7 @@ spec:
interval:
description: Interval at which to check the v1beta2.Source
for updates. Defaults to 'HelmReleaseSpec.Interval'.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
type: string
reconcileStrategy:
default: ChartVersion
@@ -2308,10 +2305,12 @@ spec:
description: Timeout is the time to wait for any individual Kubernetes
operation (like Jobs for hooks) during the performance of a
Helm install action. Defaults to 'HelmReleaseSpec.Timeout'.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$
type: string
type: object
interval:
description: Interval at which to reconcile the Helm release.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
type: string
kubeConfig:
description: KubeConfig for reconciling the HelmRelease on a remote
@@ -2583,6 +2582,7 @@ spec:
description: Timeout is the time to wait for any individual Kubernetes
operation (like Jobs for hooks) during the performance of a
Helm rollback action. Defaults to 'HelmReleaseSpec.Timeout'.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$
type: string
type: object
serviceAccountName:
@@ -2624,12 +2624,14 @@ spec:
description: Timeout is the time to wait for any individual Kubernetes
operation during the performance of a Helm test action. Defaults
to 'HelmReleaseSpec.Timeout'.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$
type: string
type: object
timeout:
description: Timeout is the time to wait for any individual Kubernetes
operation (like Jobs for hooks) during the performance of a Helm
action. Defaults to '5m0s'.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$
type: string
uninstall:
description: Uninstall holds the configuration for Helm uninstall
@@ -2651,6 +2653,7 @@ spec:
description: Timeout is the time to wait for any individual Kubernetes
operation (like Jobs for hooks) during the performance of a
Helm uninstall action. Defaults to 'HelmReleaseSpec.Timeout'.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$
type: string
type: object
upgrade:
@@ -2737,6 +2740,7 @@ spec:
description: Timeout is the time to wait for any individual Kubernetes
operation (like Jobs for hooks) during the performance of a
Helm upgrade action. Defaults to 'HelmReleaseSpec.Timeout'.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$
type: string
type: object
values:
@@ -2806,14 +2810,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
@@ -2932,12 +2934,13 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.7.0
+ controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
labels:
+ app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: helmrepositories.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
@@ -3087,14 +3090,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
@@ -3234,6 +3235,7 @@ spec:
type: object
interval:
description: Interval at which to check the URL for updates.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
type: string
passCredentials:
description: PassCredentials allows the credentials from the SecretRef
@@ -3276,6 +3278,7 @@ spec:
description: Timeout is used for the index fetch operation for an
HTTPS helm repository, and for remote OCI Repository operations
like pulling for an OCI helm repository. Its default value is 60s.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$
type: string
type:
description: Type of the HelmRepository. When this field is set to "oci",
@@ -3344,14 +3347,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
@@ -3441,12 +3442,13 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.7.0
+ controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
labels:
+ app.kubernetes.io/component: kustomize-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: kustomizations.kustomize.toolkit.fluxcd.io
spec:
group: kustomize.toolkit.fluxcd.io
@@ -3882,14 +3884,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
@@ -4130,6 +4130,7 @@ spec:
type: array
interval:
description: The interval at which to reconcile the Kustomization.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
type: string
kubeConfig:
description: The KubeConfig for reconciling the Kustomization on a
@@ -4369,6 +4370,7 @@ spec:
description: The interval at which to retry a previously failed reconciliation.
When not specified, the controller uses the KustomizationSpec.Interval
value to retry failures.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
type: string
serviceAccountName:
description: The name of the Kubernetes service account to impersonate
@@ -4413,6 +4415,7 @@ spec:
timeout:
description: Timeout for validation, apply and health checking operations.
Defaults to 'Interval' duration.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$
type: string
validation:
description: 'Deprecated: Not used in v1beta2.'
@@ -4441,14 +4444,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
@@ -4566,12 +4567,13 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.7.0
+ controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
labels:
+ app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: ocirepositories.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
@@ -4619,11 +4621,11 @@ spec:
properties:
certSecretRef:
description: "CertSecretRef can be given the name of a secret containing
- either or both of \n - a PEM-encoded client certificate (`certFile`)
- and private key (`keyFile`); - a PEM-encoded CA certificate (`caFile`)
- \n and whichever are supplied, will be used for connecting to the
- \ registry. The client cert and key are useful if you are authenticating
- with a certificate; the CA cert is useful if you are using a self-signed
+ either or both of \n - a PEM-encoded client certificate (`certFile`)
+ and private key (`keyFile`); - a PEM-encoded CA certificate (`caFile`)
+ \n and whichever are supplied, will be used for connecting to the
+ registry. The client cert and key are useful if you are authenticating
+ with a certificate; the CA cert is useful if you are using a self-signed
server certificate."
properties:
name:
@@ -4644,6 +4646,7 @@ spec:
type: boolean
interval:
description: The interval at which to check for image updates.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
type: string
layerSelector:
description: LayerSelector specifies which layer should be extracted
@@ -4655,6 +4658,15 @@ spec:
which should be extracted from the OCI Artifact. The first layer
matching this type is selected.
type: string
+ operation:
+ description: Operation specifies how the selected layer should
+ be processed. By default, the layer compressed content is extracted
+ to storage. When the operation is set to 'copy', the layer compressed
+ content is persisted to storage as it is.
+ enum:
+ - extract
+ - copy
+ type: string
type: object
provider:
default: generic
@@ -4706,12 +4718,38 @@ spec:
default: 60s
description: The timeout for remote OCI Repository operations like
pulling, defaults to 60s.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$
type: string
url:
description: URL is a reference to an OCI artifact repository hosted
on a remote container registry.
pattern: ^oci://.*$
type: string
+ verify:
+ description: Verify contains the secret name containing the trusted
+ public keys used to verify the signature and specifies which provider
+ to use to check whether OCI image is authentic.
+ properties:
+ provider:
+ default: cosign
+ description: Provider specifies the technology used to sign the
+ OCI Artifact.
+ enum:
+ - cosign
+ type: string
+ secretRef:
+ description: SecretRef specifies the Kubernetes Secret containing
+ the trusted public keys.
+ properties:
+ name:
+ description: Name of the referent.
+ type: string
+ required:
+ - name
+ type: object
+ required:
+ - provider
+ type: object
required:
- interval
- url
@@ -4768,14 +4806,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
@@ -4833,6 +4869,14 @@ spec:
- type
type: object
type: array
+ contentConfigChecksum:
+ description: 'ContentConfigChecksum is a checksum of all the configurations
+ related to the content of the source artifact: - .spec.ignore -
+ .spec.layerSelector observed in .status.observedGeneration version
+ of the object. This can be used to determine if the content configuration
+ has changed and the artifact needs to be rebuilt. It has the format
+ of `<algo>:<checksum>`, for example: `sha256:<checksum>`.'
+ type: string
lastHandledReconcileAt:
description: LastHandledReconcileAt holds the value of the most recent
reconcile request value, so a change of the annotation value can
@@ -4863,12 +4907,13 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.7.0
+ controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
labels:
+ app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: providers.notification.toolkit.fluxcd.io
spec:
group: notification.toolkit.fluxcd.io
@@ -4946,6 +4991,7 @@ spec:
type: boolean
timeout:
description: Timeout for sending alerts to the provider.
+ pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$
type: string
type:
description: Type of provider
@@ -4987,14 +5033,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
@@ -5073,12 +5117,13 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.7.0
+ controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
labels:
+ app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: receivers.notification.toolkit.fluxcd.io
spec:
group: notification.toolkit.fluxcd.io
@@ -5215,14 +5260,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
- \n \ttype FooStatus struct{ \t // Represents the observations
- of a foo's current state. \t // Known .status.conditions.type
- are: \"Available\", \"Progressing\", and \"Degraded\" \t //
- +patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
- \t // +listMapKey=type \t Conditions []metav1.Condition
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
+ \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
+ // +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
- protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
- \t}"
+ protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
@@ -5304,9 +5347,10 @@ apiVersion: v1
kind: ServiceAccount
metadata:
labels:
+ app.kubernetes.io/component: helm-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: helm-controller
namespace: flux-system
---
@@ -5314,9 +5358,10 @@ apiVersion: v1
kind: ServiceAccount
metadata:
labels:
+ app.kubernetes.io/component: kustomize-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: kustomize-controller
namespace: flux-system
---
@@ -5324,9 +5369,10 @@ apiVersion: v1
kind: ServiceAccount
metadata:
labels:
+ app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: notification-controller
namespace: flux-system
---
@@ -5334,9 +5380,10 @@ apiVersion: v1
kind: ServiceAccount
metadata:
labels:
+ app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: source-controller
namespace: flux-system
---
@@ -5346,7 +5393,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: crd-controller-flux-system
rules:
- apiGroups:
@@ -5436,7 +5483,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: cluster-reconciler-flux-system
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -5456,7 +5503,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: crd-controller-flux-system
roleRef:
apiGroup: rbac.authorization.k8s.io
@@ -5486,9 +5533,10 @@ apiVersion: v1
kind: Service
metadata:
labels:
+ app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
control-plane: controller
name: notification-controller
namespace: flux-system
@@ -5506,9 +5554,10 @@ apiVersion: v1
kind: Service
metadata:
labels:
+ app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
control-plane: controller
name: source-controller
namespace: flux-system
@@ -5526,9 +5575,10 @@ apiVersion: v1
kind: Service
metadata:
labels:
+ app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
control-plane: controller
name: webhook-receiver
namespace: flux-system
@@ -5546,9 +5596,10 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
+ app.kubernetes.io/component: helm-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
control-plane: controller
name: helm-controller
namespace: flux-system
@@ -5577,7 +5628,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: ghcr.io/fluxcd/helm-controller:v0.24.0
+ image: ghcr.io/fluxcd/helm-controller:v0.25.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
@@ -5628,9 +5679,10 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
+ app.kubernetes.io/component: kustomize-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
control-plane: controller
name: kustomize-controller
namespace: flux-system
@@ -5659,7 +5711,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: ghcr.io/fluxcd/kustomize-controller:v0.28.0
+ image: ghcr.io/fluxcd/kustomize-controller:v0.29.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
@@ -5710,9 +5762,10 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
+ app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
control-plane: controller
name: notification-controller
namespace: flux-system
@@ -5740,7 +5793,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: ghcr.io/fluxcd/notification-controller:v0.26.0
+ image: ghcr.io/fluxcd/notification-controller:v0.27.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
@@ -5797,9 +5850,10 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
+ app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
control-plane: controller
name: source-controller
namespace: flux-system
@@ -5832,7 +5886,9 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- image: ghcr.io/fluxcd/source-controller:v0.29.0
+ - name: TUF_ROOT
+ value: /tmp/.sigstore
+ image: ghcr.io/fluxcd/source-controller:v0.30.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
@@ -5892,7 +5948,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: allow-egress
namespace: flux-system
spec:
@@ -5912,7 +5968,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: allow-scraping
namespace: flux-system
spec:
@@ -5932,7 +5988,7 @@ metadata:
labels:
app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux
- app.kubernetes.io/version: v0.34.0
+ app.kubernetes.io/version: v0.35.0
name: allow-webhooks
namespace: flux-system
spec:
diff --git a/base/flux/kustomization.yaml b/base/flux/kustomization.yaml
index 5c6fab4a476516a2bda2849c5f380e5e2cb89f26..bd06abe55ec743e3986431db97116d7ced1eb0a8 100644
--- a/base/flux/kustomization.yaml
+++ b/base/flux/kustomization.yaml
@@ -6,16 +6,16 @@ resources:
images:
- name: ghcr.io/fluxcd/helm-controller
newName: registry1.dso.mil/ironbank/fluxcd/helm-controller
- newTag: v0.24.0
+ newTag: v0.25.0
- name: ghcr.io/fluxcd/kustomize-controller
newName: registry1.dso.mil/ironbank/fluxcd/kustomize-controller
- newTag: v0.28.0
+ newTag: v0.29.0
- name: ghcr.io/fluxcd/notification-controller
newName: registry1.dso.mil/ironbank/fluxcd/notification-controller
- newTag: v0.26.0
+ newTag: v0.27.0
- name: ghcr.io/fluxcd/source-controller
newName: registry1.dso.mil/ironbank/fluxcd/source-controller
- newTag: v0.29.0
+ newTag: v0.30.0
patches:
- target:
diff --git a/chart/dashboards/flux/Kptfile b/chart/dashboards/flux/Kptfile
index d227b74e2430d79c80fd93175a516a31a1329997..fb19e3058a99e75f5ba92b84dd60822df7e54d18 100644
--- a/chart/dashboards/flux/Kptfile
+++ b/chart/dashboards/flux/Kptfile
@@ -5,7 +5,7 @@ metadata:
upstream:
type: git
git:
- commit: 90f0d81532f6ea76c30974267956c7eaee5c1dea
+ commit: 1bf63a94c22d1b9b7ccf92f66a1a34a74bd72fca
repo: https://github.com/fluxcd/flux2
directory: /manifests/monitoring/monitoring-config/dashboards
- ref: v0.34.0
+ ref: v0.35.0
diff --git a/chart/dashboards/flux/control-plane.json b/chart/dashboards/flux/control-plane.json
index 3f03d300da614aa7768294d5bed575a941cae3a0..40b1a1ad72bc3bebc2f6e9c1f7b41ba3a6f6ac7a 100644
--- a/chart/dashboards/flux/control-plane.json
+++ b/chart/dashboards/flux/control-plane.json
@@ -548,7 +548,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "rate(go_memstats_alloc_bytes_total{namespace=\"$namespace\",pod=~\".*-controller-.*\"}[1m])",
+ "expr": "sum(container_memory_working_set_bytes{namespace=\"$namespace\",container!=\"POD\",container!=\"\",pod=~\".*-controller-.*\"}) by (pod)",
"hide": false,
"interval": "",
"legendFormat": "{{pod}}",