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 #110110: Fix issue that Audit Server could not correctly encode #113918

Merged
merged 1 commit into from Jan 17, 2023
Merged

Automated cherry pick of #110110: Fix issue that Audit Server could not correctly encode #113918

merged 1 commit into from Jan 17, 2023

Conversation

sxllwx
Copy link
Member

@sxllwx sxllwx commented Nov 15, 2022 •
edited

Cherry pick of #110110 on release-1.24.

#110110: Fix issue that Audit Server could not correctly encode

For: #110110 (comment)

For details on the cherry pick process, see the cherry pick requests page.

@k8s-ci-robot k8s-ci-robot added this to the v1.24 milestone Nov 15, 2022
@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/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Nov 15, 2022
@k8s-ci-robot k8s-ci-robot added area/apiserver sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/auth Categorizes an issue or PR as relevant to SIG Auth. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Nov 15, 2022
@sxllwx sxllwx mentioned this pull request Nov 15, 2022
Merged
@alexzielenski
Copy link
Contributor

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Nov 15, 2022
@wojtek-t
Copy link
Member

/assign

Should this also be cherrypicked to earlier releases, given we're cherrypicking it?

/lgtm
/approve

@kubernetes/release-managers - for cherrypick approval

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 16, 2022
@xmudrii
Copy link
Member

xmudrii commented Nov 16, 2022

/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Nov 16, 2022
@xmudrii
Copy link
Member

xmudrii commented Nov 16, 2022

This generally looks good, but can you please confirm:

  • Does this PR need to be cherry-picked to 1.23?
  • Does this PR have a release note or is it supposed to be NONE (the parent PR has NONE)?

@sxllwx
Copy link
Member Author

sxllwx commented Nov 17, 2022 •
edited

This generally looks good, but can you please confirm:

  • Does this PR need to be cherry-picked to 1.23?
  • Does this PR have a release note or is it supposed to be NONE (the parent PR has NONE)?

Thanks for the reminder, I've submitted another PR cherry-pick to release-1.23.

Of particular note are:

Because PR #110110 brings an Issue #111985 fixed by PR #113133.

For this reason, I cherry-pick the PR #113133 to release-1.23 as well as release-1.24 (release-note has been edited)

@sxllwx
Copy link
Member Author

sxllwx commented Nov 22, 2022

/ping @xmudrii @wojtek-t PTAL thx...

@xmudrii
Copy link
Member

xmudrii commented Nov 22, 2022

@sxllwx Thank you for the reminder!

I've submitted another PR cherry-pick to release-1.23.

#113918

Looks like you linked this PR instead of one for the release-1.23 branch. Is this the PR for the 1.23 branch: #113965? If that's the case, can we get it reviewed and approved?

Of particular note are:

Because PR #110110 brings an Issue #111985 fixed by PR #113133.

For this reason, I cherry-pick the PR #113133 to release-1.23 as well as release-1.24 (release-note has been edited)

Is the order of merging PRs important in this case? That being said, should we first merge this PR or #113968?

@wojtek-t
Copy link
Member

wojtek-t commented Jan 2, 2023

/lgtm
/approve
/retest

https://github.com/orgs/kubernetes/teams/release-managers - for cherrypick approval

@sxllwx
Copy link
Member Author

sxllwx commented Jan 5, 2023

@xmudrii PTAL thx.

@xmudrii
Copy link
Member

xmudrii commented Jan 5, 2023

I would like to see #113968 and #113967 LGTM-ed and approved before I approve this PR and #113965. I pinged some folks (@liggitt @sttts @deads2k) to take a look at #113968 and #113967. I'll approve all four PRs as soon as all PRs have LGTM + approved.

@xmudrii xmudrii mentioned this pull request Jan 5, 2023
Merged
@Verolop Verolop mentioned this pull request Jan 12, 2023
Merged
@liggitt
Copy link
Member

liggitt commented Jan 12, 2023 •
edited

I pinged some folks (@liggitt @sttts @deads2k) to take a look at #113968 and #113967.

I reviewed/approved those, and those resolve an existing issue in 1.23/1.24, so I think those can merge ahead of this

@liggitt
Copy link
Member

liggitt commented Jan 12, 2023

I pinged some folks (@liggitt @sttts @deads2k) to take a look at #113968 and #113967.

I reviewed/approved those, and those resolve an existing issue in 1.23/1.24, so I think those can merge ahead of this

(I also tested this combined with the other PR, and it worked properly, though the test changes in this PR this conflict with that PR and require a rebase after it merges)

@Verolop
Copy link

Verolop commented Jan 13, 2023

@sxllwx looks like this needs a rebase after #113968 was merged. Thanks!

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 13, 2023
@sxllwx sxllwx force-pushed the automated-cherry-pick-of-#110110-upstream-release-1.24 branch from 40508ec to 51265be Compare January 16, 2023 03:01
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 16, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 16, 2023
@sxllwx
Copy link
Member Author

sxllwx commented Jan 16, 2023

merged

Thank you for your guidance.

Already rebase, PTAL

@liggitt
Copy link
Member

liggitt commented Jan 17, 2023

/lgtm

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

LGTM label has been added.

Git tree hash: 8a88d41b62538928322d82495b36d83ce379d245

xmudrii
xmudrii approved these changes Jan 17, 2023
View reviewed changes
Copy link
Member

@xmudrii xmudrii left a comment

Choose a reason for hiding this comment

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

Discussed on Slack: https://kubernetes.slack.com/archives/CJH2GBF7Y/p1673882647806869

/lgtm
/approve
/release-note-none
(from the parent PR)

@xmudrii xmudrii added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 17, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Jan 17, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sxllwx, wojtek-t, xmudrii

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

@xmudrii
Copy link
Member

xmudrii commented Jan 17, 2023

/release-note-none

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jan 17, 2023
@k8s-ci-robot k8s-ci-robot merged commit badcd03 into kubernetes:release-1.24 Jan 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xmudrii xmudrii xmudrii approved these changes

@deads2k deads2k Awaiting requested review from deads2k

@sttts sttts Awaiting requested review from sttts

@wojtek-t wojtek-t Awaiting requested review from wojtek-t

Assignees

@liggitt liggitt

@wojtek-t wojtek-t

@xmudrii xmudrii

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver 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. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/auth Categorizes an issue or PR as relevant to SIG Auth. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Auth
Archived in project
Milestone
v1.24
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@sxllwx @alexzielenski @wojtek-t @xmudrii @liggitt @Verolop @k8s-ci-robot