git.delta.rocks / jrsonnet / refs/commits / 98314cfacdde

difftreelog

refactor drop nix config compat

kwyoypvnYaroslav Bolyukin2026-01-22parent: #f31248f.patch.diff
in: trunk

2 files changed

modifiedcrates/fleet-base/src/fleetdata.rsdiffbeforeafterboth
73 #[serde(default = "generate_gc_prefix")]73 #[serde(default = "generate_gc_prefix")]
74 pub gc_root_prefix: String,74 pub gc_root_prefix: String,
7575
76 #[serde(default)]76 #[serde(default, skip_serializing_if = "Vec::is_empty")]
77 pub manager_keys: Vec<ManagerKey>,77 pub manager_keys: Vec<ManagerKey>,
7878
79 #[serde(default)]79 #[serde(default)]
149#[must_use]149#[must_use]
150pub struct FleetSecretDistribution {150pub struct FleetSecretDistribution {
151 #[serde(default)]151 #[serde(default)]
152 #[serde(skip_serializing_if = "Option::is_none")]
153 pub managed: Option<bool>,152 pub owners: BTreeSet<String>,
154 #[serde(default)]153 #[serde(flatten)]
155 pub owners: BTreeSet<String>,154 pub secret: FleetSecretData,
155
156 #[serde(flatten)]156 #[serde(default, skip_serializing, alias="managed")]
157 pub secret: FleetSecretData,157 pub _deprecated_managed: bool,
158}158}
159159
160#[derive(Clone)]160#[derive(Clone)]
244 } = self;244 } = self;
245 let idx = distributions.0.len();245 let idx = distributions.0.len();
246 distributions.0.push(FleetSecretDistribution {246 distributions.0.push(FleetSecretDistribution {
247 managed: None,
248 owners: BTreeSet::from_iter([owner.clone()]),247 owners: BTreeSet::from_iter([owner.clone()]),
249 secret,248 secret,
249
250 _deprecated_managed: true,
250 });251 });
251 OccupiedDistEntry {252 OccupiedDistEntry {
252 distributions,253 distributions,
modifiedlib/flakePart.nixdiffbeforeafterboth
8 ...8 ...
9}:9}:
10let10let
11 inherit (lib.options) mkOption mkEnableOption;11 inherit (lib.options) mkOption;
12 inherit (lib.attrsets) mapAttrs;12 inherit (lib.attrsets) mapAttrs;
13 inherit (lib.types)13 inherit (lib.types)
14 lazyAttrsOf14 lazyAttrsOf
15 deferredModule15 deferredModule
16 unspecified16 unspecified
17 str
18 ;17 ;
19 inherit (lib.strings) isPath;18 inherit (lib.strings) isPath;
20 inherit (lib.modules) mkIf mkOptionDefault;19 inherit (lib.modules) mkOptionDefault;
21in20in
22{21{
23 options.fleetModules = mkOption {22 options.fleetModules = mkOption {
24 type = lazyAttrsOf unspecified;23 type = lazyAttrsOf unspecified;
25 default = { };24 default = { };
26 };25 };
27 options.fleetNixosConfigurationsCompat = {
28 enable = mkEnableOption "Create nixosConfiguration output based on fleetConfiguration";
29 configuration = mkOption {
30 type = str;
31 description = "Which fleetConfiguration to use for compatibility";
32 default = "default";
33 };
34 data = mkOption {
35 type = unspecified;
36 description = "Imported fleet.nix file for fleet";
37 };
38 };
39 options.fleetConfigurations = mkOption {26 options.fleetConfigurations = mkOption {
40 type = lazyAttrsOf deferredModule;27 type = lazyAttrsOf deferredModule;
41 apply =28 apply =
103 config = {90 config = {
104 _module.args.fleetLib = import ../lib { inherit lib; };91 _module.args.fleetLib = import ../lib { inherit lib; };
105 flake.fleetConfigurations = config.fleetConfigurations;92 flake.fleetConfigurations = config.fleetConfigurations;
106 flake.nixosConfigurations =
107 let
108 cfg = config.fleetNixosConfigurationsCompat;
109 in
110 mkIf cfg.enable (
111 mapAttrs (name: host: host.nixos)
112 (config.fleetConfigurations.${cfg.configuration} cfg.data).config.hosts
113 );
114 flake.fleetModules = config.fleetModules;93 flake.fleetModules = config.fleetModules;
115 };94 };
11695