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

Update outdated files in the dev-1.20-ko.1 branch(3) #25728

Merged
merged 2 commits into from
Dec 22, 2020
Merged

Update outdated files in the dev-1.20-ko.1 branch(3) #25728

merged 2 commits into from
Dec 22, 2020

Conversation

kosehy
Copy link
Contributor

@kosehy kosehy commented Dec 20, 2020

#25521
Closes #25634

Update outdated files in the dev-1.20-ko.1 branch.

5/52 files are modified

  • content/en/docs/tasks/administer-cluster/highly-available-master.md 1 file changed, 33 insertions(+), 1 deletion(-)
  • content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md 1 file changed, 68 insertions(+), 11 deletions(-)
  • content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md 1 file changed, 84 insertions(+), 206 deletions(-)
  • content/en/docs/tasks/network/validate-dual-stack.md 1 file changed, 94 insertions(+), 23 deletions(-)
  • content/en/docs/tasks/run-application/horizontal-pod-autoscale.md 1 file changed, 70 insertions(+), 1 deletion(-)

2 files to be renamed

  • R073 content/en/examples/service/networking/dual-stack-ipv4-svc.yaml -> content/en/examples/service/networking/dual-stack-ipfamilies-ipv6.yaml
  • R076 content/en/examples/service/networking/dual-stack-ipv6-lb-svc.yaml -> content/en/examples/service/networking/dual-stack-prefer-ipv6-lb-svc.yaml

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/ko Issues or PRs related to Korean language labels Dec 20, 2020
@k8s-ci-robot k8s-ci-robot added sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 20, 2020
@kosehy kosehy force-pushed the out-25521-3-pick branch 2 times, most recently from aa333f8 to ce7e3f4 Compare December 20, 2020 04:26
@pjhwa
Copy link
Contributor

pjhwa commented Dec 21, 2020

content/ko/docs/concepts/services-networking/dual-stack.md 파일에서 참조하고 있는 dual-stack-ipv4-svc.yaml 파일의 이름이 변경되어 아래와 같은 에러가 발생하네요.

file "content/ko/examples/service/networking/dual-stack-ipv4-svc.yaml" does not exist

#25608 에서 dual-stack.md 파일을 처리하기로 했는데, 이 부분에 대해서는 @jmyung 님과 협의하여 처리하는 것이 좋을 것 같습니다.

  • content/ko/docs/concepts/services-networking/dual-stack.md
  • content/ko/docs/tasks/network/validate-dual-stack.md
  • content/ko/examples/service/networking/dual-stack-ipv4-svc.yaml -> content/ko/examples/service/networking/dual-stack-ipfamilies-ipv6.yaml
  • content/ko/examples/service/networking/dual-stack-ipv6-lb-svc.yaml -> content/ko/examples/service/networking/dual-stack-prefer-ipv6-lb-svc.yaml

@kosehy
Copy link
Contributor Author

kosehy commented Dec 21, 2020

content/ko/docs/concepts/services-networking/dual-stack.md 파일에서 참조하고 있는 dual-stack-ipv4-svc.yaml 파일의 이름이 변경되어 아래와 같은 에러가 발생하네요.

file "content/ko/examples/service/networking/dual-stack-ipv4-svc.yaml" does not exist

#25608 에서 dual-stack.md 파일을 처리하기로 했는데, 이 부분에 대해서는 @jmyung 님과 협의하여 처리하는 것이 좋을 것 같습니다.

  • content/ko/docs/concepts/services-networking/dual-stack.md
  • content/ko/docs/tasks/network/validate-dual-stack.md
  • content/ko/examples/service/networking/dual-stack-ipv4-svc.yaml -> content/ko/examples/service/networking/dual-stack-ipfamilies-ipv6.yaml
  • content/ko/examples/service/networking/dual-stack-ipv6-lb-svc.yaml -> content/ko/examples/service/networking/dual-stack-prefer-ipv6-lb-svc.yaml

@pjhwa 해결책을 제시해 주셔서 정말 감사합니다!!

@pjhwa
Copy link
Contributor

pjhwa commented Dec 21, 2020

/assign

pjhwa
pjhwa reviewed Dec 21, 2020
View reviewed changes
Copy link
Contributor

@pjhwa pjhwa left a comment

Choose a reason for hiding this comment

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

@kosehy 컨트리뷰션 감사합니다!
몇 가지 작은 의견들을 드립니다. 참고하셔서 수정을 부탁드립니다.

content/ko/docs/tasks/administer-cluster/highly-available-master.md Outdated Show resolved Hide resolved
content/ko/docs/tasks/administer-cluster/highly-available-master.md Outdated Show resolved Hide resolved
content/ko/docs/tasks/administer-cluster/highly-available-master.md Outdated Show resolved Hide resolved
content/ko/docs/tasks/administer-cluster/highly-available-master.md Outdated Show resolved Hide resolved
content/ko/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md Outdated Show resolved Hide resolved
content/ko/docs/tasks/network/validate-dual-stack.md Outdated Show resolved Hide resolved
content/ko/docs/tasks/network/validate-dual-stack.md Outdated Show resolved Hide resolved
content/ko/docs/tasks/run-application/horizontal-pod-autoscale.md Outdated Show resolved Hide resolved
content/ko/docs/tasks/run-application/horizontal-pod-autoscale.md Outdated Show resolved Hide resolved
content/ko/docs/tasks/run-application/horizontal-pod-autoscale.md Outdated Show resolved Hide resolved
@kosehy @pjhwa
Update outdated files in the dev-1.20-ko.1 branch(3)
08492c8 
rename two files
fix kubeadm--upgrade.md
fix highly--available--master
fix adding-windwos-nodes
fix validate-dual-stack
fix horizontal-pod-autoscale
Reflected pjhwa's comments

