Skip to content

Bump cluster-api fork to v1.13.2 base#79

Merged
peirulu merged 8 commits into
aws:mainfrom
peirulu:bump-capi-v1.13.2
Jun 24, 2026
Merged

Bump cluster-api fork to v1.13.2 base#79
peirulu merged 8 commits into
aws:mainfrom
peirulu:bump-capi-v1.13.2

Conversation

@peirulu

@peirulu peirulu commented Jun 23, 2026

Copy link
Copy Markdown
Member

Summary

  • Update replace directive to use peirulu/cluster-api v0.1.0 (EKS-A patches rebased on CAPI v1.13.2)
  • Bump k8s.io/* dependencies from v0.34.2 to v0.35.4
  • Bump controller-runtime from v0.22.4 to v0.23.3
  • Migrate webhook to generics API (controller-runtime v0.23 breaking change)
  • Bump Go version from 1.24.0 to 1.25.0
  • Update etcdadm-bootstrap-provider dependency to bumped version

Context

This is part of the k8s 1.36 support work for EKS Anywhere. The dependency chain is:

CAPI v1.13.2 → controller-runtime v0.23.3 → k8s.io/* v0.35.4 → Go 1.25

Dependencies

Breaking Change: controller-runtime v0.23 webhook API

ctrl.NewWebhookManagedBy now requires the object as a second argument, and CustomDefaulter/CustomValidator interfaces use typed generics instead of runtime.Object. The webhook code has been migrated accordingly.

Related PRs

Test plan

  • Verify go build ./... passes
  • Verify go test ./... passes (all packages: api/v1beta1, controllers)
  • Verify webhook registration works in a test cluster
    • Deployed to kind cluster with cert-manager
    • Pod starts (1/1 Running), webhooks registered at correct paths
    • Mutating webhook (defaulter) fires on create and update
    • Validating webhook fires on create and update — correctly rejects even replicas (Forbidden: etcd cluster cannot have an even number of nodes)
    • Logs confirm: default {"name": "test-etcd"}, validate create, validate update
  • Verify etcd cluster validation logic (replicas must be odd, namespace must match)

- Update replace directive to use peirulu/cluster-api v0.1.0
  (rebased EKS-A patches on CAPI v1.13.2)
- Bump k8s.io/* dependencies from v0.34.2 to v0.35.4
- Bump controller-runtime from v0.22.4 to v0.23.3
- Migrate webhook to generics API (controller-runtime v0.23 breaking change):
  ctrl.NewWebhookManagedBy now requires typed object parameter,
  CustomDefaulter/CustomValidator interfaces use concrete types instead of
  runtime.Object
- Bump Go version from 1.24.0 to 1.25.0
- Update etcdadm-bootstrap-provider dependency to use matching bumped version
- Migrate webhook tests to use new typed EtcdadmClusterValidator struct
- Update etcdadm-bootstrap-provider pseudo-version to include test fix
peirulu added a commit to peirulu/eks-anywhere-build-tooling that referenced this pull request Jun 23, 2026
Update Go version requirement from 1.24 to 1.25 for both etcdadm-controller
and etcdadm-bootstrap-provider. This is required because CAPI v1.13.2 (and
its dependency controller-runtime v0.23) requires Go 1.25.

Related PRs:
- aws/etcdadm-bootstrap-provider#55
- aws/etcdadm-controller#79
rajeshvenkata
rajeshvenkata previously approved these changes Jun 24, 2026
rajeshvenkata
rajeshvenkata previously approved these changes Jun 24, 2026
@rajeshvenkata
rajeshvenkata self-requested a review June 24, 2026 20:55
@peirulu
peirulu merged commit cabe3d4 into aws:main Jun 24, 2026
1 check passed
eks-distro-bot pushed a commit to aws/eks-anywhere-build-tooling that referenced this pull request Jun 24, 2026
* Bump etcdadm components GOLANG_VERSION for CAPI v1.13.2

Update Go version requirement from 1.24 to 1.25 for both etcdadm-controller
and etcdadm-bootstrap-provider. This is required because CAPI v1.13.2 (and
its dependency controller-runtime v0.23) requires Go 1.25.

Related PRs:
- aws/etcdadm-bootstrap-provider#55
- aws/etcdadm-controller#79

* Bump etcdadm components to CAPI v1.13.2 based releases

- etcdadm-controller: v1.0.27 -> v1.0.28
- etcdadm-bootstrap-provider: v1.0.19 -> v1.0.20
- GOLANG_VERSION: 1.24 -> 1.25 (required by CAPI v1.13.2 / controller-runtime v0.23)

CHECKSUMS and ATTRIBUTION.txt need to be regenerated via make build on a Linux build instance.

* Update UPSTREAM_PROJECTS.yaml for etcdadm components

* update checksum
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants