Dynamic AMI and instance type lookup from existing MachineSets with fallback to ConfigMap values #536
Conversation
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
Contributor
tanfengshuang
commented
Dec 16, 2025
tanfengshuang
commented
- Dynamic AMI Lookup
- Queries existing MachineSets in openshift-machine-api namespace
- Extracts AMI ID from the first MachineSet's providerSpec.value.ami.id
- Falls back to region+version-based ConfigMap lookup if no MachineSets exist
- Ensures storage nodes use the same AMI as compute nodes (matching architecture)
- Dynamic Instance Type Lookup
- Extracts instance type from existing MachineSets
- Automatically handles bare metal by replacing .metal with .2xlarge
- Falls back to awsInstanceType ConfigMap value if no MachineSets found
- Ensures architecture compatibility between AMI and instance type
- Dynamically query AMI ID from existing MachineSets - Add dynamic instance type lookup with ARM64 support - Handle bare metal clusters by skipping MachineSet creation - Fixes AMI mismatch issue causing deployment failures in unsupported regions - Supports ARM64 (Graviton) and x86_64 architectures Signed-off-by: Fengshuang Tan <[email protected]>
tanfengshuang
force-pushed
the
fix-ami-dynamic-lookup
branch
from
6ff7110 to
30d6711
Compare
dhaiducek
reviewed
Dec 16, 2025
Member
dhaiducek
left a comment
dhaiducek
left a comment
There was a problem hiding this comment.
Thanks for the update @tanfengshuang! I'm not sure I'm familiar enough with this Policy to approve it, but I have a minor comment to consider!
Comment on lines
+55
to
+66
| id: '{{- $dynamicAMI := "" -}} | ||
| {{- $machinesets := (lookup "machine.openshift.io/v1beta1" "MachineSet" "openshift-machine-api" "") -}} | ||
| {{- if $machinesets.items -}} | ||
| {{- if gt (len $machinesets.items) 0 -}} | ||
| {{- $dynamicAMI = (index $machinesets.items 0).spec.template.spec.providerSpec.value.ami.id -}} | ||
| {{- end -}} | ||
| {{- end -}} | ||
| {{- if $dynamicAMI -}} | ||
| {{ $dynamicAMI }} | ||
| {{- else -}} | ||
| {{ fromConfigMap "policies" "opp-settings" (printf "%s-%s" (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").status.platformStatus.aws.region (fromClusterClaim "openshiftversion-major-minor")) }} | ||
| {{- end -}}' |
Member
There was a problem hiding this comment.
(Optional) Leveraging range directly could be a bit cleaner (and I think would cover the conditionals that are in place?):
id: >-
{{ $dynamicAMI := "" -}}
{{ range $machineset := (lookup "machine.openshift.io/v1beta1" "MachineSet" "openshift-machine-api" "").items -}}
{{ $dynamicAMI = $machineset.spec.template.spec.providerSpec.value.ami.id -}}
{{ break -}}
{{ end -}}
{{ defaultAMI := fromConfigMap "policies" "opp-settings" (printf "%s-%s" (lookup "config.openshift.io/v1" "Infrastructure" "" "cluster").status.platformStatus.aws.region (fromClusterClaim "openshiftversion-major-minor")) }}
{{ default $defaultAMI $dynamicAMI -}}
Member
There was a problem hiding this comment.
Yes, we can improve this as we move forward. A lot of testing has been completed with the current templates.
gparvin
approved these changes
Dec 18, 2025
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: gparvin, tanfengshuang The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-merge-bot
bot
merged commit 572fe17
into
open-cluster-management-io:main
3 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.