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

Fix generate #25

Closed
wants to merge 3 commits into from
Closed

Conversation

johnbelamaric
Copy link
Member

This is a WIP that shows some of the changes needed to fix the make generate target. We may be better off reworking some of the code gen, I am not sure. I couldn't get some of it to work without spending more time digging into the tools.

@nephio-prow nephio-prow bot requested review from s3wong and tliron February 26, 2024 23:26
Copy link
Contributor

nephio-prow bot commented Feb 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johnbelamaric

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

@nephio-prow nephio-prow bot added the approved label Feb 26, 2024
@johnbelamaric
Copy link
Member Author

/hold

@johnbelamaric
Copy link
Member Author

Basically, someone just has to go through file by file and try out the various go:generate directives and get them to work...

[hi on] jbelamaric@jbelamaric:~/proj/gh/johnbelamaric/porch$ grep -r go:generate .
./api/porchconfig/v1alpha1/groupversion_info.go://go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../scripts/boilerplate.go.txt" crd:crdVersions=v1 output:crd:artifacts:config=. paths=./...
./api/porch/doc.go://go:generate go run k8s.io/code-generator/cmd/deepcopy-gen --input-dirs ../porch,v1alpha1 -O zz_generated.deepcopy --go-header-file ../../scripts/boilerplate.go.txt
./api/porch/doc.go://go:generate go run k8s.io/code-generator/cmd/openapi-gen --input-dirs github.com/nephio-project/porch/api/porch/v1alpha1 --input-dirs k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/version -p ../generated/openapi -O zz_generated.openapi --go-header-file ../../scripts/boilerplate.go.txt
./api/porch/v1alpha1/doc.go://go:generate go run k8s.io/code-generator/cmd/deepcopy-gen@v0.25.3 --input-dirs ../v1alpha1 -O zz_generated.deepcopy --go-header-file ../../../scripts/boilerplate.go.txt
./api/porch/v1alpha1/doc.go://go:generate go run k8s.io/code-generator/cmd/defaulter-gen --input-dirs ../v1alpha1 -O zz_generated.defaults --go-header-file ../../../scripts/boilerplate.go.txt
./api/porch/v1alpha1/doc.go://go:generate go run k8s.io/code-generator/cmd/client-gen --clientset-name versioned --input-base "" --input porch/v1alpha1 -p ../../generated/clientset --plural-exceptions PackageRevisionResources:PackageRevisionResources --go-header-file ../../../scripts/boilerplate.go.txt
./api/porch/v1alpha1/doc.go://go:generate go run k8s.io/code-generator/cmd/lister-gen --input-dirs github.com/nephio-project/porch/api/porch/v1alpha1 -p ../../generated/listers --go-header-file ../../../scripts/boilerplate.go.txt
./api/porch/v1alpha1/doc.go://go:generate go run k8s.io/code-generator/cmd/informer-gen --input-dirs github.com/nephio-project/porch/api/porch/v1alpha1 --versioned-clientset-package github.com/nephio-project/porch/api/generated/clientset/versioned --listers-package github.com/nephio-project/porch/api/generated/listers --internal-clientset-package github.com/nephio-project/porch/api/generated/informers/internalversion -p github.com/nephio-project/porch/api/generated/informers --plural-exceptions PackageRevisionResources:PackageRevisionResources --go-header-file ../../../scripts/boilerplate.go.txt
./api/porch/v1alpha1/doc.go://go:generate go run k8s.io/code-generator/cmd/conversion-gen --input-dirs ../../porch,../v1alpha1 -O zz_generated.conversion --go-header-file ../../../scripts/boilerplate.go.txt
./internal/api/porchinternal/v1alpha1/groupversion_info.go://go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../scripts/boilerplate.go.txt" crd:crdVersions=v1 output:crd:artifacts:config=. paths=./...
./pkg/kpt/api/kptfile/v1/types.go://go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../porch/scripts/boilerplate.go.txt"
./pkg/git/git.go://go:generate go run golang.org/x/tools/cmd/stringer -type=MainBranchStrategy -linecomment
./controllers/packagevariants/api/v1alpha1/groupversion_info.go://go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
./controllers/packagevariants/pkg/controllers/packagevariant/packagevariant_controller.go://go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers-packagevariants webhook paths="." output:rbac:artifacts:config=../../../config/rbac
./controllers/fleetsyncs/api/v1alpha1/groupversion_info.go://go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
./controllers/fleetsyncs/pkg/controllers/fleetsync/controller.go://go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers-fleetsyncs webhook paths="." output:rbac:artifacts:config=../../../config/rbac
./controllers/packagevariantsets/api/v1alpha2/groupversion_info.go://go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
./controllers/packagevariantsets/api/v1alpha1/groupversion_info.go://go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 object:headerFile="../../../../scripts/boilerplate.go.txt" paths="./..."
./controllers/packagevariantsets/pkg/controllers/packagevariantset/packagevariantset_controller.go://go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers-packagevariantsets webhook paths="." output:rbac:artifacts:config=../../../config/rbac
./controllers/main.go://go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 rbac:roleName=porch-controllers webhook paths="."
./controllers/main.go://go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 crd paths="./..." output:crd:artifacts:config=config/crd/bases

@liamfallon
Copy link
Member

@johnbelamaric I guess we can close this one now that #35 is merged?

@johnbelamaric
Copy link
Member Author

/close

Thanks for the great work :)

Copy link
Contributor

nephio-prow bot commented Apr 15, 2024

@johnbelamaric: Closed this PR.

In response to this:

/close

Thanks for the great work :)

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.

@nephio-prow nephio-prow bot closed this Apr 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants