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

[zh] Resync concepts pages for services-networking\dual-stack.md #26395

Merged
merged 1 commit into from
Feb 19, 2021
Merged

[zh] Resync concepts pages for services-networking\dual-stack.md #26395

merged 1 commit into from
Feb 19, 2021
+28 −11

Conversation

ydFu
Copy link
Member

@ydFu ydFu commented Feb 5, 2021 •
edited
Loading

Signed-off-by: ydFu [email protected]

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 5, 2021
@k8s-ci-robot k8s-ci-robot added language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Feb 5, 2021
@netlify
Copy link

netlify bot commented Feb 5, 2021 •
edited
Loading

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

Built with commit 1cb1ac4

https://deploy-preview-26395--kubernetes-io-master-staging.netlify.app

tengqm
tengqm reviewed Feb 6, 2021
View reviewed changes
content/zh/docs/concepts/services-networking/dual-stack.md Outdated
The `.spec.ipFamilies` field is immutable because the `.spec.ClusterIP` cannot be reallocated on a Service that already exists. If you want to change `.spec.ipFamilies`, delete and recreate the Service.
{{< /note >}}
Copy link
Contributor

Choose a reason for hiding this comment

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

This kind of shortcode was intentionally removed because they sometimes still work when appearing between <!-- and -->. So ... such fixes are not required and even undesirable.

Copy link
Member Author

Choose a reason for hiding this comment

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

I will pay special attention to this.
Thank for your hint.

tengqm
tengqm reviewed Feb 6, 2021
View reviewed changes
content/zh/docs/concepts/services-networking/dual-stack.md Outdated
-->
### LoadBalancer 类型
### 服务类型 LoadBalancer
Copy link
Contributor

Choose a reason for hiding this comment

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

中文表达方式为 ”LoadBalancer 类型服务“

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you for suggesting me.

@ydFu ydFu force-pushed the update-dual-stack branch 2 times, most recently from 966d4fc to c83e64e Compare February 6, 2021 10:55
@ydFu
Copy link
Member Author

ydFu commented Feb 6, 2021

Update in 'administer-cluster\safely-drain-node.md' #25996

@ydFu ydFu mentioned this pull request Feb 6, 2021
Closed
@tengqm
Copy link
Contributor

tengqm commented Feb 6, 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 Feb 6, 2021
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 979bc75f853adeb50e09191b55ccaa65ad01cc6c

tanjunchen
tanjunchen reviewed Feb 18, 2021
View reviewed changes
Copy link
Member

@tanjunchen tanjunchen left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tanjunchen

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Feb 18, 2021
@ydFu ydFu force-pushed the update-dual-stack branch from 6d70b40 to ec12d2b Compare February 19, 2021 01:36
@howieyuen
Copy link
Member

/lgtm

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

LGTM label has been added.

Git tree hash: 79df1b354864f0c4b9886efcec88f772bbdcd07a

@tengqm
Copy link
Contributor

tengqm commented Feb 19, 2021

Looks like the needs-rebase label is still there blocking the merge. Please try recommit?

@ydFu
Copy link
Member Author

ydFu commented Feb 19, 2021 •
edited
Loading

@tengqm
It’s a bit special, but I don’t see the conflict.
I will try recommit.

image

@ydFu ydFu force-pushed the update-dual-stack branch from ec12d2b to 4b8599d Compare February 19, 2021 02:04
@ydFu
[zh] Resync concepts pages for services-networking\dual-stack.md
1cb1ac4 
* Resync with english version in 'Dual-stack docs correction kubernetes#26386'

* Update in 'administer-cluster\safely-drain-node.md' kubernetes#25996

* Fix git rebase in services-networking\dual-stack.md

Signed-off-by: ydFu <[email protected]>
@ydFu ydFu force-pushed the update-dual-stack branch from b6bdf0a to 1cb1ac4 Compare February 19, 2021 03:44
@k8s-ci-robot k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Feb 19, 2021
@ydFu
Copy link
Member Author

ydFu commented Feb 19, 2021 •
edited
Loading

I solve needs-rebase label in this PR.
Please help review this PR.

/cc @tengqm @howieyuen

@k8s-ci-robot k8s-ci-robot requested a review from tengqm February 19, 2021 05:38
@tengqm
Copy link
Contributor

tengqm commented Feb 19, 2021

/lgtm

@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: aaf8feb72464a9c90e93c110d0d155cbd585e111

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 19, 2021
@k8s-ci-robot k8s-ci-robot merged commit 7b0dd7d into kubernetes:master Feb 19, 2021
@ydFu ydFu deleted the update-dual-stack branch February 19, 2021 06:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tanjunchen tanjunchen tanjunchen left review comments

@howieyuen howieyuen Awaiting requested review from howieyuen

@tengqm tengqm Awaiting requested review from tengqm

Assignees

@tengqm tengqm

@howieyuen howieyuen

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/zh Issues or PRs related to Chinese language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. 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.
5 participants
@ydFu @tengqm @k8s-ci-robot @howieyuen @tanjunchen