Unverified Commit 8a508485 authored by Sarah Brofeldt's avatar Sarah Brofeldt Committed by GitHub
Browse files

nixos/kubernetes: add extraConfig to kubelet config (#338526)

parents ca5bcf3d 5a03aa5a
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -454,6 +454,8 @@

- Kanidm previously had an incorrect systemd service type, causing dependent units with an `after` and `requires` directive to start before `kanidm*` finished startup. The module has now been updated in line with upstream recommendations.

- The kubelet configuration file can now be amended with arbitrary additional content using the `services.kubernetes.kubelet.extraConfig` option.

- To facilitate dependency injection, the `imgui` package now builds a static archive using vcpkg' CMake rules.
  The derivation now installs "impl" headers selectively instead of by a wildcard.
  Use `imgui.src` if you just want to access the unpacked sources.
+7 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ let
    // lib.optionalAttrs (cfg.clusterDomain != "")  { clusterDomain = cfg.clusterDomain; }
    // lib.optionalAttrs (cfg.clusterDns != [])     { clusterDNS = cfg.clusterDns; }
    // lib.optionalAttrs (cfg.featureGates != {})   { featureGates = cfg.featureGates; }
    // lib.optionalAttrs (cfg.extraConfig != {})    cfg.extraConfig
  ));

  manifestPath = "kubernetes/manifests";
@@ -184,6 +185,12 @@ in
      type = separatedString " ";
    };

    extraConfig = mkOption {
      description = "Kubernetes kubelet extra configuration file entries.";
      default = {};
      type = attrsOf attrs;
    };

    featureGates = mkOption {
      description = "Attribute set of feature gate";
      default = top.featureGates;