Enable multi architecture compatibility between Tentacle and Script pods#1141
Merged
octonautcal merged 17 commits intomainfrom Mar 16, 2026
Merged
Conversation
rain-on
reviewed
Mar 4, 2026
rain-on
reviewed
Mar 4, 2026
docker/kubernetes-agent-tentacle/bootstrapRunner/execute-bootstrapRunner.sh
Show resolved
Hide resolved
rain-on
reviewed
Mar 4, 2026
docker/kubernetes-agent-tentacle/bootstrapRunner/execute-bootstrapRunner.sh
Outdated
Show resolved
Hide resolved
rain-on
reviewed
Mar 10, 2026
docker/kubernetes-agent-tentacle/bootstrapRunner/execute-bootstrapRunner.sh
Show resolved
Hide resolved
rain-on
reviewed
Mar 10, 2026
APErebus
approved these changes
Mar 11, 2026
Contributor
APErebus
left a comment
There was a problem hiding this comment.
Non-blocking minor things
docker/kubernetes-agent-tentacle/bootstrapRunner/execute-bootstrapRunner.sh
Outdated
Show resolved
Hide resolved
source/Octopus.Tentacle/Kubernetes/KubernetesScriptPodCreator.cs
Outdated
Show resolved
Hide resolved
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Are you a customer of Octopus Deploy? Please contact our support team so we can triage your PR, so that we can make sure it's handled appropriately.
Background
The boostrapRunner executable is a Go binary that is built as part of the Tentacle image, and copied over to the script pod at runtime. It is used to wrap the script execution so the pod streams logs in a format that Tentacle can parse. It is not built as part of the worker-tools image because customers are free to specify their own worker-tools image, and we need to ensure the logs are in the correct format.
Problem
The current bootstrapRunner exe is tightly coupled with the architecture of the Tentacle container. The limitation exists because we only build the bootstrapRunner exe for the arch that the tentacle image is built on.
RUN go build -ldflags "-s -w" -o "bin/bootstrapRunner"
This becomes a problem when the Tentacle and script pods are running on different platform architectures - i.e. when the script pod is spun up on a different node. In such a scenario the script pod would receive a bootstrapRunner exe that it cannot execute.
Results
Testing strategy
Set up a multi arch node AKS here
Create a worker on https://team-md-argocd-in-octopus.testoctopus.app/app#/Spaces-263/infrastructure/workers/Workers-81/settings.
Test that it normally fails due to incorrect arch
Deployed a multiarch image(containing our fixes) to an Azure Container Registry linked it to the Team MD sandbox cluster.
Set updated image to be updated in the helm release
Test that it now correctly works regardless of architecture
How to review this PR
Quality ✔️
Pre-requisites