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

✨ (Kustomize/v2, go/v4): upgrade controller-tools from 0.12.0 to 0.13.0 #3561

Merged

Conversation

Kavinjsir
Copy link
Contributor

Description

Bump controller-tools to v0.13.0

Motivation

Partially resolve #3549 to support Kubernetes v1.28.0

@k8s-ci-robot k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 26, 2023
Copy link
Member

@camilamacedo86 camilamacedo86 left a comment

Choose a reason for hiding this comment

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

Hi @Kavinjsir

Yep that is great.
Thank you for the collaboration 🥇

Just few nits:

  • missing run make generate
  • the title of the PR needs to use the emoj :sparkles: so that it will be used to generate teh release notes. Also, would be good we do something like ":sparkles: (Kustomize/v2, go/v4): upgrade controller-tools from 0.12.0 to 0.13.0" (this one I updated. I hope that you do not mind)

@camilamacedo86 camilamacedo86 changed the title 🌱: Bump controller-tools ✨ (Kustomize/v2, go/v4): upgrade controller-tools from 0.12.0 to 0.13.0 Aug 26, 2023
Copy link
Member

@camilamacedo86 camilamacedo86 left a comment

Choose a reason for hiding this comment

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

Great

/approved

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 26, 2023
@camilamacedo86
Copy link
Member

@Kavinjsir please see that we need to fix the commit message
It is making the CI falling
Screenshot 2023-08-26 at 06 11 18

@camilamacedo86 camilamacedo86 removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Aug 26, 2023
@k8s-ci-robot k8s-ci-robot added the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Aug 26, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Aug 26, 2023
@camilamacedo86
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 26, 2023
@Kavinjsir
Copy link
Contributor Author

Hey @camilamacedo86 , sorry I just saw your reviews. Thx for helping me with fixing a number errors in the PR!!

For now, it looks two issues I'm not quite sure:

  1. make apidiff would fail due to the unmatched controller-tools version from the master branch.
  2. It seems like the CI stage Test verification failed due to some changes in the docs directory. I'm looking on that now, the interesting thing is: either make generate or make generate-docs or make check-docs worked fine from my local...

@camilamacedo86
Copy link
Member

HI @Kavinjsir,

make apidiff would fail due to the unmatched controller-tools version from the master branch.
That is expected. We need to force when we do those bumps.

It seems like the CI stage Test verification failed due to some changes in the docs directory. I'm looking on that now, the interesting thing is: either make generate or make generate-docs or make check-docs worked fine from my local...

It seems that in the script to generate the docs it is missing we call go mod tidy
See the error

TODO: update tutorial
  running: go get github.com/robfig/cron
  running: make build
  running: go get github.com/robfig/cron
  running: make build
 M docs/book/src/cronjob-tutorial/testdata/project/go.sum
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/go.sum b/docs/book/src/cronjob-tutorial/testdata/project/go.sum
index 2f447cd..da86b48 100644
--- a/docs/book/src/cronjob-tutorial/testdata/project/go.sum
make: *** [Makefile:80: check-docs] Error 1
+++ b/docs/book/src/cronjob-tutorial/testdata/project/go.sum

@k8s-ci-robot
Copy link
Contributor

New changes are detected. LGTM label has been removed.

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 26, 2023
@Kavinjsir
Copy link
Contributor Author

/test pull-kubebuilder-e2e-k8s-1-25-3

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86, Kavinjsir

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

@camilamacedo86 camilamacedo86 merged commit 4d1e3c5 into kubernetes-sigs:master Aug 26, 2023
15 of 17 checks passed
yyy1000 pushed a commit to yyy1000/kubebuilder that referenced this pull request Aug 27, 2023
….0 (kubernetes-sigs#3561)

(go/v4): Upgrade controller-tools from 0.12.0 to v0.13.0
yyy1000 added a commit to yyy1000/kubebuilder that referenced this pull request Aug 27, 2023
feat: get data

feat: add change

feat: remove log

feat: add e2e test

build(deps): bump golang.org/x/tools from 0.11.0 to 0.12.0

Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.11.0 to 0.12.0.
- [Release notes](https://github.com/golang/tools/releases)
- [Commits](golang/tools@v0.11.0...v0.12.0)

---
updated-dependencies:
- dependency-name: golang.org/x/tools
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

chore(docs): change folder pkg to internal/controller in the migration guide

fix: ensure external plugin can scaffold files in new dirs

:seedling: Image name edge cases covered (kubernetes-sigs#3514)

imagename edge case cover

:seedling: logs info updated (kubernetes-sigs#3512)

logs info updated

:bug: fix doc preview

🐛: sync kb binary from source code for docs (kubernetes-sigs#3520)

fix: sync kb binary from source code for docs

:bug: fix typos in scaffolded makefiles

:book: fix escaped html in markdown code segments

:bug: (go/v4) fix makefile target to build images ensuring its single responsability

refactor: externalize cfg

:bug: (deployimage): fix e2e tests which are using go/v3 which is deprecated. Ensure that we are using the go/v4

ensure that we call go tidy when we generate sample docs

:sparkles: (Kustomize/v2, go/v4): upgrade controller-tools from 0.12.0 to 0.13.0 (kubernetes-sigs#3561)

(go/v4): Upgrade controller-tools from 0.12.0 to v0.13.0

:sparkles: improve logs from alpha command generate

:bug: (deployimage/v1-beta1): fix scaffold with multigroup and add optional plugins to multigroup sample to validate changes

:bug: change deprecated warning to yellow

feat: remove quota

fix: add space

fix: change kind

Update test/e2e/alphagenerate/generate_test.go

Co-authored-by: Tony (TianYi) <kavinjsir@gmail.com>
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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bump K8s dependencies to 1.28
3 participants