-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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 group issue and add age column to DockerMachinePools #5206
⚠️ Fix group issue and add age column to DockerMachinePools #5206
Conversation
Hi @Jont828. Thanks for your PR. I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. 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. |
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.
lgtm
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.
/ok-to-test
...tructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinetemplates.yaml
Outdated
Show resolved
Hide resolved
3cb466a
to
87afbf5
Compare
@@ -195,7 +195,12 @@ spec: | |||
storage: false | |||
subresources: | |||
status: {} | |||
- name: v1alpha4 | |||
- additionalPrinterColumns: |
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.
AFAIK if there are no additionalPrinterColumns
the CRD gets an age column automatically, is the idea here that we add the age column everywhere in case we add others printer columns later?
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.
Yes, there is no way to do it automatically (it's only added per default if no additionalPrinterColumns
are configured).
Some additional context: #5180 (comment) (especially apiextensions/helpers.go).
So yes, the idea is to add it everywhere now, so we don't forget to add it later.
I've changed the template in DockerMachinePool in both v1alpha3 and v1alpha4 from |
@Jont828 I think we should probably call it I'm not 100% sure about the conversion. In general, it should be possible to convert the type (we have a few examples in other packages). But not sure if we still have the problem in the CRD if we keep the struct in v1alpha3 the same. Given that CAPD is mainly used for development purposes it could be fine to even change the old struct. |
@sbueringer That makes sense, I guess it's just an awkward case of the desired name being taken. As for the conversion, I discussed w/ Cecile and she mentioned that in changing AzureMachineTemplate, she had to update the name in both v1alpha3 and v1alpha4. I think changing the v1alpha3 struct is probably fine since the json name is still the same and I don't believe the type gets directly accessed (unless I'm mistaken). |
a16e1e4
to
58eb963
Compare
/lgtm |
@Jont828 Please squash commits |
/approve Let's let the bot merge squash and merge |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: vincepri 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 |
…es-sigs#5206) * Fix group issue and add age column to DockerMachinePools * Rename 'DockerMachineTemplate' to 'DockerMachinePoolTemplate' * Regenerate CRD for DockerMachinePool * Regenerate DockerMachinePool for v1alpha3 with new template type * Fix comment * Rename 'DockerMachinePoolTemplate' to 'DockerMachinePoolMachineTemplate' * Regenerate for 'DockerMachinePoolMachineTemplate'
…es-sigs#5206) * Fix group issue and add age column to DockerMachinePools * Rename 'DockerMachineTemplate' to 'DockerMachinePoolTemplate' * Regenerate CRD for DockerMachinePool * Regenerate DockerMachinePool for v1alpha3 with new template type * Fix comment * Rename 'DockerMachinePoolTemplate' to 'DockerMachinePoolMachineTemplate' * Regenerate for 'DockerMachinePoolMachineTemplate'
…es-sigs#5206) * Fix group issue and add age column to DockerMachinePools * Rename 'DockerMachineTemplate' to 'DockerMachinePoolTemplate' * Regenerate CRD for DockerMachinePool * Regenerate DockerMachinePool for v1alpha3 with new template type * Fix comment * Rename 'DockerMachinePoolTemplate' to 'DockerMachinePoolMachineTemplate' * Regenerate for 'DockerMachinePoolMachineTemplate'
What this PR does / why we need it: Follow up to #5180. There was an issue with DockerMachinePools having the wrong CRD name generated (
exp.infrastructure.cluster.x-k8s.io_dockermachinepools.yaml
instead ofinfrastructure.cluster.x-k8s.io_dockermachinepools.yaml
), and so the age column was not added in #5180. This corrects the issue and adds the age column as well.Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close the issue(s) when PR gets merged):Fixes #5159