Skip to content

Commit 25b2bc1

Browse files
committed
Enable cache and builders by default
Makes kubenixApply (release manifest) and kubenixCI1 practially equivalent except for the testing pods
1 parent aaf2891 commit 25b2bc1

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

default.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ rec {
3030
kubenixCI1 = kubenixInstance {
3131
module.imports = [
3232
./kubenix/ci
33-
{
34-
nix-csi.cache.enable = true;
35-
nix-csi.builders.enable = true;
36-
}
3733
];
3834
};
3935
kubenixCI2 = kubenixInstance {

kubenix/builder.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ in
1818
{ ... }:
1919
{
2020
options = {
21-
enable = lib.mkEnableOption "builder pods" // {
21+
enable = (lib.mkEnableOption "builder pods") // {
2222
default = cfg.builders.enable;
2323
};
2424
replicas = lib.mkOption {
@@ -55,7 +55,9 @@ in
5555
);
5656
in
5757
{
58-
enable = lib.mkEnableOption "builder pods";
58+
enable = (lib.mkEnableOption "builder pods") // {
59+
default = true;
60+
};
5961
loadBalancerPort = lib.mkOption {
6062
description = "Port to run public SSH on for builder jumpbox";
6163
type = lib.types.nullOr lib.types.ints.positive;

kubenix/cache.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ let
1313
in
1414
{
1515
options.nix-csi.cache = {
16-
enable = lib.mkEnableOption "cache";
16+
enable = (lib.mkEnableOption "cache") // {
17+
default = true;
18+
};
1719
nixConfig = lib.mkOption {
1820
description = "nix.conf for cache pod";
1921
type = (import ./nixOptions.nix) curPkgs;

0 commit comments

Comments
 (0)