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

Revert "Ignore daemonset-controller-hash label key in federation before comparing the federated object with its cluster equivalent." #47473

Merged
merged 1 commit into from
Jun 16, 2017

Conversation

janetkuo
Copy link
Member

@janetkuo janetkuo commented Jun 14, 2017

This reverts commit 3530c9c.

This needs to wait for #47258, otherwise federation test won't pass (merged)

Release note:

NONE

…fore comparing the federated object with its cluster equivalent."

This reverts commit 3530c9c.
@janetkuo janetkuo added this to the v1.7 milestone Jun 14, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 14, 2017
@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-none Denotes a PR that doesn't merit a release note. labels Jun 14, 2017
@madhusudancs
Copy link
Contributor

/approve

@janetkuo code LGTM. I will apply the label once PR #47258 is merged and the clusters are recycled.

@madhusudancs
Copy link
Contributor

/retest

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 14, 2017
@janetkuo
Copy link
Member Author

#47258 was merged

@madhusudancs
Copy link
Contributor

@janetkuo let's wait until midnight for clusters to recycle.

@janetkuo
Copy link
Member Author

/retest

@janetkuo
Copy link
Member Author

/retest

failure seems unrelated

@janetkuo
Copy link
Member Author

janetkuo commented Jun 15, 2017

federation is broken: #46827, waiting on cluster recycle

@janetkuo
Copy link
Member Author

/retest

1 similar comment
@janetkuo
Copy link
Member Author

/retest

@janetkuo
Copy link
Member Author

@madhusudancs now it finally passed!

@madhusudancs
Copy link
Contributor

@janetkuo awesome!

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 16, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: janetkuo, madhusudancs

Associated issue: 47258

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 47451, 47410, 47598, 47616, 47473)

@k8s-github-robot k8s-github-robot merged commit 0a1e20d into kubernetes:master Jun 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants