Skip to content

Commit 91755d0

Browse files
Lillecarlclaude
andcommitted
Rename CSI driver from nix.csi.store to nixkube
Update the CSI driver name throughout the codebase to match the unified project name. The driver name is used in: - Kubernetes CSIDriver resource definition - DaemonSet plugin socket paths - All pod volumeSource references across Kubernetes manifests - CSI plugin metadata and version reporting Files updated: - src/constants.py: CSI_PLUGIN_NAME and package version lookup - kubenix/csidriver.nix: CSIDriver resource name - kubenix/daemonset.nix: Plugin socket paths - kubenix/ci/default.nix: Test pod volume sources - kubenix/builder.nix: Builder pod volume sources - kubenix/cache.nix: Cache pod volume sources - demo/pod.nix: Demo pod example - demo/nixos.nix: Demo NixOS pod example All 38 tests passing, pyright 0 errors. Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
1 parent cc758f6 commit 91755d0

8 files changed

Lines changed: 18 additions & 18 deletions

File tree

demo/nixos.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ let
8282
tmp.emptyDir.medium = "Memory";
8383
cgroup.hostPath.path = "/sys/fs/cgroup";
8484
nix.csi = {
85-
driver = "nix.csi.store";
85+
driver = "nixkube";
8686
volumeAttributes.${pkgs.stdenv.hostPlatform.system} = pkgs.buildEnv {
8787
name = "initenv";
8888
paths = [

demo/pod.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ let
6565
# into a list of attrset with name attribute set
6666
volumes = lib.mkNamedList {
6767
nix.csi = {
68-
driver = "nix.csi.store";
68+
driver = "nixkube";
6969
# these are stringified into storePaths now the manifest depends
7070
# on pkgs.hello so when we push it we bring the package environment and nix-csi
7171
# can fetch it.

kubenix/builder.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ in
164164
volumes = lib.mkNamedList {
165165
nix-config.configMap.name = "nix-builder";
166166
init-store.csi = {
167-
driver = "nix.csi.store";
167+
driver = "nixkube";
168168
readOnly = true;
169169
volumeAttributes = {
170170
# Only render storePaths here, building is done with a ConfigMap (config.nix) only if cfg.push is set
@@ -261,7 +261,7 @@ in
261261
};
262262
volumes = lib.mkNamedList {
263263
nix-store.csi = {
264-
driver = "nix.csi.store";
264+
driver = "nixkube";
265265
readOnly = true;
266266
volumeAttributes = {
267267
# Only render storePaths here, building is done with a ConfigMap (config.nix) only if cfg.push is set

kubenix/cache.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ in
134134
nix-config.configMap.name = "nix-cache";
135135
nix-key.secret.secretName = "nix-key";
136136
init-store.csi = {
137-
driver = "nix.csi.store";
137+
driver = "nixkube";
138138
readOnly = true;
139139
volumeAttributes = {
140140
# Only render storePaths here, building is done with a ConfigMap (config.nix) only if cfg.push is set

kubenix/ci/default.nix

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ in
8686
inherit containers;
8787
volumes = lib.mkNamedList {
8888
nix-csi.csi = {
89-
driver = "nix.csi.store";
89+
driver = "nixkube";
9090
volumeAttributes.flakeRef = "github:nixos/nixpkgs/nixos-unstable#hello";
9191
};
9292
};
@@ -116,7 +116,7 @@ in
116116
};
117117
volumes = lib.mkNamedList {
118118
nix-csi.csi = {
119-
driver = "nix.csi.store";
119+
driver = "nixkube";
120120
readOnly = true;
121121
volumeAttributes.nixExpr = # nix
122122
''
@@ -148,7 +148,7 @@ in
148148
inherit containers;
149149
volumes = lib.mkNamedList {
150150
nix-csi.csi = {
151-
driver = "nix.csi.store";
151+
driver = "nixkube";
152152
readOnly = true;
153153
volumeAttributes.${system} = curPkgs.hello;
154154
};
@@ -170,7 +170,7 @@ in
170170
};
171171
volumes = lib.mkNamedList {
172172
nix-csi.csi = {
173-
driver = "nix.csi.store";
173+
driver = "nixkube";
174174
readOnly = true;
175175
};
176176
};
@@ -249,7 +249,7 @@ in
249249
};
250250
volumes = lib.mkNamedList {
251251
nix-csi.csi = {
252-
driver = "nix.csi.store";
252+
driver = "nixkube";
253253
readOnly = true;
254254
};
255255
};
@@ -269,7 +269,7 @@ in
269269
inherit containers;
270270
volumes = lib.mkNamedList {
271271
nix-csi.csi = {
272-
driver = "nix.csi.store";
272+
driver = "nixkube";
273273
readOnly = true;
274274
volumeAttributes.${system} = "/nix/store/0000000000000000000000000000000-nonexistent";
275275
};
@@ -289,7 +289,7 @@ in
289289
inherit containers;
290290
volumes = lib.mkNamedList {
291291
nix-csi.csi = {
292-
driver = "nix.csi.store";
292+
driver = "nixkube";
293293
volumeAttributes.flakeRef = "github:nonexistent/nonexistent-repo/nonexistent-ref#nonexistent";
294294
};
295295
};
@@ -308,7 +308,7 @@ in
308308
inherit containers;
309309
volumes = lib.mkNamedList {
310310
nix-csi.csi = {
311-
driver = "nix.csi.store";
311+
driver = "nixkube";
312312
volumeAttributes.nixExpr = # nix
313313
''
314314
let

kubenix/csidriver.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let
1010
in
1111
{
1212
config = lib.mkIf cfg.enable {
13-
kubernetes.resources.none.CSIDriver."nix.csi.store" = {
13+
kubernetes.resources.none.CSIDriver."nixkube" = {
1414
metadata.labels = cfg.labels;
1515
spec = {
1616
attachRequired = false;

kubenix/daemonset.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ in
151151
args = [
152152
"--v=5"
153153
"--csi-address=/csi/csi.sock"
154-
"--kubelet-registration-path=/var/lib/kubelet/plugins/nix.csi.store/csi.sock"
154+
"--kubelet-registration-path=/var/lib/kubelet/plugins/nixkube/csi.sock"
155155
];
156156
env = lib.mkNamedList {
157157
KUBE_NODE_NAME.valueFrom.fieldRef.fieldPath = "spec.nodeName";
@@ -191,7 +191,7 @@ in
191191
type = "DirectoryOrCreate";
192192
};
193193
csi-socket.hostPath = {
194-
path = "/var/lib/kubelet/plugins/nix.csi.store/";
194+
path = "/var/lib/kubelet/plugins/nixkube/";
195195
type = "DirectoryOrCreate";
196196
};
197197
nri-socket.hostPath = {

pkgs/nixkube/src/constants.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
from importlib import metadata
66
from pathlib import Path
77

8-
CSI_PLUGIN_NAME = "nix.csi.store"
8+
CSI_PLUGIN_NAME = "nixkube"
99
try:
10-
CSI_VENDOR_VERSION = metadata.version("nix-csi")
10+
CSI_VENDOR_VERSION = metadata.version("nixkube")
1111
except metadata.PackageNotFoundError:
1212
# When running tests or in development, package may not be installed
1313
CSI_VENDOR_VERSION = "dev"

0 commit comments

Comments
 (0)