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.

Sign up for GitHub

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

Jump to bottom

⚠️ Generate v1alpha4 types #2121

Merged
merged 6 commits into from
Apr 28, 2021
Merged

⚠️ Generate v1alpha4 types #2121

merged 6 commits into from
Apr 28, 2021

Conversation

sedefsavas
Copy link
Contributor

@sedefsavas sedefsavas commented Nov 24, 2020 •
edited
Loading

/kind api-change
What this PR does / why we need it:

There are many changes we want to add in v1alpha4 but the purpose of this PR is just to open the main branch to v1alpha4 changes, we can start merging all the changes for v1alpha4 after that.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #1969, #2076

Release note:

Generate v1alpha4 API version types and remove v1alpha2 types

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 24, 2020
@sedefsavas sedefsavas mentioned this pull request Nov 24, 2020
Closed
@sedefsavas
Copy link
Contributor Author

sedefsavas commented Nov 25, 2020 •
edited
Loading

TODO:
Include this in this PR: kubernetes-sigs/cluster-api#3756
Unhold test-infra changes: kubernetes/test-infra#20036

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 30, 2020
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 7, 2020
@sedefsavas sedefsavas changed the title [WIP] ⚠️ Generate v1alpha4 types ⚠️ Generate v1alpha4 types Dec 7, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 7, 2020
@sedefsavas sedefsavas force-pushed the v1alpha42 branch 5 times, most recently from a1d2007 to f044b20 Compare December 7, 2020 15:07
@sedefsavas
Copy link
Contributor Author

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

@sedefsavas sedefsavas force-pushed the v1alpha42 branch 2 times, most recently from f5b7964 to cbe18c4 Compare December 7, 2020 16:33
@sedefsavas
Copy link
Contributor Author

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

@sedefsavas
Copy link
Contributor Author

This PR is ready for review now. Since new PRs may require significant change in this api creation, hoping to merge this to master soon. For example, even bumping controller-runtime from v0.7.0-alpha.5 to v0.7.0-alpha.8 required bunch of changes.
cc @randomvariable @richardcase @MarcusNoble

e2e tests are failing because CAPI does not have a release with v1alpha4 types yet (there is a plan to release one this week, will update the e2e-conf.yaml accordingly after that).

make verify is locally passing, but it is failing on prow due to kubekins-e2e:v20201111-a263fd7-1.19 we are using in our prow tests, somewhere it has an earlier version of github.com/googleapis/gnostic and that version has this file: OpenAPIv2.go, whereas newer versions of gnostic has openapiv1, so getting this error:

github.com/googleapis/gnostic/OpenAPIv2: module github.com/googleapis/gnostic@latest found (v0.5.3), but does not contain package github.com/googleapis/gnostic/OpenAPIv2

Couldn't find how to solve this yet.

@richardcase
Copy link
Member

Great, will take a look in the morning.

@sedefsavas sedefsavas mentioned this pull request Dec 9, 2020
Closed
MarcusNoble
MarcusNoble suggested changes Dec 10, 2020
View reviewed changes
api/v1alpha4/awscluster_types.go Show resolved Hide resolved
api/v1alpha4/awscluster_types.go Show resolved Hide resolved
api/v1alpha4/awscluster_types.go Show resolved Hide resolved
api/v1alpha4/awsmachine_types.go Show resolved Hide resolved
api/v1alpha4/conditions_consts.go Show resolved Hide resolved
exp/api/v1alpha4/types.go Show resolved Hide resolved
exp/api/v1alpha4/types.go Show resolved Hide resolved
exp/api/v1alpha4/types.go Show resolved Hide resolved
exp/api/v1alpha4/types.go Show resolved Hide resolved
hack/ensure-kubectl.sh Outdated Show resolved Hide resolved
@sedefsavas sedefsavas mentioned this pull request Dec 10, 2020
Closed
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 10, 2020
@sedefsavas
Copy link
Contributor Author

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

@sedefsavas
Copy link
Contributor Author

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

One of the problems, eks test were not passing was e2e clean-up: in e2e tests, we need to use cluster-api DeleteCluster instead of DeleteClusterAndWait because the global resources remain and it fails.

@sedefsavas
Copy link
Contributor Author

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

@sedefsavas sedefsavas mentioned this pull request Apr 27, 2021
Closed
4 tasks
@randomvariable
Copy link
Member

/override pull-cluster-api-provider-aws-build-release-0-6

@k8s-ci-robot
Copy link
Contributor

@randomvariable: Overrode contexts on behalf of randomvariable: pull-cluster-api-provider-aws-build-release-0-6

In response to this:

/override pull-cluster-api-provider-aws-build-release-0-6

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.

richardcase
richardcase approved these changes Apr 27, 2021
View reviewed changes
Copy link
Member

@richardcase richardcase left a comment

Choose a reason for hiding this comment

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

This last commit looks good to me so:

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 27, 2021
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 28, 2021
@randomvariable
Copy link
Member

/override pull-cluster-api-provider-aws-build-release-0-6

@k8s-ci-robot
Copy link
Contributor

@randomvariable: Overrode contexts on behalf of randomvariable: pull-cluster-api-provider-aws-build-release-0-6

In response to this:

/override pull-cluster-api-provider-aws-build-release-0-6

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.

@randomvariable
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 28, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: randomvariable

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 Apr 28, 2021
@k8s-ci-robot k8s-ci-robot merged commit 72f4dad into kubernetes-sigs:main Apr 28, 2021
enxebre added a commit to enxebre/cluster-api-provider-aws-2 that referenced this pull request Jun 1, 2021
@enxebre
Reword wrong webhook usage
52625be 
After kubernetes-sigs#2121 webhooks are enable by default.
@enxebre enxebre mentioned this pull request Jun 1, 2021
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarcusNoble MarcusNoble MarcusNoble requested changes

@sbueringer sbueringer sbueringer left review comments

@randomvariable randomvariable randomvariable left review comments

@richardcase richardcase richardcase approved these changes

@ncdc ncdc Awaiting requested review from ncdc

Assignees

@richardcase richardcase

@randomvariable randomvariable

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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.
Projects
None yet
Milestone
v0.7.0
Development

Successfully merging this pull request may close these issues.

Create v1alpha4 types, conversion webhooks from v1alpha3 to v1alpha4 and remove v1alpha2
8 participants
@sedefsavas @richardcase @dongsupark @randomvariable @invidian @k8s-ci-robot @sbueringer @MarcusNoble