Skip to content
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.

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

Bump CAPI version to v1.9.4 #4258

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Conversation

2ez4szliu
Copy link
Member

@2ez4szliu 2ez4szliu commented Jan 24, 2025

Issue #, if available: https://github.com/aws/eks-anywhere-internal/issues/2765

Description of changes:
Bump CAPI version from 1.8.5 to 1.9.4 to support k8s 1.32.

Notable changes in our patches:

  • Removed patch 0001 Update coredns/corefile-migration to support 1.11.3 because upstream corefile-migration has been bumped to 1.0.25.
  • In /internal/controllers/machine/machine_controller_phases.go: reconcilePhase function was removed and the logic of checking/updating machine status was moved into updateStatus(ctx context.Context, s *scope) in /internal/controllers/machine/machine_controller_status.go, we move the logic of setting etcd machine status to running into setMachinePhaseAndLastUpdated(_ context.Context, m *clusterv1.Machine) of machine_controller_status.go (this affects patch 0002 Add-unstacked-etcd-support.patch and patch 0020-Mark-etcd-machine-status-to-running-after-etcd-contr.patch)
    Reference PR: 11276
  • Pause handling for in reconcileExternal was removed in this PR, so we also removed the pause handling for reconcileEtcdCluster(ctx context.Context, s *scope) in patch 0002 Add-unstacked-etcd-support.patch
  • Need to update the control plane status in scope object in handlePauseControlPlaneWithExternalManagedEtcd(ctx context.Context, log logr.Logger, s *scope) when control plane is not found in patch 0003-Unstacked-etcd-and-controlplane-upgrade.patch, otherwise the reconcileDelete process will be stuck during control plane deletion stage and etcd cluster will never be deleted.

Testing
Ran TestVSphereKubernetes131Ubuntu2204SimpleFlow and TestVSphereKubernetes131BottlerocketLabelsUpgradeFlow, both passed.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from 2ez4szliu. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@eks-distro-bot eks-distro-bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 24, 2025
@2ez4szliu 2ez4szliu force-pushed the bump-capi branch 2 times, most recently from 7c02e40 to d0ca04e Compare January 26, 2025 06:44
@2ez4szliu 2ez4szliu force-pushed the bump-capi branch 3 times, most recently from 6430f2a to f68d395 Compare February 4, 2025 19:33
@2ez4szliu 2ez4szliu changed the title Bump CAPI version to v1.9.3 Bump CAPI version to v1.9.4 Feb 4, 2025
@2ez4szliu
Copy link
Member Author

/hold

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/dependencies do-not-merge/hold size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants