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.
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:
/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 intosetMachinePhaseAndLastUpdated(_ 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
reconcileEtcdCluster(ctx context.Context, s *scope)
in patch 0002 Add-unstacked-etcd-support.patchhandlePauseControlPlaneWithExternalManagedEtcd(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
andTestVSphereKubernetes131BottlerocketLabelsUpgradeFlow
, 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.