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

[release-1.6] 🌱 Refactor how tools are built to align with CAPI and get rid of tools go.mod #2095

Merged
merged 1 commit into from
Jul 28, 2023
Merged

[release-1.6] 🌱 Refactor how tools are built to align with CAPI and get rid of tools go.mod #2095

merged 1 commit into from
Jul 28, 2023

Conversation

chrischdi
Copy link
Member

Manual cherry-pick of #2080

Remove go module in hack/tools and align to core CAPI with regards to tools installation

  • Uses hack/go-install.sh to install:
    • setup-envtest
    • conversion-gen
    • go-apidiff
    • ginkgo
    • kind
  • Uses hack/go-tools-build.sh to install:
    • conversion-verifier
    • release-notes
  • Adjusts help display function to core CAPI
  • Reorders definitions in Makefile to improve comparability to core CAPI Makefile
  • Implements hack/go-tools-build.sh to install binaries from sigs.k8s.io/cluster-api/hack/tools/...
  • Removes Makefile and go module in hack/tools

What this PR does / why we need it:

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

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 26, 2023
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jul 26, 2023
@chrischdi
Copy link
Member Author

/retest

@chrischdi
Copy link
Member Author

@chrischdi: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-vsphere-apidiff-main 4ec0136 link false /test pull-cluster-api-provider-vsphere-apidiff-main
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Curious where this comes from. Its neither changed by this MR nor the go-apidiff version was changed 🤔

@chrischdi
Copy link
Member Author

/hold

to bump go-apidiff

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 26, 2023
@chrischdi
Copy link
Member Author

/hold cancel

Bumped go-apidiff to the same as release-1.7 and main

@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 Jul 26, 2023
sbueringer
sbueringer reviewed Jul 26, 2023
View reviewed changes
Makefile Show resolved Hide resolved
@chrischdi
Remove go module in hack/tools and align to core CAPI with regards to…
f1585b7 
… tools installation.

* Uses hack/go-install.sh to install:
  * setup-envtest
  * conversion-gen
  * go-apidiff
  * ginkgo
  * kind
* Uses hack/go-tools-build.sh to install:
  * conversion-verifier
  * release-notes
* Adjusts help display function to core CAPI
* Reorders definitions in Makefile to improve comparability to core CAPI Makefile
* Implements hack/go-tools-build.sh to install binaries from sigs.k8s.io/cluster-api/hack/tools/...
* Removes Makefile and go module in hack/tools
@sbueringer
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 Jul 26, 2023
@randomvariable
Copy link
Member

/approve

@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 Jul 28, 2023
@k8s-ci-robot k8s-ci-robot merged commit 39712df into kubernetes-sigs:release-1.6 Jul 28, 2023
4 checks passed
@chrischdi chrischdi deleted the pr-makefile-sync-1-6 branch July 28, 2023 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@MaxRink MaxRink Awaiting requested review from MaxRink

@vrabbi vrabbi Awaiting requested review from vrabbi

Assignees

@sbueringer sbueringer

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@chrischdi @sbueringer @randomvariable @k8s-ci-robot