Skip to content

Move scaffold pkg and test project from controller-tools#433

Merged
k8s-ci-robot merged 3 commits intokubernetes-sigs:masterfrom
mengqiy:move_scaffolding
Oct 11, 2018
Merged

Move scaffold pkg and test project from controller-tools#433
k8s-ci-robot merged 3 commits intokubernetes-sigs:masterfrom
mengqiy:move_scaffolding

Conversation

@mengqiy
Copy link
Copy Markdown
Member

@mengqiy mengqiy commented Oct 11, 2018

1st commit: move scaffold pkg and adjust the import path in KB repo (e.g. from "sigs.k8s.io/controller-tools/pkg/scaffold" to "sigs.k8s.io/kubebuilder/pkg/scaffold")
2nd commit: move test project and adjust the paths in generated-golden.sh (e.g. change ../vendor to ../../vendor) and re-run generated-golden.sh to adjust the import path in the test project (e.g. from "sigs.k8s.io/controller-tools/test/pkg/apis" to "sigs.k8s.io/kubebuilder/test/project/pkg/apis").
3rd commit: kubebuilder require k8s.io/code-generator to be present in vendor, so add required pkgs and re-run dep ensure.

Things TODO:

  • add tests to run generated-golden.sh and ensure the generated test project is same as the one in test/project/ and it can make. This will be done in a separate PR since it's not part of the move, controller-tools repo doesn't run generated-golden.sh in the test.

@mengqiy mengqiy requested review from Liujingfang1 and droot October 11, 2018 17:50
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 11, 2018
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mengqiy

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 11, 2018
@droot droot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 11, 2018
@k8s-ci-robot k8s-ci-robot merged commit 9ae8640 into kubernetes-sigs:master Oct 11, 2018
@mengqiy mengqiy deleted the move_scaffolding branch October 11, 2018 18:09
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