Skip to content

fix: run the staged weka CLI in the drivers-builder container #2790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
Sep 3, 2026
+27 −4
Merged

fix: run the staged weka CLI in the drivers-builder container #2790

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions internal/controllers/resources/init_containers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,26 @@ func (f *PodFactory) copyWekaVersionToContainer(pod *v1.Pod) {
Command: []string{"sh", "-c"},
Args: []string{
`
# Copy the actual binary file that command resolves to (follows symlinks)
mkdir -p /shared-weka-version/cli &&
cp -a -- "$(readlink -f -- "$(command -v weka)")" /shared-weka-version/cli/weka &&
echo "copy-cli init container done"
# Stage the weka CLI outside /opt/weka: the extraction step below bind-mounts
# over /opt/weka, where the CLI lives, and would otherwise hide it.
mkdir -p /shared-weka-version/cli || exit 1
# the wekactl filename carries a per-image hash and the machine arch
ARCH=$(uname -m)
CLI=$(ls -1 /opt/weka/dist/image/wekactl-*-"$ARCH" 2>/dev/null | head -1)
if [ -z "$CLI" ]; then
# older images ship only the weka binary; resolve the path we shadow
# rather than PATH, so a wrapper script can never be staged onto the
# very path it delegates to
CLI=$(readlink -f -- /usr/bin/weka)
fi
if [ -z "$CLI" ] || [ ! -f "$CLI" ]; then
echo "ERROR: no weka CLI found to stage" >&2
exit 1
fi
cp -- "$CLI" /shared-weka-version/cli/weka || exit 1
# the source is not executable in the image, so set the bit explicitly
chmod 0755 /shared-weka-version/cli/weka || exit 1
echo "copy-cli init container done: staged $CLI"
`,
},
VolumeMounts: []v1.VolumeMount{
Expand Down Expand Up @@ -148,6 +164,13 @@ func (f *PodFactory) copyWekaVersionToContainer(pod *v1.Pod) {
Name: sharedVolumeName,
MountPath: sharedVolumeMountPath,
})
// the wrapper at /usr/local/bin/weka execs /usr/bin/weka, so shadowing that path makes the
// container use the CLI staged from the cluster image instead of its own older one
pod.Spec.Containers[0].VolumeMounts = append(pod.Spec.Containers[0].VolumeMounts, v1.VolumeMount{
Name: sharedVolumeName,
MountPath: "/usr/bin/weka",
SubPath: "cli/weka",
})
pod.Spec.Volumes = append(pod.Spec.Volumes, v1.Volume{
Name: sharedVolumeName,
VolumeSource: v1.VolumeSource{
Expand Down
Loading