Skip to content

Commit 5c7332e

Browse files
authored
bump kopium, cargo audit bump (#152)
Signed-off-by: Daniel Guns <danbguns@gmail.com>
1 parent eea9491 commit 5c7332e

19 files changed

Lines changed: 187 additions & 122 deletions

Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crds/flux-operator-resourcesets.crds.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,15 @@ spec:
110110
input provider objects are used. Defaults to flattening all inputs
111111
from all providers into a single list of input sets.
112112
properties:
113+
includeEmptyProviders:
114+
description: |-
115+
IncludeEmptyProviders controls how input providers that export no
116+
inputs are treated. Only applies when Name is Permute. When true, if
117+
any provider has zero inputs the resulting permutation set is empty
118+
(mathematically correct Cartesian product behavior). When false or
119+
unset (default), providers with zero inputs are silently skipped and
120+
the remaining providers still permute among themselves.
121+
type: boolean
113122
name:
114123
description: |-
115124
Name defines how the inputs are combined when multiple
@@ -132,6 +141,9 @@ spec:
132141
required:
133142
- name
134143
type: object
144+
x-kubernetes-validations:
145+
- message: includeEmptyProviders only applies when name is Permute
146+
rule: '!has(self.includeEmptyProviders) || self.name == ''Permute'''
135147
inputs:
136148
description: Inputs contains the list of ResourceSet inputs.
137149
items:
@@ -310,6 +322,16 @@ spec:
310322
- type
311323
type: object
312324
type: array
325+
externalChecksumRefs:
326+
description: |-
327+
ExternalChecksumRefs lists the ConfigMap and Secret references
328+
discovered in checksumFrom annotations on the last reconciliation
329+
that point to objects not rendered by this ResourceSet. Each entry
330+
has the form "Kind/namespace/name". It is used to trigger a
331+
reconciliation when one of the referenced objects changes.
332+
items:
333+
type: string
334+
type: array
313335
history:
314336
description: |-
315337
History contains the reconciliation history of the ResourceSet

crds/notification-controller.crds.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,11 @@ spec:
925925
secretRef:
926926
description: |-
927927
SecretRef specifies the Secret containing the token used
928-
to validate the payload authenticity.
928+
to validate the payload authenticity. The Secret must contain a 'token'
929+
key. For GCR receivers, the Secret must also contain an 'email' key
930+
with the IAM service account email configured on the Pub/Sub push
931+
subscription, and may optionally contain an 'audience' key with the
932+
expected OIDC token audience.
929933
properties:
930934
name:
931935
description: Name of the referent.

manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"generated_at": "2026-03-18T21:17:45Z",
2+
"generated_at": "2026-04-19T14:01:37Z",
33
"flux_versions": {
4-
"source-controller": "v1.8.1",
5-
"kustomize-controller": "v1.8.2",
4+
"source-controller": "v1.8.2",
5+
"kustomize-controller": "v1.8.3",
66
"helm-controller": "v1.5.3",
7-
"notification-controller": "v1.8.2",
7+
"notification-controller": "v1.8.3",
88
"image-reflector-controller": "v1.1.1",
99
"image-automation-controller": "v1.1.1",
1010
"source-watcher": "v2.1.1"

src/kube/api.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::watcher::WatchableResource;
77
use crate::watcher::{
88
Alert, ArtifactGenerator, Bucket, ExternalArtifact, FluxInstance, FluxReport, GitRepository,
99
HelmChart, HelmRelease, HelmRepository, ImagePolicy, ImageRepository, ImageUpdateAutomation,
10-
Kustomization, OCIRepository, Provider, Receiver, ResourceSet, ResourceSetInputProvider,
10+
Kustomization, OciRepository, Provider, Receiver, ResourceSet, ResourceSetInputProvider,
1111
};
1212

1313
/// Get GroupVersionKind for a resource type
@@ -19,9 +19,9 @@ pub fn get_gvk_for_resource_type(resource_type: &str) -> Result<(String, String,
1919
GitRepository::plural(),
2020
),
2121
Some(FluxResourceKind::OCIRepository) => (
22-
OCIRepository::api_group(),
23-
OCIRepository::api_version(),
24-
OCIRepository::plural(),
22+
OciRepository::api_group(),
23+
OciRepository::api_version(),
24+
OciRepository::plural(),
2525
),
2626
Some(FluxResourceKind::HelmRepository) => (
2727
HelmRepository::api_group(),

src/models/_generated/flux_operator_fluxinstances.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#![allow(clippy::all)]
55

66
// WARNING: generated by kopium - manual changes will be overwritten
7-
// kopium command: kopium --filename /tmp/tmp.2Fvl7XedTH/doc1.yaml --derive Default --derive PartialEq --docs --smart-derive-elision
8-
// kopium version: 0.22.5
7+
// kopium command: kopium --filename /var/folders/1q/psj8yk_n0xl8hzv7rzrzcv8w0000gn/T/tmp.mEFdcGHu5e/doc1.yaml --derive Default --derive PartialEq --docs --smart-derive-elision
8+
// kopium version: 0.23.0
99

1010
#[allow(unused_imports)]
1111
mod prelude {
@@ -14,6 +14,7 @@ mod prelude {
1414
pub use serde::{Deserialize, Serialize};
1515
pub use std::collections::BTreeMap;
1616
}
17+
1718
use self::prelude::*;
1819

1920
/// FluxInstanceSpec defines the desired state of FluxInstance

src/models/_generated/flux_operator_fluxreports.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#![allow(clippy::all)]
55

66
// WARNING: generated by kopium - manual changes will be overwritten
7-
// kopium command: kopium --filename /tmp/tmp.m1lEvLtQNS/doc1.yaml --derive Default --derive PartialEq --docs --smart-derive-elision
8-
// kopium version: 0.22.5
7+
// kopium command: kopium --filename /var/folders/1q/psj8yk_n0xl8hzv7rzrzcv8w0000gn/T/tmp.qvZB6DG72D/doc1.yaml --derive Default --derive PartialEq --docs --smart-derive-elision
8+
// kopium version: 0.23.0
99

1010
#[allow(unused_imports)]
1111
mod prelude {
@@ -14,6 +14,7 @@ mod prelude {
1414
pub use serde::{Deserialize, Serialize};
1515
pub use std::collections::BTreeMap;
1616
}
17+
1718
use self::prelude::*;
1819

1920
/// FluxReportSpec defines the observed state of a Flux installation.

src/models/_generated/flux_operator_resourcesetinputproviders.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#![allow(clippy::all)]
55

66
// WARNING: generated by kopium - manual changes will be overwritten
7-
// kopium command: kopium --filename /tmp/tmp.PBnYA3D1Aw/doc1.yaml --derive Default --derive PartialEq --docs --smart-derive-elision
8-
// kopium version: 0.22.5
7+
// kopium command: kopium --filename /var/folders/1q/psj8yk_n0xl8hzv7rzrzcv8w0000gn/T/tmp.jRRXv0oQTR/doc1.yaml --derive Default --derive PartialEq --docs --smart-derive-elision
8+
// kopium version: 0.23.0
99

1010
#[allow(unused_imports)]
1111
mod prelude {
@@ -14,6 +14,7 @@ mod prelude {
1414
pub use serde::{Deserialize, Serialize};
1515
pub use std::collections::BTreeMap;
1616
}
17+
1718
use self::prelude::*;
1819

1920
/// ResourceSetInputProviderSpec defines the desired state of ResourceSetInputProvider

src/models/_generated/flux_operator_resourcesets.rs

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#![allow(clippy::all)]
55

66
// WARNING: generated by kopium - manual changes will be overwritten
7-
// kopium command: kopium --filename /tmp/tmp.QXkPWXMGqT/doc1.yaml --derive Default --derive PartialEq --docs --smart-derive-elision
8-
// kopium version: 0.22.5
7+
// kopium command: kopium --filename /var/folders/1q/psj8yk_n0xl8hzv7rzrzcv8w0000gn/T/tmp.kUIatysCxH/doc1.yaml --derive Default --derive PartialEq --docs --smart-derive-elision
8+
// kopium version: 0.23.0
99

1010
#[allow(unused_imports)]
1111
mod prelude {
@@ -14,6 +14,7 @@ mod prelude {
1414
pub use serde::{Deserialize, Serialize};
1515
pub use std::collections::BTreeMap;
1616
}
17+
1718
use self::prelude::*;
1819

1920
/// ResourceSetSpec defines the desired state of ResourceSet
@@ -133,6 +134,18 @@ pub struct ResourceSetDependsOn {
133134
/// from all providers into a single list of input sets.
134135
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
135136
pub struct ResourceSetInputStrategy {
137+
/// IncludeEmptyProviders controls how input providers that export no
138+
/// inputs are treated. Only applies when Name is Permute. When true, if
139+
/// any provider has zero inputs the resulting permutation set is empty
140+
/// (mathematically correct Cartesian product behavior). When false or
141+
/// unset (default), providers with zero inputs are silently skipped and
142+
/// the remaining providers still permute among themselves.
143+
#[serde(
144+
default,
145+
skip_serializing_if = "Option::is_none",
146+
rename = "includeEmptyProviders"
147+
)]
148+
pub include_empty_providers: Option<bool>,
136149
/// Name defines how the inputs are combined when multiple
137150
/// input provider objects are used. Supported values are:
138151
/// - Flatten: all inputs sets from all input provider objects are
@@ -243,6 +256,17 @@ pub struct ResourceSetStatus {
243256
/// Conditions contains the readiness conditions of the object.
244257
#[serde(default, skip_serializing_if = "Option::is_none")]
245258
pub conditions: Option<Vec<Condition>>,
259+
/// ExternalChecksumRefs lists the ConfigMap and Secret references
260+
/// discovered in checksumFrom annotations on the last reconciliation
261+
/// that point to objects not rendered by this ResourceSet. Each entry
262+
/// has the form "Kind/namespace/name". It is used to trigger a
263+
/// reconciliation when one of the referenced objects changes.
264+
#[serde(
265+
default,
266+
skip_serializing_if = "Option::is_none",
267+
rename = "externalChecksumRefs"
268+
)]
269+
pub external_checksum_refs: Option<Vec<String>>,
246270
/// History contains the reconciliation history of the ResourceSet
247271
/// as a list of snapshots ordered by the last reconciled time.
248272
#[serde(default, skip_serializing_if = "Option::is_none")]

src/models/_generated/helm_controller.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#![allow(clippy::all)]
55

66
// WARNING: generated by kopium - manual changes will be overwritten
7-
// kopium command: kopium --filename /tmp/tmp.39BHcZMzvV/doc1.yaml --derive Default --derive PartialEq --docs --smart-derive-elision
8-
// kopium version: 0.22.5
7+
// kopium command: kopium --filename /var/folders/1q/psj8yk_n0xl8hzv7rzrzcv8w0000gn/T/tmp.pGnT07Scut/doc1.yaml --derive Default --derive PartialEq --docs --smart-derive-elision
8+
// kopium version: 0.23.0
99

1010
#[allow(unused_imports)]
1111
mod prelude {
@@ -14,6 +14,7 @@ mod prelude {
1414
pub use serde::{Deserialize, Serialize};
1515
pub use std::collections::BTreeMap;
1616
}
17+
1718
use self::prelude::*;
1819

1920
/// HelmReleaseSpec defines the desired state of a Helm release.

0 commit comments

Comments
 (0)