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.

Sign up for GitHub

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

Jump to bottom

kubectl taint: copy core taintutil dependency into kubectl #69446

Merged
merged 1 commit into from
Oct 12, 2018
Merged

kubectl taint: copy core taintutil dependency into kubectl #69446

merged 1 commit into from
Oct 12, 2018

Conversation

seans3
Copy link
Contributor

@seans3 seans3 commented Oct 4, 2018 •
edited

  • Copies some taintutil functions into kubectl taint command directory.
  • Removes core dependency on taintutil
  • The concept of copying utility code from core into kubectl has been discussed and approved for SIG CLI in order to move kubectl out of Kubernetes core.

Helps address:
kubernetes/kubectl#80

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 4, 2018
@seans3
Copy link
Contributor Author

seans3 commented Oct 4, 2018

/kind cleanup
/assign

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Oct 4, 2018
@seans3
Copy link
Contributor Author

seans3 commented Oct 4, 2018 •
edited

/sig cli
/area kubectl

@k8s-ci-robot k8s-ci-robot added area/kubectl sig/cli Categorizes an issue or PR as relevant to SIG CLI. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Oct 4, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: seans3

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 4, 2018
@seans3
Copy link
Contributor Author

seans3 commented Oct 5, 2018

/cc @soltysh

soltysh
soltysh requested changes Oct 5, 2018
View reviewed changes
Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/hold
I'm putting together a PR reshuffling all the commands into separate directories. Then copy only the necessary utils for taint command into that dir.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 5, 2018
@soltysh
Copy link
Contributor

soltysh commented Oct 5, 2018

See #69464 for the restructuring.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 6, 2018
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 8, 2018
@seans3
Copy link
Contributor Author

seans3 commented Oct 8, 2018

/hold

soltysh
soltysh requested changes Oct 9, 2018
View reviewed changes
Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

I've left you some comments. The rule of thumb is these should be private helpers to a specific command. We are already risking quite a bit by copying them, but we need to ensure that they should not escape from outside this command dir.

pkg/kubectl/cmd/taint/utils.go Outdated
)

// ParseTaints takes a spec which is an array and creates slices for new taints to be added, taints to be deleted.
func ParseTaints(spec []string) ([]corev1.Taint, []corev1.Taint, error) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you make it private?

pkg/kubectl/cmd/taint/utils.go Outdated

// ReorganizeTaints returns the updated set of taints, taking into account old taints that were not updated,
// old taints that were updated, old taints that were deleted, and new taints.
func ReorganizeTaints(node *corev1.Node, overwrite bool, taintsToAdd []corev1.Taint, taintsToRemove []corev1.Taint) (string, []corev1.Taint, error) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Ditto?

pkg/kubectl/cmd/taint/utils.go Outdated
}

// CheckIfTaintsAlreadyExists checks if the node already has taints that we want to add and returns a string with taint keys.
func CheckIfTaintsAlreadyExists(oldTaints []corev1.Taint, taints []corev1.Taint) string {
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

pkg/kubectl/cmd/taint/utils.go Outdated
}

// DeleteTaintsByKey removes all the taints that have the same key to given taintKey
func DeleteTaintsByKey(taints []corev1.Taint, taintKey string) ([]corev1.Taint, bool) {
Copy link
Contributor

Choose a reason for hiding this comment

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

And here.

pkg/kubectl/cmd/taint/utils.go Outdated
}

// DeleteTaint removes all the taints that have the same key and effect to given taintToDelete.
func DeleteTaint(taints []corev1.Taint, taintToDelete *corev1.Taint) ([]corev1.Taint, bool) {
Copy link
Contributor

Choose a reason for hiding this comment

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

That too.

pkg/kubectl/cmd/taint/utils.go Outdated
@@ -0,0 +1,209 @@
/*
Copyright 2016 The Kubernetes Authors.
Copy link
Contributor

Choose a reason for hiding this comment

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

Since this is a new file you might need to update the date to current year.

@seans3 seans3 force-pushed the taint-fix branch 2 times, most recently from 8431a4f to 8f57054 Compare October 9, 2018 19:38
@juanvallejo
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 12, 2018
soltysh
soltysh approved these changes Oct 12, 2018
View reviewed changes
Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm

@soltysh
Copy link
Contributor

soltysh commented Oct 12, 2018

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 12, 2018
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 12, 2018
@juanvallejo
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 12, 2018
@k8s-ci-robot k8s-ci-robot merged commit b66d58c into kubernetes:master Oct 12, 2018
@seans3 seans3 deleted the taint-fix branch October 12, 2018 23:03
@dlipovetsky dlipovetsky mentioned this pull request Feb 16, 2019
Merged
3 tasks
@mengjiao-liu mengjiao-liu mentioned this pull request Sep 15, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@soltysh soltysh soltysh approved these changes

@juanvallejo juanvallejo juanvallejo approved these changes

@ghodss ghodss Awaiting requested review from ghodss

Assignees

@soltysh soltysh

@juanvallejo juanvallejo

@seans3 seans3

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubectl cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. sig/cli Categorizes an issue or PR as relevant to SIG CLI. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@seans3 @k8s-ci-robot @soltysh @juanvallejo