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.

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

[zh] fix column alignment #27166

Closed
wants to merge 1 commit into from
Closed

[zh] fix column alignment #27166

wants to merge 1 commit into from

Conversation

Arhell
Copy link
Member

@Arhell Arhell commented Mar 22, 2021

en PR #26451

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 22, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please assign sataqiu after the PR has been reviewed.
You can assign the PR to them by writing /assign @sataqiu in a comment when ready.

The full list of commands accepted by this bot can be found 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 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. labels Mar 22, 2021
@netlify
Copy link

netlify bot commented Mar 22, 2021

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

Built with commit 284e821

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

@Arhell
Copy link
Member Author

Arhell commented Mar 22, 2021

/assign @tengqm

@tengqm
Copy link
Contributor

tengqm commented Mar 22, 2021

The page content/zh/docs/tasks/debug-application-cluster/debug-service.md is out of sync.

@Arhell
Copy link
Member Author

Arhell commented Mar 29, 2021

The page content/zh/docs/tasks/debug-application-cluster/debug-service.md is out of sync.

./scripts/lsync.sh content/zh/docs/tasks/debug-application-cluster/debug-service.md content/zh/docs/tasks/debug-application-cluster/debug-service.md is still in sync in this branch

@Arhell Arhell closed this Mar 29, 2021
@Arhell Arhell deleted the column branch March 29, 2021 09:36
@tengqm
Copy link
Contributor

tengqm commented Mar 29, 2021

@Arhell When you are running the script against your column branch, the script will fail to detect upstream changes because the file content/zh/docs/tasks/debug-application-cluster/debug-service.md in your column branch is already newer than the English file, aka, polluted. That is exactly the reason we are checking this for all PRs targeting the zh localization. If we merge this PR as is, we will forever lose track of the upstream changes that were not synced so far.

To make it clearer, please check the output from the master branch. Here is what I'm seeing:

git checkout master; git fetch upstream; git rebase upstream/master; git push
./scripts/lsync.sh content/zh/docs/tasks/debug-application-cluster/debug-service.md

The output is like this:

diff --git a/content/en/docs/tasks/debug-application-cluster/debug-service.md b/content/en/docs/tasks/debug-application-cluster/debug-service.md
index 4ee9d6f49..3b3b1c608 100644
--- a/content/en/docs/tasks/debug-application-cluster/debug-service.md
+++ b/content/en/docs/tasks/debug-application-cluster/debug-service.md
@@ -18,10 +18,10 @@ you to figure out what's going wrong.
 ## Running commands in a Pod
 
 For many steps here you will want to see what a Pod running in the cluster
-sees.  The simplest way to do this is to run an interactive alpine Pod:
+sees.  The simplest way to do this is to run an interactive busybox Pod:
 
 ```none
-kubectl run -it --rm --restart=Never alpine --image=alpine sh
+kubectl run -it --rm --restart=Never busybox --image=gcr.io/google-containers/busybox sh
 ```
 
 {{< note >}}
@@ -111,7 +111,7 @@ kubectl get pods -l app=hostnames \
 10.244.0.7
 ```
 
-The example container used for this walk-through simply serves its own hostname
+The example container used for this walk-through serves its own hostname
 via HTTP on port 9376, but if you are debugging your own app, you'll want to
 use whatever port number your Pods are listening on.
 
@@ -178,7 +178,7 @@ kubectl expose deployment hostnames --port=80 --target-port=9376
 service/hostnames exposed
 ```
 
-And read it back, just to be sure:
+And read it back:
 
 ```shell
 kubectl get svc hostnames
@@ -421,14 +421,13 @@ Earlier you saw that the Pods were running.  You can re-check that:
 kubectl get pods -l app=hostnames
 ```
 ```none
-NAME              READY     STATUS    RESTARTS   AGE
+NAME                        READY     STATUS    RESTARTS   AGE
 hostnames-632524106-bbpiw   1/1       Running   0          1h
 hostnames-632524106-ly40y   1/1       Running   0          1h
 hostnames-632524106-tlaok   1/1       Running   0          1h
 ```
 
-The `-l app=hostnames` argument is a label selector - just like our Service
-has.
+The `-l app=hostnames` argument is a label selector configured on the Service.
 
 The "AGE" column says that these Pods are about an hour old, which implies that
 they are running fine and not crashing.
@@ -607,7 +606,7 @@ iptables-save | grep hostnames
 -A KUBE-PORTALS-HOST -d 10.0.1.175/32 -p tcp -m comment --comment "default/hostnames:default" -m tcp --dport 80 -j DNAT --to-destination 10.240.115.247:48577
 ```
 
-There should be 2 rules for each port of your Service (just one in this
+There should be 2 rules for each port of your Service (only one in this
 example) - a "KUBE-PORTALS-CONTAINER" and a "KUBE-PORTALS-HOST".
 
 Almost nobody should be using the "userspace" mode any more, so you won't spend

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/zh Issues or PRs related to Chinese language 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
Development

Successfully merging this pull request may close these issues.

3 participants