Skip to content

fix: add oci:// prefix to default flash command and preserve flashCmd #226

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
bennyz merged 1 commit into from
Apr 16, 2026
Merged

fix: add oci:// prefix to default flash command and preserve flashCmd #226

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions internal/buildapi/flash_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ type httpError struct {
func resolveFlashTargetConfig(req FlashRequest, operatorConfig *automotivev1alpha1.OperatorConfig) (string, string) {
exporterSelector := req.ExporterSelector
flashCmd := req.FlashCmd
if req.Target != "" && exporterSelector == "" && operatorConfig.Spec.Jumpstarter != nil {
if req.Target != "" && operatorConfig.Spec.Jumpstarter != nil {
if mapping, ok := operatorConfig.Spec.Jumpstarter.TargetMappings[req.Target]; ok {
exporterSelector = mapping.Selector
if exporterSelector == "" {
exporterSelector = mapping.Selector
}
if flashCmd == "" {
flashCmd = mapping.FlashCmd
}
Expand Down
2 changes: 1 addition & 1 deletion internal/common/tasks/scripts/flash_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ echo "Using client config: ${JMP_CLIENT_CONFIG}"
echo "refreshing jumpstarter token"
jmp login --client-config "${JMP_CLIENT_CONFIG}"

FLASH_CMD="${FLASH_CMD:-j storage flash \{image_uri\}}"
FLASH_CMD="${FLASH_CMD:-j storage flash oci://{image_uri}}"
FLASH_CMD=$(echo "${FLASH_CMD}" | sed "s|{image_uri}|${IMAGE_REF}|g")


Expand Down
4 changes: 2 additions & 2 deletions internal/common/tasks/tasks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ func GenerateTektonPipeline(name, namespace string, buildConfig *BuildConfig) *t
{
Name: "flash-cmd",
Type: tektonv1.ParamTypeString,
Description: "Custom flash command (default: j storage flash ${IMAGE_REF})",
Description: "Custom flash command (default: j storage flash oci://{image_uri})",
Default: &tektonv1.ParamValue{
Type: tektonv1.ParamTypeString,
StringVal: "",
Expand Down Expand Up @@ -1546,7 +1546,7 @@ func GenerateFlashTask(namespace string, buildConfig *BuildConfig) *tektonv1.Tas
{
Name: "flash-cmd",
Type: tektonv1.ParamTypeString,
Description: "Command to run for flashing (default: j storage flash ${IMAGE_REF})",
Description: "Command to run for flashing (default: j storage flash oci://{image_uri})",
Default: &tektonv1.ParamValue{
Type: tektonv1.ParamTypeString,
StringVal: "",
Expand Down
22 changes: 11 additions & 11 deletions internal/controller/imagebuild/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,21 +692,21 @@ func (r *ImageBuildReconciler) createBuildTaskRun(
// Add flash params if flash is enabled
var flashExporterSelector, flashCmd, flashOCIAuthSecretName string
if imageBuild.Spec.IsFlashEnabled() {
// User-specified exporter selector bypasses target lookup entirely
flashExporterSelector = imageBuild.Spec.GetFlashExporterSelector()
if flashExporterSelector == "" {
target := imageBuild.Spec.GetTarget()
if operatorConfig.Spec.Jumpstarter != nil {
if mapping, ok := operatorConfig.Spec.Jumpstarter.TargetMappings[target]; ok {
target := imageBuild.Spec.GetTarget()
// Look up target mapping for selector (if not overridden) and flash command
if operatorConfig.Spec.Jumpstarter != nil {
if mapping, ok := operatorConfig.Spec.Jumpstarter.TargetMappings[target]; ok {
if flashExporterSelector == "" {
flashExporterSelector = mapping.Selector
flashCmd = mapping.FlashCmd
}
flashCmd = mapping.FlashCmd
}
if flashExporterSelector == "" {
return fmt.Errorf("flash enabled but no Jumpstarter target mapping found for target %q; "+
"configure OperatorConfig.spec.jumpstarter.targetMappings[%q] with selector and flashCmd, "+
"or set flash.exporterSelector directly", target, target)
}
}
if flashExporterSelector == "" {
return fmt.Errorf("flash enabled but no Jumpstarter target mapping found for target %q; "+
"configure OperatorConfig.spec.jumpstarter.targetMappings[%q] with selector and flashCmd, "+
"or set flash.exporterSelector directly", target, target)
}
// User-specified flash command overrides OperatorConfig
if userCmd := imageBuild.Spec.GetFlashCmd(); userCmd != "" {
Expand Down
Loading