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: add applicationset to crds generated by gen-crd-spec #10833
fix: add applicationset to crds generated by gen-crd-spec #10833
Conversation
Signed-off-by: Richard Jennings <richardjennings@gmail.com>
065166f
to
3a039b3
Compare
Signed-off-by: Richard Jennings <richardjennings@gmail.com>
Ishita had previously consolidated the Application and ApplicationSet CRD codegen logic. In doing so, we lost the -func getCustomResourceDefinitions() map[string]*extensionsobj.CustomResourceDefinition {
+func getCRDApplicationset() map[string]*extensionsobj.CustomResourceDefinition {
crdYamlBytes, err := exec.Command(
"controller-gen",
- "paths=./pkg/apis/application/...",
- "crd:trivialVersions=true",
- "crd:crdVersions=v1",
+ "paths=./pkg/apis/applicationset/...",
+ "crd:crdVersions=v1,maxDescLen=0",
"output:crd:stdout",
).Output()
checkErr(err) I'm not sure what the proper fix is. We're currently using this one I wonder if Alternatively, we could add a post-processing step to strip the description fields from the AppliationSet CRD. |
Codecov ReportBase: 45.67% // Head: 45.67% // No change to project coverage 👍
Additional details and impacted files@@ Coverage Diff @@
## master #10833 +/- ##
=======================================
Coverage 45.67% 45.67%
=======================================
Files 236 236
Lines 28697 28697
=======================================
Hits 13106 13106
Misses 13799 13799
Partials 1792 1792
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
0cd2cf6
to
8a15bb0
Compare
Signed-off-by: Richard Jennings <richardjennings@gmail.com>
8a15bb0
to
a31eb52
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nicely done, thanks @richardjennings!
* add applicationset to crds generated Signed-off-by: Richard Jennings <richardjennings@gmail.com> * update applicationset crd Signed-off-by: Richard Jennings <richardjennings@gmail.com> * remove description from applicationset crd Signed-off-by: Richard Jennings <richardjennings@gmail.com> Signed-off-by: Richard Jennings <richardjennings@gmail.com>
* add applicationset to crds generated Signed-off-by: Richard Jennings <richardjennings@gmail.com> * update applicationset crd Signed-off-by: Richard Jennings <richardjennings@gmail.com> * remove description from applicationset crd Signed-off-by: Richard Jennings <richardjennings@gmail.com> Signed-off-by: Richard Jennings <richardjennings@gmail.com>
Cherry-picked onto release-2.4 for 2.4.15 and release-2.5 for 2.5.0-rc1. |
…0833) * add applicationset to crds generated Signed-off-by: Richard Jennings <richardjennings@gmail.com> * update applicationset crd Signed-off-by: Richard Jennings <richardjennings@gmail.com> * remove description from applicationset crd Signed-off-by: Richard Jennings <richardjennings@gmail.com> Signed-off-by: Richard Jennings <richardjennings@gmail.com>
Reverted cherry-pick onto 2.4. Doesn't make sense for it to be there, because the CRD generation changes didn't happen until 2.5. :-) |
Note on DCO:
If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.
Checklist: