MULTIARCH-4569: aws: support multi-arch nodes #8698
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,7 +32,10 @@ import ( | |
| // Image is location of RHCOS image. | ||
| // This stores the location of the image based on the platform. | ||
| // eg. on AWS this contains ami-id, on Livirt this can be the URI for QEMU image etc. | ||
| type Image struct { | ||
| ControlPlane string | ||
| Compute string | ||
| } | ||
|
|
||
| var _ asset.Asset = (*Image)(nil) | ||
|
|
||
|
|
@@ -52,27 +55,35 @@ func (i *Image) Dependencies() []asset.Asset { | |
| func (i *Image) Generate(ctx context.Context, p asset.Parents) error { | ||
| if oi, ok := os.LookupEnv("OPENSHIFT_INSTALL_OS_IMAGE_OVERRIDE"); ok && oi != "" { | ||
| logrus.Warn("Found override for OS Image. Please be warned, this is not advised") | ||
| *i = *MakeAsset(oi) | ||
|
||
| return nil | ||
| } | ||
|
|
||
| ic := &installconfig.InstallConfig{} | ||
| p.Get(ic) | ||
| config := ic.Config | ||
| osimageControlPlane, err := osImage(ctx, config, config.ControlPlane.Architecture) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| arch := config.ControlPlane.Architecture | ||
| if len(config.Compute) > 0 { | ||
| arch = config.Compute[0].Architecture | ||
| } | ||
| osimageCompute, err := osImage(ctx, config, arch) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| *i = Image{osimageControlPlane, osimageCompute} | ||
| return nil | ||
| } | ||
|
|
||
| //nolint:gocyclo | ||
| func osImage(ctx context.Context, config *types.InstallConfig, nodeArch types.Architecture) (string, error) { | ||
| ctx, cancel := context.WithTimeout(ctx, 30*time.Second) | ||
| defer cancel() | ||
|
|
||
| archName := arch.RpmArch(string(nodeArch)) | ||
|
|
||
| st, err := rhcos.FetchCoreOSBuild(ctx) | ||
| if err != nil { | ||
|
|
@@ -88,7 +99,7 @@ func osImage(ctx context.Context, config *types.InstallConfig) (string, error) { | |
| return config.Platform.AWS.AMIID, nil | ||
| } | ||
| region := config.Platform.AWS.Region | ||
| if !rhcos.AMIRegions(nodeArch).Has(region) { | ||
| const globalResourceRegion = "us-east-1" | ||
| logrus.Debugf("No AMI found in %s. Using AMI from %s.", region, globalResourceRegion) | ||
| region = globalResourceRegion | ||
|
|
@@ -155,7 +166,6 @@ func osImage(ctx context.Context, config *types.InstallConfig) (string, error) { | |
| // FindArtifactURL just create the URL here. | ||
| artifact := a.Formats["ova"].Disk | ||
| u, err := url.Parse(artifact.Location) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
@@ -212,3 +222,11 @@ func osImage(ctx context.Context, config *types.InstallConfig) (string, error) { | |
| return "", fmt.Errorf("invalid platform %v", config.Platform.Name()) | ||
| } | ||
| } | ||
|
|
||
| // MakeAsset returns an Image asset with the given os image. | ||
| func MakeAsset(osImage string) *Image { | ||
| return &Image{ | ||
| ControlPlane: osImage, | ||
| Compute: osImage, | ||
| } | ||
| } | ||
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.