Adjusting manifests for gitops on hypershift-konflux#82118
Adjusting manifests for gitops on hypershift-konflux#82118openshift-merge-bot[bot] merged 1 commit into
Conversation
openshift-merge-bot
Bot
added
the
rehearsals-ack
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (3)
🚧 Files skipped from review as they are similar to previous changes (2)
WalkthroughThe manifests update infra and worker MachineSets across three AWS zones with revised AMIs, instance types, storage, security groups, subnets, metadata, annotations, and replicas. AMD64 worker manifests also remove the existing MachineAutoscaler resources. ChangesHypershift MachineSet configuration
Estimated code review effort: 4 (Complex) | ~45 minutes Suggested reviewers: 🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
openshift-ci
Bot
added
the
approved
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 6
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@clusters/hypershift-konflux/machinesets/infra-arm64.yaml`:
- Line 9: Remove the server-managed metadata fields generation and
creationTimestamp from the MachineSet manifest, including the entries near the
metadata section and the later referenced location. Leave all declarative
metadata and resource configuration unchanged.
- Line 41: Remove the explicit iops value from the infra-arm64 MachineSet
storage configuration so it uses the gp3 default, matching the other zones and
avoiding an invalid value below AWS’s minimum.
In `@clusters/hypershift-konflux/machinesets/worker-amd64.yaml`:
- Around line 32-49: Update the ami.id values in all six listed MachineSet
sites: use an x86_64-compatible AMI for
clusters/hypershift-konflux/machinesets/worker-amd64.yaml at lines 32-49,
106-123, and 179-196, and an arm64-compatible AMI for
clusters/hypershift-konflux/machinesets/worker-arm64.yaml at lines 32-49,
106-123, and 180-197. Keep each worker pool consistently matched to its
architecture.
- Around line 5-8: Update the capacity annotations for the MachineSets using
m6a.4xlarge or m6g.4xlarge to advertise 16 vCPU and 65536 MiB instead of 8 vCPU
and 32768 MiB. Apply this in
clusters/hypershift-konflux/machinesets/worker-amd64.yaml at lines 5-8, 79-82,
and 153-156, and clusters/hypershift-konflux/machinesets/worker-arm64.yaml at
lines 5-8, 79-82, and 154-157, matching each annotation to its instance type.
- Around line 12-15: Add matching MachineAutoscaler resources under the
hypershift-konflux cluster configuration for the AMD64 worker MachineSets,
including hypershift-konflux-nt7sd-worker-us-east-2a and each renamed worker
pool. Configure each autoscaler to target its corresponding MachineSet and
preserve the expected per-zone scaling behavior instead of leaving replicas
capped at one.
- Around line 12-26: Give the AMD64 and ARM64 MachineSets distinct names across
clusters/hypershift-konflux/machinesets/worker-amd64.yaml sites 12-26, 86-100,
and 159-173 and clusters/hypershift-konflux/machinesets/worker-arm64.yaml sites
12-26, 86-100, and 160-174. Rename one architecture’s MachineSet resources so
the us-east-2a/b/c objects do not collide, and update every corresponding
machine.openshift.io/cluster-api-machineset value in each spec.selector and
template.metadata.labels to match its resource name.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 18cb271e-79f4-418f-b09c-237a776cc9d6
📒 Files selected for processing (3)
clusters/hypershift-konflux/machinesets/infra-arm64.yamlclusters/hypershift-konflux/machinesets/worker-amd64.yamlclusters/hypershift-konflux/machinesets/worker-arm64.yaml
c8c4732 to
85e58e7
Compare
|
/retest |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@clusters/hypershift-konflux/machinesets/worker-amd64.yaml`:
- Line 9: Remove both top-level metadata.creationTimestamp entries from
clusters/hypershift-konflux/machinesets/worker-amd64.yaml at lines 9 and 83, and
from clusters/hypershift-konflux/machinesets/worker-arm64.yaml at lines 9 and
83. Leave all other MachineSet metadata unchanged.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 28efea4a-6d33-43de-8da5-c3075ddb3b6b
📒 Files selected for processing (3)
clusters/hypershift-konflux/machinesets/infra-arm64.yamlclusters/hypershift-konflux/machinesets/worker-amd64.yamlclusters/hypershift-konflux/machinesets/worker-arm64.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
- clusters/hypershift-konflux/machinesets/infra-arm64.yaml
85e58e7 to
4f7aaf4
Compare
4f7aaf4 to
9796e75
Compare
|
[REHEARSALNOTIFIER] Note: If this PR includes changes to step registry files ( Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: deepsm007, hector-vido 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 |
|
/retest |
1 similar comment
|
/retest |
|
/retest |
|
@hector-vido: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
2 participants
Summary by CodeRabbit
This PR updates the hypershift-konflux GitOps AWS machine manifests for
us-east-2, affecting infra (clusters/hypershift-konflux/machinesets/infra-arm64.yaml) and worker nodes (worker-amd64.yaml+worker-arm64.yaml).Key changes:
kmsKey.arn: ""andebs.iops: 0, updates security group selection to two tag filters (node + lb), and changes the us-east-2b subnet ID. Also normalizes embedded provider/template fields (removescreationTimestamp: nulland related provider metadata/service options).us-east-2{a,b,c}) and removes per-zone MachineAutoscaler resources. Updates AWS provider settings (AMI refresh, instance type change, reduced EBS volume size), switches security group selection to node + lb tag filters, adds sizing annotations (including cluster-autoscaler arch label), setsspec.replicas: 1, and adds emptylifecycleHooks/metadatastubs while normalizing embedded provider/template fields.kmsKey.arn: ""andcapacityReservationId: "", updates security group selection to node + lb tag filters, removes provider-side metadata blocks (creationTimestamp: null,metadataServiceOptions), adds empty templatelifecycleHooks/metadata, and sets sizing annotations +spec.replicas: 1.Comment: requested retest via
/retest.