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

Fix typo a extension and its related en doc sync #29486

Merged
merged 1 commit into from
Sep 12, 2021

Conversation

astraw99
Copy link
Member

After review feedback(#29450), a new PR to fixed typo a extension to an extension, to better the documents.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 20, 2021
@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 Aug 20, 2021
@netlify
Copy link

netlify bot commented Aug 20, 2021

✔️ Deploy Preview for kubernetes-io-main-staging ready!

🔨 Explore the source changes: 340125a

🔍 Inspect the deploy log: https://app.netlify.com/sites/kubernetes-io-main-staging/deploys/61221fcc7f061b00079a5c44

😎 Browse the preview: https://deploy-preview-29486--kubernetes-io-main-staging.netlify.app

@mengjiao-liu
Copy link
Member

mengjiao-liu commented Aug 20, 2021

/hold
谢谢贡献。根据指南约定,我们会拒绝对页面的部分修改。部分修改针对的是对应页面的英文上游还有其他改动需要同步的情况。
一旦我们合并了此 PR,将来就无法根据文件的最后更改时间来判断是否有其他上游变更尚未同步。请理解。
请在 main 分支上执行以下命令查看上游尚未同步的更改:

./scripts/lsync.sh content/zh/docs/tasks/extend-kubernetes/configure-aggregation-layer.md

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 20, 2021
@astraw99
Copy link
Member Author

/hold
谢谢贡献。根据指南约定,我们会拒绝对页面的部分修改。部分修改针对的是对应页面的英文上游还有其他改动需要同步的情况。
一旦我们合并了此 PR,将来就无法根据文件的最后更改时间来判断是否有其他上游变更尚未同步。请理解。
请在 main 分支上执行以下命令查看上游尚未同步的更改:

./scripts/lsync.sh content/zh/docs/tasks/extend-kubernetes/configure-aggregation-layer.md

Got it.

  1. Checked it sync status:
./scripts/lsync.sh content/zh/docs/tasks/extend-kubernetes/configure-aggregation-layer.md
content/zh/docs/tasks/extend-kubernetes/configure-aggregation-layer.md is still in sync
  1. Checked the en version of this file: content/en/docs/tasks/extend-kubernetes/configure-aggregation-layer.md, the content is already right(an extension) between line L253 to L256, so it is safe to fix the typo.

PTAL thanks.

@mengjiao-liu
Copy link
Member

这是我在 main 分支进行对比中英版本的区别(注意,切换到 main 分支,你现在的分支已经 commit,时间是晚于 main 的最新分支的):
in main branch

$ git status
On branch main
Your branch is up to date with 'upstream/main'.

$ ./scripts/lsync.sh content/zh/docs/tasks/extend-kubernetes/configure-aggregation-layer.md
diff --git a/content/en/docs/tasks/extend-kubernetes/configure-aggregation-layer.md b/content/en/docs/tasks/extend-kubernetes/configure-aggregation-layer.md
index 739a69d45..3b65d6abc 100644
--- a/content/en/docs/tasks/extend-kubernetes/configure-aggregation-layer.md
+++ b/content/en/docs/tasks/extend-kubernetes/configure-aggregation-layer.md
@@ -17,7 +17,7 @@ Configuring the [aggregation layer](/docs/concepts/extend-kubernetes/api-extensi
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
 {{< note >}}
-There are a few setup requirements for getting the aggregation layer working in your environment to support mutual TLS auth between the proxy and extension apiservers. Kubernetes and the kube-apiserver have multiple CAs, so make sure that the proxy is signed by the aggregation layer CA and not by something else, like the master CA.
+There are a few setup requirements for getting the aggregation layer working in your environment to support mutual TLS auth between the proxy and extension apiservers. Kubernetes and the kube-apiserver have multiple CAs, so make sure that the proxy is signed by the aggregation layer CA and not by something else, like the Kubernetes general CA.
 {{< /note >}}
 
 {{< caution >}}

@astraw99
Copy link
Member Author

这是我在 main 分支进行对比中英版本的区别(注意,切换到 main 分支,你现在的分支已经 commit,时间是晚于 main 的最新分支的):
in main branch

$ git status
On branch main
Your branch is up to date with 'upstream/main'.

$ ./scripts/lsync.sh content/zh/docs/tasks/extend-kubernetes/configure-aggregation-layer.md
diff --git a/content/en/docs/tasks/extend-kubernetes/configure-aggregation-layer.md b/content/en/docs/tasks/extend-kubernetes/configure-aggregation-layer.md
index 739a69d45..3b65d6abc 100644
--- a/content/en/docs/tasks/extend-kubernetes/configure-aggregation-layer.md
+++ b/content/en/docs/tasks/extend-kubernetes/configure-aggregation-layer.md
@@ -17,7 +17,7 @@ Configuring the [aggregation layer](/docs/concepts/extend-kubernetes/api-extensi
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
 {{< note >}}
-There are a few setup requirements for getting the aggregation layer working in your environment to support mutual TLS auth between the proxy and extension apiservers. Kubernetes and the kube-apiserver have multiple CAs, so make sure that the proxy is signed by the aggregation layer CA and not by something else, like the master CA.
+There are a few setup requirements for getting the aggregation layer working in your environment to support mutual TLS auth between the proxy and extension apiservers. Kubernetes and the kube-apiserver have multiple CAs, so make sure that the proxy is signed by the aggregation layer CA and not by something else, like the Kubernetes general CA.
 {{< /note >}}
 
 {{< caution >}}

Got it in main branch.
Then how to fix this typo? or this kind of typo? As these typoes may just in comments.

@tengqm
Copy link
Contributor

tengqm commented Aug 22, 2021

Then how to fix this typo? or this kind of typo? As these typoes may just in comments.

We either don't fix it, or we resync the whole page. The goal is to make sure that once the page is updated, it is completely resynced with the English upstream version. This may sound a little bit inconvenient, but it really makes our lives a lot easier.

@astraw99 astraw99 force-pushed the fix_typo_an_extension branch from 4127e38 to 340125a Compare August 22, 2021 09:58
@astraw99 astraw99 changed the title Fix typo a extension in a new PR Fix typo a extension and its related en doc sync Aug 22, 2021
@astraw99
Copy link
Member Author

Then how to fix this typo? or this kind of typo? As these typoes may just in comments.

We either don't fix it, or we resync the whole page. The goal is to make sure that once the page is updated, it is completely resynced with the English upstream version. This may sound a little bit inconvenient, but it really makes our lives a lot easier.

Got it. Checked the diff in main branch: scripts/lsync.sh
Fixed its related en doc sync.
@tengqm @mengjiao-liu PTAL, thanks.

@mengjiao-liu
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 Aug 23, 2021
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 74ef8463571eedc912aac59e98b6c4ae87b35b4a

@astraw99
Copy link
Member Author

astraw99 commented Sep 8, 2021

/lgtm

@mengjiao-liu Could you please help to approve this PR? PTAL thanks.

@mengjiao-liu mengjiao-liu removed their assignment Sep 8, 2021
@mengjiao-liu
Copy link
Member

/assign @tengqm

@tengqm
Copy link
Contributor

tengqm commented Sep 12, 2021

/lgtm
/approve

@tengqm
Copy link
Contributor

tengqm commented Sep 12, 2021

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 12, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tengqm

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 Sep 12, 2021
@k8s-ci-robot k8s-ci-robot merged commit 8e84443 into kubernetes:main Sep 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/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.

4 participants