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

Update controller-tools and CRDs #7634

Merged
merged 2 commits into from
Oct 5, 2019
Merged

Conversation

rifelpet
Copy link
Member

@rifelpet rifelpet commented Sep 19, 2019

The make crds task is currently broken on master because:

  1. controller-tools is no longer in the vendor directory after the switch to go mod. The tools.go addition fixes that.
  2. controller-tools 1.1.0 was depending on a conflicting version of the k8s.io/api and needed updating to the very latest commit in order to pick up support for 1.15.

Marking WIP because i haven't had a chance to actually test the CRDs yet and do a structural yamldiff to look for any unexpected changes.
/hold

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. 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 Sep 19, 2019
@justinsb
Copy link
Member

Thanks for doing this. Two things:

@rifelpet
Copy link
Member Author

rifelpet commented Sep 29, 2019

Thanks for the suggestions! I'm still fighting some dependency version compatibility issues, but the new CRD yamls are looking much better. I'll try to get the remaining issues addressed soon.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 30, 2019
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 30, 2019
@rifelpet rifelpet force-pushed the crds-fix branch 2 times, most recently from dfe9b32 to f3a0f0b Compare October 1, 2019 22:22
@rifelpet
Copy link
Member Author

rifelpet commented Oct 1, 2019

@justinsb reran the go get and everything worked better this time :) CRD diffs are looking good overall too

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 1, 2019
@rifelpet rifelpet changed the title Update CRDs Update controller-tools and CRDs Oct 1, 2019
@justinsb
Copy link
Member

justinsb commented Oct 5, 2019

Thanks for doing this!

/approve
/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb, rifelpet

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 Oct 5, 2019
@k8s-ci-robot k8s-ci-robot merged commit 099d4dc into kubernetes:master Oct 5, 2019
justinsb added a commit to justinsb/kops that referenced this pull request Dec 18, 2019
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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.

3 participants