Co-authored-by: Jerry Park <[email protected]>
@kosehy
Copy link
Contributor Author

kosehy commented Dec 21, 2020

@kosehy 컨트리뷰션 감사합니다!
몇 가지 작은 의견들을 드립니다. 참고하셔서 수정을 부탁드립니다.

@pjhwa 의견 모두 반영했습니다. 감사합니다!!

@gochist
Copy link
Member

gochist commented Dec 21, 2020

@kosehy 👋
안녕하세요. git log를 보니, dev-1.19-ko.6 브랜치를 base로 작업하신 것 같은데 dev-1.20-ko.1로 병합하는데 큰 문제는 없어보입니다. 앞으로는 작업하실 때 base를 확인해주시기를 바랍니다.

문서 빌드가 성공하기 위해서는 아래 두 파일이 추가로 필요합니다.

  1. content/ko/examples/service/networking/dual-stack-ipv4-svc.yaml: 본 PR에서 해당 파일의 이름을 변경하는 경우 빌드가 실패합니다. 해당 파일의 이름 변경은 Outdated files in the dev-1.20-ko.1 branch. (2) #25608 에 포함하거나, 해당 이슈가 처리된 이후에 하는 것이 좋겠습니다.
  2. content/ko/examples/service/networking/dual-stack-preferred-svc.yaml: 영문 문서에서 복사하면 됩니다.

@seokho-son seokho-son mentioned this pull request Dec 22, 2020
Closed
58 tasks
@netlify
Copy link

netlify bot commented Dec 22, 2020

✔️ Deploy preview for k8s-dev-ko ready!

🔨 Explore the source changes: 51ada27

🔍 Inspect the deploy logs: https://app.netlify.com/sites/k8s-dev-ko/deploys/5fe1eb749d9b46000807b73f

😎 Browse the preview: https://deploy-preview-25728--k8s-dev-ko.netlify.app

@gochist
Copy link
Member

gochist commented Dec 22, 2020

문서 빌드가 성공하기 위해서는 아래 두 파일이 추가로 필요합니다.

제가 임의로 추가하고 승인합니다. 감사합니다.

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: e051868a5467e28bae9a043a97647f878325921a

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gochist

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 Dec 22, 2020
@k8s-ci-robot k8s-ci-robot merged commit b8d2838 into kubernetes:dev-1.20-ko.1 Dec 22, 2020
seokho-son added a commit that referenced this pull request Jan 1, 2021
@pjhwa @seokho-son
@jmyung @santachopa @kosehy @gochist
Ko: 1st Korean l10n work for release-1.20
6a98a45 
- Translate reference/glossary/persistent-volume.md in Korean (#25474)
- Update outdated files in the dev-1.20-ko.1 branch (1) (#25576)
- Translate blog/dont-panic-kubernetes-and-docker into Korean (#25596)
- Update outdated files in the dev-1.20-ko.1 branch(3) (#25728)
- Ko: enhance tutorials//cluster-intro translation (#25754)
- Fix Outdated files in the dev-1.20-ko.1 branch (2) (#25765)

Co-authored-by: seokho-son <[email protected]>
Co-authored-by: jmyung <[email protected]>
Co-authored-by: Jerry Park <[email protected]>
Co-authored-by: santachopa <[email protected]>
Co-authored-by: SEUNGHYUN KO <[email protected]>
Co-authored-by: June Yi <[email protected]>
seokho-son added a commit that referenced this pull request Jan 1, 2021
@pjhwa @seokho-son
@jmyung @santachopa @kosehy @gochist
Ko: 1st Korean l10n work for release-1.20
0ed380d 
- Translate reference/glossary/persistent-volume.md in Korean (#25474)
- Update outdated files in the dev-1.20-ko.1 branch (1) (#25576)
- Translate blog/dont-panic-kubernetes-and-docker into Korean (#25596)
- Update outdated files in the dev-1.20-ko.1 branch(3) (#25728)
- Ko: enhance tutorials//cluster-intro translation (#25754)
- Fix Outdated files in the dev-1.20-ko.1 branch (2) (#25765)

Co-authored-by: seokho-son <[email protected]>
Co-authored-by: jmyung <[email protected]>
Co-authored-by: Jerry Park <[email protected]>
Co-authored-by: santachopa <[email protected]>
Co-authored-by: SEUNGHYUN KO <[email protected]>
Co-authored-by: June Yi <[email protected]>
@seokho-son seokho-son mentioned this pull request Jan 1, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pjhwa pjhwa pjhwa left review comments

@ianychoi ianychoi Awaiting requested review from ianychoi

@seokho-son seokho-son Awaiting requested review from seokho-son

Assignees

@gochist gochist

@pjhwa pjhwa

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/ko Issues or PRs related to Korean 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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kosehy @pjhwa @gochist @k8s-ci-robot