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 to v1.8.3 #3805

Merged
merged 3 commits into from
Sep 30, 2024
Merged

Bump capi to v1.8.3 #3805

merged 3 commits into from
Sep 30, 2024

Conversation

sp1999
Copy link
Member

@sp1999 sp1999 commented Sep 27, 2024

Description of changes

This PR bumps CAPI to the latest v1.8.3 to support Kubernetes 1.31.

Notable changes in CAPI v1.8.0:
CABPK: Add kubeadm v1beta4 types (including ExtraEnvs and ImagePullSerial)
PR: kubernetes-sigs/cluster-api#10709 and kubernetes-sigs/cluster-api#10846

Dependency: Bump controller-runtime to v0.18.0
PR: kubernetes-sigs/cluster-api#10383

Notable changes in controller-runtime v0.18.0
Source, Event, Predicate, Handler: Add generics support
PR: kubernetes-sigs/controller-runtime#2783 and kubernetes-sigs/controller-runtime#2796

Note:
Always run make generate in the upstream CAPI patched repo to make sure all the generated crds, deepcopy files, rbac objects and webhook configuration objects are up-to-date using controller-gen CLI and the conversion files are up-to-date using conversion-gen CLI. We ran into an issue this time where the crds weren't up-to-date with the latest patch updates and the cluster creation was failing to install etcdadmcluster with the following error message in the API server:

E0926 23:35:45.864017       1 status.go:71] "Unhandled Error" err="apiserver received an error that is not an metav1.Status: &errors.errorString{s:\"failed to create typed patch object (eksa-system/eksa-test-834a495; controlplane.cluster.x-k8s.io/v1beta1, Kind=KubeadmControlPlane): .spec.kubeadmConfigSpec.joinConfiguration.pause: field not declared in schema\"}: failed to create typed patch object (eksa-system/eksa-test-834a495; controlplane.cluster.x-k8s.io/v1beta1, Kind=KubeadmControlPlane): .spec.kubeadmConfigSpec.joinConfiguration.pause: field not declared in schema" logger="UnhandledError"

Testing

Ran TestVSphereKubernetes131Ubuntu2004SimpleFlow and TestVSphereKubernetes131BottlerocketLabelsUpgradeFlow E2E tests locally using bundles-override with the latest dev bundle having the new cluster-api v1.8.3 manifests. The tests passed successfully.

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

@sp1999
Copy link
Member Author

sp1999 commented Sep 27, 2024

/hold

@eks-distro-bot eks-distro-bot added do-not-merge/hold size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 27, 2024
@sp1999 sp1999 changed the title [WIP] Bump capi to v1.8.3 Bump capi to v1.8.3 Sep 30, 2024
@sp1999 sp1999 force-pushed the bump-capi-to-v1.8.3 branch from e0916c6 to 6b52271 Compare September 30, 2024 04:11
@sp1999
Copy link
Member Author

sp1999 commented Sep 30, 2024

/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sp1999

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

The pull request process is described 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

@sp1999 sp1999 force-pushed the bump-capi-to-v1.8.3 branch from da81cb4 to 2574981 Compare September 30, 2024 20:46
@sp1999 sp1999 force-pushed the bump-capi-to-v1.8.3 branch from 2574981 to 39340e4 Compare September 30, 2024 20:50
@tatlat
Copy link
Member

tatlat commented Sep 30, 2024

/lgtm

@sp1999
Copy link
Member Author

sp1999 commented Sep 30, 2024

/unhold

@eks-distro-bot eks-distro-bot merged commit 70872f2 into aws:main Sep 30, 2024
3 checks passed
@sp1999 sp1999 deleted the bump-capi-to-v1.8.3 branch September 30, 2024 23:22
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't think we need this patch anymore. corefile-migration v1.0.23 supports coredns version 1.11.3 that eks-d currently ships.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm 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.

4 participants