-
Notifications
You must be signed in to change notification settings - Fork 141
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
Regenerate CRDs using controller-gen v0.9.2
#105
Conversation
Signed-off-by: Michael Gasch <15986659+embano1@users.noreply.github.com>
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.
Good catch, thank you @embano1 !
Left one comment below
@@ -1,4 +1,3 @@ | |||
|
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.
The real real problem here is the controller-gen version we used to generate those files (v0.7.0
) - Check line 7 in both files. This bug was fixed in v0.8.0
(PR kubernetes-sigs/controller-tools#517).
Can please regenerate these file using v0.9.2
? it's the version we use for the generated controller now.
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.
Script to regen the CRDs is here https://github.com/aws-controllers-k8s/runtime/blob/main/scripts/build-apis.sh
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.
Sorry, not sure I fully understand: I'm using aws-controllers-k8s/code-generator@20e82a5
with aws-controllers-k8s/runtime@007e038
(i.e. latest
) to generate the files. From the tags those commits are way ahead of v0.[8|9].x
?
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.
And the weird thing is that the other service-related CRDs are created without the newline, i.e. only these two common files are somehow affected.
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.
Yep the service related CRD are generated using controller-gen v0.9.2 - the common CRDs were generated long time ago using v0.7.0.
The thing is that CRD files are generated using controller-gen
not ack-generate
.
Script that build service related CRDs: https://github.com/aws-controllers-k8s/code-generator/blob/main/scripts/build-controller.sh#L196-L200
Script that build common CRDs: https://github.com/aws-controllers-k8s/runtime/blob/main/scripts/build-apis.sh#L20-L22
Just pushed 25f7576 that regenerates the CRD files with controller-gen v0.9.2 |
v0.9.2
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: A-Hilaly, embano1 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 |
Signed-off-by: Michael Gasch 15986659+embano1@users.noreply.github.com
Description of changes: When using the Kubernetes
e2e-framework
for testing a CRD setup function fails due to the newline in the two bases CRDs provided by thisruntime
.The fix is to remove the newlines which should not cause any issues with ACK downstream dependencies, controllers, code-gen, etc.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.