[go: up one dir, main page]
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

add notes for that strategic merge patch is unsupported for CR #25764

Merged
merged 1 commit into from
Jan 12, 2021
Merged

add notes for that strategic merge patch is unsupported for CR #25764

merged 1 commit into from
Jan 12, 2021

Conversation

pacoxu
Copy link
Member
@pacoxu pacoxu commented Dec 22, 2020

Per kubernetes/kubernetes#97423 (comment), strategic merge patch is unsupported for Custom Resource objects

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 22, 2020
@pacoxu pacoxu changed the title add notes for that strategic merge patch is unsupported for Custom Re… add notes for that strategic merge patch is unsupported for CR Dec 22, 2020
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 22, 2020
@k8s-ci-robot k8s-ci-robot added the sig/docs Categorizes an issue or PR as relevant to SIG Docs. label Dec 22, 2020
@pacoxu

This comment has been minimized.

Sign in to view
@netlify
Copy link
netlify bot commented Dec 22, 2020 •
edited
Loading

✔️ Deploy preview for kubernetes-io-master-staging ready!

🔨 Explore the source changes: ea69888

🔍 Inspect the deploy logs: https://app.netlify.com/sites/kubernetes-io-master-staging/deploys/5ffd3f48813497000704f63b

😎 Browse the preview: https://deploy-preview-25764--kubernetes-io-master-staging.netlify.app

@sftim
Copy link
Contributor
sftim commented Dec 22, 2020

/sig api-machinery

@k8s-ci-robot k8s-ci-robot added the sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. label Dec 22, 2020
sftim
sftim reviewed Dec 22, 2020
View reviewed changes
Copy link
Contributor
@sftim sftim left a comment

Choose a reason for hiding this comment

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

Markdown LGTM. I made a suggestion; it's fine to merge the text as-is providing this gets a tech review signoff.

@pacoxu
Copy link
Member Author
pacoxu commented Dec 24, 2020

Markdown LGTM. I made a suggestion; it's fine to merge the text as-is providing this gets a tech review signoff.

Accept it. Thanks @sftim

@pacoxu pacoxu requested a review from sftim December 24, 2020 03:19
@pacoxu
Copy link
Member Author
pacoxu commented Jan 4, 2021

/assign @tengqm

@tengqm
Copy link
Contributor
tengqm commented Jan 4, 2021

/unassign
I'm not sure about the strategic merge patch details.

@pacoxu
Copy link
Member Author
pacoxu commented Jan 6, 2021

@prasadkatti can you have a look？

@pacoxu
Copy link
Member Author
pacoxu commented Jan 12, 2021

need /approve @sftim

@pacoxu @sftim
add notes for that strategic merge patch is unsupported for Custom Re…
ea69888 
…source objects

Signed-off-by: pacoxu <paco.xu@daocloud.io>
Co-authored-by: Tim Bannister <tim@scalefactory.com>
@tengqm
Copy link
Contributor
tengqm commented Jan 12, 2021

/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 12, 2021
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 397243a592e1ae1280312ec6a4f71adeba849977

@sftim
Copy link
Contributor
sftim commented Jan 12, 2021

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sftim

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 12, 2021
@k8s-ci-robot k8s-ci-robot merged commit 490f1ea into kubernetes:master Jan 12, 2021
@MikeSpreitzer MikeSpreitzer mentioned this pull request Sep 13, 2022
Closed
@pacoxu pacoxu deleted the patch-2 branch June 26, 2023 05:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tengqm tengqm tengqm left review comments

@bradtopol bradtopol Awaiting requested review from bradtopol

@rajeshdeshpande02 rajeshdeshpande02 Awaiting requested review from rajeshdeshpande02

@sftim sftim Awaiting requested review from sftim

Assignees

@tengqm tengqm

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. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@pacoxu @sftim @tengqm @k8s-ci-robot