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

Automated cherry pick of #68920: Enable insertId generation, update Stackdriver Logging Agent #69698

Merged
merged 1 commit into from
Nov 2, 2018
Merged

Automated cherry pick of #68920: Enable insertId generation, update Stackdriver Logging Agent #69698

merged 1 commit into from
Nov 2, 2018

Conversation

qingling128
Copy link
Contributor

Cherry pick of #68920 on release-1.11.

#68920: Enable insertId generation, update Stackdriver Logging Agent

@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/S Denotes a PR that changes 10-29 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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 11, 2018
@qingling128
Copy link
Contributor Author

Could someone help with the /ok-to-test tag? @kawych @bowei @x13n

@x13n
Copy link
Member

x13n commented Oct 12, 2018

/sig gcp
/ok-to-test
/kind bug
/lgtm

@k8s-ci-robot k8s-ci-robot added sig/gcp kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Oct 12, 2018
@x13n
Copy link
Member

x13n commented Oct 12, 2018

/lgtm cancel
Actually, after talking with @MaciekPytel I think we should have wildcard tolerations for per-node agents (metadata agent & fluentd).

@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
@qingling128
Copy link
Contributor Author

#69813 is created to add tolerations.

Can we unblock this one now (since they are not depending on each other)?

@x13n
Copy link
Member

x13n commented Oct 16, 2018

I'd wait for #69813 to merge, then merge this (to make sure this change is not patch-released without the other one), so putting on hold. Otherwise looks good.
/lgtm
/approve
/hold

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Oct 16, 2018
@qingling128
Copy link
Contributor Author

/assign @piosz

@qingling128
Copy link
Contributor Author

@x13n - Sounds good. I will wait for the other one to merge before merging this one.
@piosz - Mind taking a quick look?

@kawych
Copy link
Contributor

kawych commented Oct 18, 2018

/lgtm
/approve

@qingling128
Copy link
Contributor Author

/assign @jszczepkowski

@x13n
Copy link
Member

x13n commented Oct 19, 2018

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 19, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kawych, MaciekPytel, qingling128, x13n

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

@qingling128
Copy link
Contributor Author

/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 19, 2018
@qingling128
Copy link
Contributor Author

Seems the PR has both "approved" and "do-not-merge/cherry-pick-not-approved" labels, which blocks the merge.

I'm a bit confused. Any idea who I should talk to for getting rid of "do-not-merge/cherry-pick-not-approved"?
@x13n @kawych @MaciekPytel

@x13n
Copy link
Member

x13n commented Oct 22, 2018

This is up to patch release manager for 1.11 branch - @foxish, can you take a look?

@kawych
Copy link
Contributor

kawych commented Oct 22, 2018

@qingling128 "approved" is for owner approvals (depending on the code location) and "cherrypick-approved" is for branch manager approval. For 1.11 you need approval from @foxish
/cc @foxish

4 similar comments
@kawych
Copy link
Contributor

kawych commented Oct 22, 2018

@qingling128 "approved" is for owner approvals (depending on the code location) and "cherrypick-approved" is for branch manager approval. For 1.11 you need approval from @foxish
/cc @foxish

@kawych
Copy link
Contributor

kawych commented Oct 22, 2018

@qingling128 "approved" is for owner approvals (depending on the code location) and "cherrypick-approved" is for branch manager approval. For 1.11 you need approval from @foxish
/cc @foxish

@kawych
Copy link
Contributor

kawych commented Oct 22, 2018

@qingling128 "approved" is for owner approvals (depending on the code location) and "cherrypick-approved" is for branch manager approval. For 1.11 you need approval from @foxish
/cc @foxish

@kawych
Copy link
Contributor

kawych commented Oct 22, 2018

@qingling128 "approved" is for owner approvals (depending on the code location) and "cherrypick-approved" is for branch manager approval. For 1.11 you need approval from @foxish
/cc @foxish

@qingling128
Copy link
Contributor Author

That makes sense. Thanks for the info!

@foxish - Seems #69701 has been approved. Could you take a quick look of this one as well? It should be pretty similar, just to a different release branch.

@qingling128
Copy link
Contributor Author

Friendly ping. @foxish - Do you have a sec to review this one?

@foxish
Copy link
Contributor

foxish commented Oct 23, 2018

The branch is frozen for 1.11.4. I'll review this after we cut that today.

@qingling128
Copy link
Contributor Author

Got it. Thanks for the heads up. I'll check back later.

@qingling128
Copy link
Contributor Author

@foxish - Hi, seems 1.11.4 has been cut. Are we unblocked? Mind taking a look at this one again? Thanks!

@qingling128
Copy link
Contributor Author

Friendly ping. @foxish - Do you have a sec to review this one?

@qingling128
Copy link
Contributor Author

@foxish - Have you gotten a chance to take a look at this one? Are we still blocked?

@foxish foxish added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Nov 1, 2018
@foxish foxish added this to the v1.11 milestone Nov 1, 2018
@qingling128
Copy link
Contributor Author

Thanks @foxish!

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

1 similar comment
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@k8s-ci-robot k8s-ci-robot merged commit 46d1732 into kubernetes:release-1.11 Nov 2, 2018
@qingling128 qingling128 deleted the automated-cherry-pick-of-#68920-upstream-release-1.11 branch November 2, 2018 04:21
@mariantalla mariantalla mentioned this pull request Nov 5, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@x13n x13n x13n left review comments

@foxish foxish foxish approved these changes

@bowei bowei Awaiting requested review from bowei

@kawych kawych Awaiting requested review from kawych

Assignees

@x13n x13n

@kawych kawych

@piosz piosz

@jszczepkowski jszczepkowski

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.11
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@qingling128 @x13n @kawych @foxish @MaciekPytel @k8s-ci-robot @fejta-bot @piosz @jszczepkowski