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

Enhancement/taints #268

Merged
merged 4 commits into from
May 24, 2019
Merged

Enhancement/taints #268

merged 4 commits into from
May 24, 2019

Conversation

prashanth26
Copy link
Contributor

@prashanth26 prashanth26 commented May 23, 2019 •
edited
Loading

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #267

Special notes for your reviewer:

Release note:

Deletion of annotations, labels and taints are now supported

Multiple taints with the same key but different values are now supported

@prashanth26 prashanth26 added kind/enhancement Enhancement, improvement, extension priority/critical Needs to be resolved soon, because it impacts users negatively labels May 23, 2019
@prashanth26 prashanth26 requested a review from amshuman-kr May 23, 2019 09:24
@prashanth26 prashanth26 requested review from ggaurav10 and a team as code owners May 23, 2019 09:24
@gardener-robot-ci-1 gardener-robot-ci-1 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels May 23, 2019
@prashanth26 prashanth26 force-pushed the enhancement/taints branch from a49438e to de68325 Compare May 23, 2019 12:18
@prashanth26 prashanth26 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels May 23, 2019
@gardener-robot-ci-1 gardener-robot-ci-1 added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels May 23, 2019
@prashanth26
Allow updation of ALT using 3 way merge
7168f8e 
- Annotations, Labels & Taints deletion is now possible
- Multiple taints with same key and effect with different values are now possible
@prashanth26
Updated tests for ALT sync
2e139ac
@prashanth26 prashanth26 force-pushed the enhancement/taints branch from de68325 to 2e139ac Compare May 24, 2019 08:42
@prashanth26 prashanth26 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels May 24, 2019
@gardener-robot-ci-1 gardener-robot-ci-1 added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels May 24, 2019
@prashanth26 prashanth26 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels May 24, 2019
@gardener-robot-ci-1 gardener-robot-ci-1 added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels May 24, 2019
amshuman-kr
amshuman-kr suggested changes May 24, 2019
View reviewed changes
Copy link

@amshuman-kr amshuman-kr left a comment

Choose a reason for hiding this comment

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

Is the manual update to the Node case covered for annotations and labels as well?

pkg/controller/machine_util.go Outdated Show resolved Hide resolved
pkg/controller/machine_util.go Outdated Show resolved Hide resolved
pkg/controller/machine_util.go Outdated Show resolved Hide resolved
pkg/controller/machine_util.go Outdated Show resolved Hide resolved
pkg/controller/machine_util.go Outdated Show resolved Hide resolved
pkg/controller/machine_util.go Show resolved Hide resolved
@prashanth26 prashanth26 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels May 24, 2019
@gardener-robot-ci-1 gardener-robot-ci-1 added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels May 24, 2019
prashanth26
prashanth26 commented May 24, 2019
View reviewed changes
pkg/controller/machine_util_test.go
@@ -992,7 +993,7 @@ var _ = Describe("machine_util", func() {

waitForCacheSync(stop, c)

Expect(testNode.Spec.Taints).Should(Equal(expectedNode.Spec.Taints))
Expect(reflect.DeepEqual(testNode.Spec.Taints, expectedNode.Spec.Taints)).To(Equal(true))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Made this change to count for scenarios where slice ordering can differ. This was failing test cases occasionally.

@prashanth26
Copy link
Contributor Author

Hi Amshu,

I have the suggested changes and also added test cases for manual updates for annotations and labels - a1af86d.

@prashanth26 prashanth26 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels May 24, 2019
@gardener-robot-ci-1 gardener-robot-ci-1 added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels May 24, 2019
amshuman-kr
amshuman-kr approved these changes May 24, 2019
View reviewed changes
Copy link

@amshuman-kr amshuman-kr left a comment

Choose a reason for hiding this comment

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

LGTM

@prashanth26 prashanth26 merged commit 93e5505 into gardener:master May 24, 2019
@prashanth26 prashanth26 deleted the enhancement/taints branch July 17, 2019 08:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amshuman-kr amshuman-kr amshuman-kr approved these changes

@ggaurav10 ggaurav10 Awaiting requested review from ggaurav10

Assignees
No one assigned
Labels
kind/enhancement Enhancement, improvement, extension needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) priority/critical Needs to be resolved soon, because it impacts users negatively
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

MCM respects taints with only unique keys
3 participants
@prashanth26 @amshuman-kr @gardener-robot-ci-1