Skip to content

OCPBUGS-81745: [release-4.21] Honor AWS AMI override in NodePool token generation #8170

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
openshift-merge-bot merged 1 commit into from
Apr 8, 2026
Merged

OCPBUGS-81745: [release-4.21] Honor AWS AMI override in NodePool token generation #8170

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
3 changes: 3 additions & 0 deletions hypershift-operator/controllers/nodepool/nodepool_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,9 @@ func isAutoscalingEnabled(nodePool *hyperv1.NodePool) bool {
}

func defaultNodePoolAMI(region string, specifiedArch string, releaseImage *releaseinfo.ReleaseImage) (string, error) {
if releaseImage.StreamMetadata == nil {
return "", fmt.Errorf("release image stream metadata is nil")
}
arch, foundArch := releaseImage.StreamMetadata.Architectures[hyperv1.ArchAliases[specifiedArch]]
if !foundArch {
return "", fmt.Errorf("couldn't find OS metadata for architecture %q", specifiedArch)
Expand Down
16 changes: 15 additions & 1 deletion hypershift-operator/controllers/nodepool/nodepool_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,15 @@ func TestDefaultNodePoolAMI(t *testing.T) {
specifiedArch: "arm64",
expectedImage: "",
},
{
name: "fail because stream metadata is nil",
region: "us-east-1",
specifiedArch: "amd64",
releaseImage: &releaseinfo.ReleaseImage{
StreamMetadata: nil,
},
expectedImage: "",
},
}

for _, tc := range testCases {
Expand Down Expand Up @@ -596,7 +605,9 @@ func TestDefaultNodePoolAMI(t *testing.T) {
}

ctx := t.Context()
tc.releaseImage = fakereleaseprovider.GetReleaseImage(ctx, hc, client, releaseProvider)
if tc.releaseImage == nil {
tc.releaseImage = fakereleaseprovider.GetReleaseImage(ctx, hc, client, releaseProvider)
}

tc.image, tc.err = defaultNodePoolAMI(tc.region, tc.specifiedArch, tc.releaseImage)
if strings.Contains(tc.name, "successfully") {
Expand All @@ -608,6 +619,9 @@ func TestDefaultNodePoolAMI(t *testing.T) {
} else if strings.Contains(tc.name, "fail because architecture") {
g.Expect(tc.image).To(BeEmpty())
g.Expect(tc.err.Error()).To(Equal("couldn't find OS metadata for architecture \"" + tc.specifiedArch + "\""))
} else if strings.Contains(tc.name, "stream metadata is nil") {
g.Expect(tc.image).To(BeEmpty())
g.Expect(tc.err.Error()).To(Equal("release image stream metadata is nil"))
} else {
g.Expect(tc.image).To(BeEmpty())
g.Expect(tc.err.Error()).To(Equal("release image metadata has no image for region \"" + tc.region + "\""))
Expand Down
4 changes: 3 additions & 1 deletion hypershift-operator/controllers/nodepool/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ func NewToken(ctx context.Context, configGenerator *ConfigGenerator, cpoCapabili
globalconfig.ReconcileProxyConfigWithStatusFromHostedCluster(proxy, configGenerator.hostedCluster)

ami := ""
if configGenerator.hostedCluster.Spec.Platform.AWS != nil {
if configGenerator.nodePool.Spec.Platform.AWS != nil && configGenerator.nodePool.Spec.Platform.AWS.AMI != "" {
ami = configGenerator.nodePool.Spec.Platform.AWS.AMI
} else if configGenerator.hostedCluster.Spec.Platform.AWS != nil {
ami, err = defaultNodePoolAMI(configGenerator.hostedCluster.Spec.Platform.AWS.Region, configGenerator.nodePool.Spec.Arch, configGenerator.releaseImage)
if err != nil {
return nil, err
Expand Down