fixup! initializer: add cryptsetup subcommand

edgelesssys · Jan 28, 2025 · a69da93 · a69da93
1 parent 195a55f
commit a69da93
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/internal/kuberesource/sets.go b/internal/kuberesource/sets.go
@@ -532,10 +532,7 @@ func VolumeStatefulSet() []any {
 										WithDevicePath("/dev/csi0"),
 								).
 								WithVolumeMounts(
-									VolumeMount().
-										WithName("run").
-										WithMountPath("/run"),
-									VolumeMount().
+										VolumeMount().
 										WithName("share").
 										WithMountPath("/state").
 										WithMountPropagation(corev1.MountPropagationBidirectional),
@@ -572,9 +569,6 @@ func VolumeStatefulSet() []any {
 								),
 						).
 						WithVolumes(
-							applycorev1.Volume().
-								WithName("run").
-								WithEmptyDir(applycorev1.EmptyDirVolumeSource()),
 							applycorev1.Volume().
 								WithName("share").
 								WithEmptyDir(applycorev1.EmptyDirVolumeSource()),
@@ -624,9 +618,6 @@ func MySQL() []any {
 										WithDevicePath("/dev/csi0"),
 								).
 								WithVolumeMounts(
-									VolumeMount().
-										WithName("run").
-										WithMountPath("/run"),
 									VolumeMount().
 										WithName("share").
 										WithMountPath("/state").
@@ -672,9 +663,6 @@ func MySQL() []any {
 								),
 						).
 						WithVolumes(
-							applycorev1.Volume().
-								WithName("run").
-								WithEmptyDir(applycorev1.EmptyDirVolumeSource()),
 							applycorev1.Volume().
 								WithName("share").
 								WithEmptyDir(applycorev1.EmptyDirVolumeSource()),

diff --git a/packages/containers.nix b/packages/containers.nix
@@ -66,6 +66,9 @@ let
           openssl
         ])
         ++ (with dockerTools; [ caCertificates ]);
+        runAsRoot = ''
+        mkdir -p /run
+      '';
       config = {
         # Use Entrypoint so we can append arguments.
         Entrypoint = [ "${pkgs.contrast.initializer}/bin/initializer" ];