Skip to content

Commit d8a5b22

Browse files
Merge pull request openshift#8745 from mresvanis/OCPBUGS-37164-fix-image-based-crash
OCPBUGS-37164: Handle empty config for image-based create image
2 parents b2876fc + 90cd2cc commit d8a5b22

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

pkg/asset/imagebased/image/ignition.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package image
33
import (
44
"context"
55
"encoding/json"
6-
"errors"
76
"fmt"
87

98
"github.com/coreos/ignition/v2/config/merge"
@@ -72,7 +71,7 @@ func (i *Ignition) Generate(_ context.Context, dependencies asset.Parents) error
7271

7372
ibiConfig := configAsset.Config
7473
if ibiConfig == nil {
75-
return errors.New("image-based-installation-config.yaml is required")
74+
return nil
7675
}
7776

7877
config := &igntypes.Config{

pkg/asset/imagebased/image/registriesconf.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ func (i *RegistriesConf) Generate(_ context.Context, dependencies asset.Parents)
3535
ibiConfig := &ImageBasedInstallationConfig{}
3636
dependencies.Get(ibiConfig)
3737

38+
if ibiConfig.Config == nil {
39+
return nil
40+
}
41+
3842
imageDigestSources := ibiConfig.Config.ImageDigestSources
3943

4044
if len(imageDigestSources) == 0 {

0 commit comments

Comments
 (0)