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

Fix cronjob timestamp trimming. #35655

Merged
merged 6 commits into from Nov 18, 2021
Merged

Fix cronjob timestamp trimming. #35655

merged 6 commits into from Nov 18, 2021

Conversation

bianpengyuan
Copy link
Contributor

@bianpengyuan bianpengyuan commented Oct 18, 2021 •
edited by istio-policy-bot

Please provide a description of this PR:
fix #35563

@bianpengyuan bianpengyuan requested a review from a team as a code owner October 18, 2021 18:41
@google-cla google-cla bot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Oct 18, 2021
@istio-testing istio-testing added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 18, 2021
@bianpengyuan bianpengyuan added the release-notes-none Indicates a PR that does not require release notes. label Oct 18, 2021
@bianpengyuan
Copy link
Contributor Author

/retest

howardjohn
howardjohn reviewed Oct 18, 2021
View reviewed changes
Copy link
Member

@howardjohn howardjohn left a comment

Choose a reason for hiding this comment

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

can we add a test? LGTM though

pkg/kube/util.go Outdated Show resolved Hide resolved
@istio-policy-bot istio-policy-bot added the lifecycle/stale Indicates a PR or issue hasn't been manipulated by an Istio team member for a while label Nov 18, 2021
@istio-testing istio-testing added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 18, 2021
@istio-policy-bot istio-policy-bot removed the lifecycle/stale Indicates a PR or issue hasn't been manipulated by an Istio team member for a while label Nov 18, 2021
@bianpengyuan
Copy link
Contributor Author

/retest

@istio-testing istio-testing merged commit 26fb8c3 into istio:master Nov 18, 2021
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: #35655 failed to apply on top of branch "release-1.10":

Applying: Fix cronjob timestamp trimming.
Using index info to reconstruct a base tree...
M	pkg/kube/util.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/kube/util.go
CONFLICT (content): Merge conflict in pkg/kube/util.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix cronjob timestamp trimming.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

@istio-testing
Copy link
Collaborator

In response to a cherrypick label: new issue created for failed cherrypick: #36146

This was referenced Nov 18, 2021
Closed
Merged
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: new pull request created: #36147

@istio-testing istio-testing mentioned this pull request Nov 18, 2021
Merged
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: new pull request created: #36148

@jwendell
Copy link
Member

we need a release note entry for all backports

@bianpengyuan bianpengyuan mentioned this pull request Nov 19, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@howardjohn howardjohn howardjohn approved these changes

Assignees
No one assigned
Labels
cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. release-notes-none Indicates a PR that does not require release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Incorrect workload name metadata of CronJobs in Kubernetes 1.21+
5 participants
@bianpengyuan @istio-testing @jwendell @howardjohn @istio-policy-bot