Make DIND image configurable and remove non-runner-containers helper to avoid unintended DIND inclusion #3851
+9
−10
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.
This PR updates the
gha-runner-scale-set
Helm chart templates to allow the DIND image to be configurable based on.Values.template.spec.containers
. With this change, the chart will continue to usedocker:dind
by default, but if a container nameddind
is defined, that image is used instead. This provides greater flexibility for users who need to customize their DIND image.As a result of making the DIND image configurable, the
non-runner-containers
helper now inadvertently includes the DIND container in scenarios where it’s not intended, specifically when using Kubernetes mode. To address this, we remove thenon-runner-containers
helper and rely exclusively onnon-runner-non-dind-containers
. This ensures that DIND remains properly scoped and does not appear where it should not.