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.6.x #4739

Merged
merged 7 commits into from
Jan 18, 2024
Merged

✨ Bump CAPI to v1.6.x #4739

merged 7 commits into from
Jan 18, 2024

Conversation

damdo
Copy link
Member

@damdo damdo commented Jan 15, 2024

What type of PR is this?

/kind support

What this PR does / why we need it:

Bumps CAPI to v1.6.x based on https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/book/src/developer/providers/migrations/v1.5-to-v1.6.md

Partially based on #4569

Special notes for your reviewer:

Worth reviewing per commit
Checklist:

Release note:

Bump CAPI to v1.6.x

@k8s-ci-robot k8s-ci-robot added kind/support Categorizes issue or PR as a support question. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 15, 2024
@k8s-ci-robot k8s-ci-robot requested review from faiq and vincepri January 15, 2024 16:58
@k8s-ci-robot k8s-ci-robot added needs-priority size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jan 15, 2024
@damdo damdo changed the title Bump CAPI to v1.5.0 ✨ Bump CAPI to v1.6.0 Jan 15, 2024
@damdo
Copy link
Member Author

damdo commented Jan 15, 2024

/retest

@damdo
Copy link
Member Author

damdo commented Jan 15, 2024

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-eks

3 similar comments
@damdo
Copy link
Member Author

damdo commented Jan 15, 2024

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-eks

@damdo
Copy link
Member Author

damdo commented Jan 15, 2024

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-eks

@damdo
Copy link
Member Author

damdo commented Jan 16, 2024

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-eks

@damdo damdo changed the title ✨ Bump CAPI to v1.6.0 ✨ Bump CAPI to v1.6.x Jan 16, 2024
@damdo
Copy link
Member Author

damdo commented Jan 16, 2024

I now tried bumping to CAPI v1.6.1 instead as there is a fix around Upgrades and MachinePools.
Let's see if this solves the issues we have with MachinePools.

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-eks

@damdo
Copy link
Member Author

damdo commented Jan 16, 2024

/retest

Copy link
Member

@Ankitasw Ankitasw left a comment

Choose a reason for hiding this comment

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

Nits, other LGTM

Makefile Outdated Show resolved Hide resolved
Makefile Show resolved Hide resolved
@@ -386,3 +384,107 @@ func (m *MachineScope) SetInterruptible() {
m.AWSMachine.Status.Interruptible = true
}
}

Copy link
Member

Choose a reason for hiding this comment

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

Could you restructure this file more, such that declarations goes up in the file and function goes later?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, thinking about it, since this is a straight copy of a dependency we needed, it may be better to keep it into it's own separate file, in case we want to remove it in the future.
Added an extra providerid.go file for it.

@damdo
Copy link
Member Author

damdo commented Jan 17, 2024

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-eks

1 similar comment
@damdo
Copy link
Member Author

damdo commented Jan 17, 2024

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-eks

Copy link
Member

@Ankitasw Ankitasw left a comment

Choose a reason for hiding this comment

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

Looks like the deploy is failing since you have bumped controller runtime with this bump.

6:43:19 PM: # sigs.k8s.io/controller-runtime/pkg/cache
6:43:19 PM: /opt/buildhome/.gimme_cache/gopath/pkg/mod/sigs.k8s.io/[email protected]/pkg/cache/cache.go:412:58: fields.Selector does not implement comparable
6:43:19 PM: /opt/buildhome/.gimme_cache/gopath/pkg/mod/sigs.k8s.io/[email protected]/pkg/cache/cache.go:442:20: fields.Selector does not implement comparable

@damdo
Copy link
Member Author

damdo commented Jan 17, 2024

@Ankitasw yes, and the following line states note: module requires Go 1.20.

Although I thought Netlify build environment already had Go 1.21 (see here) or am I missing something?

@damdo
Copy link
Member Author

damdo commented Jan 17, 2024

@Ankitasw Ok with a bit of trial and error the netlify deploy issue was due to the fact that the GO_VERSION env variable (already set this way prior to the PR) here

GO_VERSION = "1.21"
was ignored by netlify because it was not specifying the patch version. Once I added the patch version it started working again!

@damdo
Copy link
Member Author

damdo commented Jan 17, 2024

/test pull-cluster-api-provider-aws-e2e

@Ankitasw
Copy link
Member

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-eks

@damdo
Copy link
Member Author

damdo commented Jan 18, 2024

Ok I now tried adding some debug details to track down the reason for the VPC creation failure
Let's see if we get more out of it

/test pull-cluster-api-provider-aws-e2e

damdo added 2 commits January 18, 2024 11:52
following the deprecation of noderefutil, the package has now been removed from cluster-api
@damdo
Copy link
Member Author

damdo commented Jan 18, 2024

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-eks

@damdo
Copy link
Member Author

damdo commented Jan 18, 2024

It looks like the e2e EKS flaked early
/test pull-cluster-api-provider-aws-e2e-eks

@damdo
Copy link
Member Author

damdo commented Jan 18, 2024

/test pull-cluster-api-provider-aws-e2e
/test pull-cluster-api-provider-aws-e2e-eks

@damdo damdo requested a review from Ankitasw January 18, 2024 15:26
@damdo
Copy link
Member Author

damdo commented Jan 18, 2024

Finally it looks like e2e passed 🎉
Time for a formal review I guess.
I think we can set up a merge squash strategy for the commits to squash them all.
/assign @Ankitasw @richardcase @dlipovetsky

@k8s-ci-robot
Copy link
Contributor

@damdo: GitHub didn't allow me to assign the following users: dilyevsky.

Note that only kubernetes-sigs members with read permissions, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

In response to this:

Finally it looks like e2e passed 🎉
Time for a formal review I guess.
I think we can set up a merge squash strategy for the commits to squash them all.
/assign @Ankitasw @richardcase @dilyevsky

Instructions 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/test-infra repository.

Makefile Show resolved Hide resolved
netlify.toml Show resolved Hide resolved
@nrb
Copy link
Contributor

nrb commented Jan 18, 2024

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 18, 2024
@nrb nrb mentioned this pull request Jan 18, 2024
4 tasks
@nrb
Copy link
Contributor

nrb commented Jan 18, 2024

I think we can set up a merge squash strategy for the commits to squash them all.

/label tide/merge-method-squash

@k8s-ci-robot k8s-ci-robot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jan 18, 2024
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 18, 2024
@k8s-ci-robot k8s-ci-robot merged commit a1918aa into kubernetes-sigs:main Jan 18, 2024
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/support Categorizes issue or PR as a support question. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants