diff --git a/modules/services/colima.nix b/modules/services/colima.nix
index a042f117a..1f889d8dd 100644
--- a/modules/services/colima.nix
+++ b/modules/services/colima.nix
@@ -62,6 +62,9 @@ in
bashPackage = lib.mkPackageOption pkgs "bashNonInteractive" {
extraDescription = "Used by colima's internal scripts.";
};
+ kubectlPackage = lib.mkPackageOption pkgs "kubectl" {
+ extraDescription = "Used by colima when kubernetes is enabled in the profile.";
+ };
profiles = lib.mkOption {
default = {
@@ -285,6 +288,7 @@ in
cfg.coreutilsPackage
cfg.curlPackage
cfg.bashPackage
+ cfg.kubectlPackage
pkgs.darwin.DarwinTools
];
}
@@ -331,6 +335,7 @@ in
cfg.coreutilsPackage
cfg.curlPackage
cfg.bashPackage
+ cfg.kubectlPackage
]
}"
]
diff --git a/tests/modules/services/colima/darwin/colima-default-config.nix b/tests/modules/services/colima/darwin/colima-default-config.nix
index fbc29de8d..77eb02d79 100644
--- a/tests/modules/services/colima/darwin/colima-default-config.nix
+++ b/tests/modules/services/colima/darwin/colima-default-config.nix
@@ -47,6 +47,10 @@
name = "bashNonInteractive";
outPath = "@bashNonInteractive@";
};
+ kubectlPackage = config.lib.test.mkStubPackage {
+ name = "kubectl";
+ outPath = "@kubectl@";
+ };
};
nmt.script = ''
diff --git a/tests/modules/services/colima/darwin/colima-docker-cli-expected.plist b/tests/modules/services/colima/darwin/colima-docker-cli-expected.plist
index 582f8486a..20cc93c7d 100644
--- a/tests/modules/services/colima/darwin/colima-docker-cli-expected.plist
+++ b/tests/modules/services/colima/darwin/colima-docker-cli-expected.plist
@@ -11,7 +11,7 @@
LIMA_HOME
/home/hm-user/.local/share/lima
PATH
- @colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin:@DarwinTools@/bin
+ @colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin:@kubectl@/bin:@DarwinTools@/bin
XDG_CACHE_HOME
/home/hm-user/.cache
diff --git a/tests/modules/services/colima/darwin/colima-docker-cli.nix b/tests/modules/services/colima/darwin/colima-docker-cli.nix
index 789685fb1..a7775d95a 100644
--- a/tests/modules/services/colima/darwin/colima-docker-cli.nix
+++ b/tests/modules/services/colima/darwin/colima-docker-cli.nix
@@ -54,6 +54,10 @@
name = "bashNonInteractive";
outPath = "@bashNonInteractive@";
};
+ kubectlPackage = config.lib.test.mkStubPackage {
+ name = "kubectl";
+ outPath = "@kubectl@";
+ };
};
nmt.script =
diff --git a/tests/modules/services/colima/darwin/expected-agent.plist b/tests/modules/services/colima/darwin/expected-agent.plist
index 65bd21575..98ce5dbe8 100644
--- a/tests/modules/services/colima/darwin/expected-agent.plist
+++ b/tests/modules/services/colima/darwin/expected-agent.plist
@@ -7,7 +7,7 @@
COLIMA_HOME
/home/hm-user/.colima
PATH
- @colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin:@DarwinTools@/bin
+ @colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin:@kubectl@/bin:@DarwinTools@/bin
XDG_CACHE_HOME
/home/hm-user/.cache
diff --git a/tests/modules/services/colima/linux/colima-docker-cli-expected.service b/tests/modules/services/colima/linux/colima-docker-cli-expected.service
index 244d9254e..37b251146 100644
--- a/tests/modules/services/colima/linux/colima-docker-cli-expected.service
+++ b/tests/modules/services/colima/linux/colima-docker-cli-expected.service
@@ -3,7 +3,7 @@ WantedBy=default.target
[Service]
Environment=COLIMA_HOME=/home/hm-user/.config/colima
-Environment=PATH=@colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin
+Environment=PATH=@colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin:@kubectl@/bin
Environment=LIMA_HOME=/home/hm-user/.local/share/lima
Environment=DOCKER_CONFIG=/home/hm-user/.config/docker
ExecStart=@colima@/bin/colima start default \
diff --git a/tests/modules/services/colima/linux/expected-service.service b/tests/modules/services/colima/linux/expected-service.service
index 28cd27ffb..7bd0e6d13 100644
--- a/tests/modules/services/colima/linux/expected-service.service
+++ b/tests/modules/services/colima/linux/expected-service.service
@@ -3,7 +3,7 @@ WantedBy=default.target
[Service]
Environment=COLIMA_HOME=/home/hm-user/.colima
-Environment=PATH=@colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin
+Environment=PATH=@colima@/bin:@perl@/bin:@docker@/bin:@openssh@/bin:@coreutils@/bin:@curl@/bin:@bashNonInteractive@/bin:@kubectl@/bin
ExecStart=@colima@/bin/colima start default \
-f \
--activate=true \