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

Rename master -> control-plane and support control-plane node taint #53

Merged

Conversation

malt3
Copy link
Contributor

@malt3 malt3 commented Aug 30, 2022

Extending on my other PR, the old naming of "master" is long deprecated and control-plane is used instead. This PR renames mentions of master to be called control-plane instead and adds support to detect control-plane nodes using the control-plane node taint node-role.kubernetes.io/control-plane.

This is quite a large change so I understand if not all parts are accepted.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 30, 2022

Hi @malt3. Thanks for your PR.

I'm waiting for a medik8s member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

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.

@malt3 malt3 changed the title Rename master -> contro-plane and support control-plane node taint Rename master -> control-plane and support control-plane node taint Aug 30, 2022
@razo7
Copy link
Member

razo7 commented Aug 31, 2022

/ok-to-test

Copy link
Member

@slintes slintes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this follow up to #52 👍🏼
Looks mostly good to me, but I spotted 2 places where I think we need to use both old and new master / control-plane labels for backwards compatibility.

@razo7
Copy link
Member

razo7 commented Sep 8, 2022

We prefer to support both of the names, master, and control-plane, since we plan to support old OCP versions, where there are only master and worker roles.
Therefore, it would be better if you can rename master -> master/control-plane for logs. @malt3

@malt3 malt3 force-pushed the fix/rename-master-control-plane branch from ee9917d to b914b74 Compare September 8, 2022 10:08
Copy link
Member

@slintes slintes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the quick update!

@openshift-ci openshift-ci bot added the lgtm label Sep 8, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 8, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: malt3, slintes

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

@openshift-ci openshift-ci bot added the approved label Sep 8, 2022
@slintes
Copy link
Member

slintes commented Sep 8, 2022

/hold

leaving final review to @razo7

@razo7
Copy link
Member

razo7 commented Sep 8, 2022

/lgtm
Thanks for the help @malt3 !

@malt3
Copy link
Contributor Author

malt3 commented Sep 8, 2022

Great! Should I squash the changes or will the bot take care of that?

@razo7
Copy link
Member

razo7 commented Sep 8, 2022

The bot doesn't squash commits. Please squash them.

@malt3 malt3 force-pushed the fix/rename-master-control-plane branch from b914b74 to 0164d77 Compare September 8, 2022 11:39
@openshift-ci openshift-ci bot removed the lgtm label Sep 8, 2022
@malt3 malt3 force-pushed the fix/rename-master-control-plane branch from 0164d77 to 9f94850 Compare September 8, 2022 11:40
@razo7
Copy link
Member

razo7 commented Sep 8, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Sep 8, 2022
@slintes
Copy link
Member

slintes commented Sep 8, 2022

/hold cancel

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.

4 participants