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

Add content/es/docs/concepts/overview/components.md #22259

Merged
merged 7 commits into from
Jul 9, 2020

Conversation

raelga
Copy link
Member

@raelga raelga commented Jul 1, 2020

Follows the awesome @bureado work, applies the pending suggestions from #14678 and adds all the missing glossary terms that were causing the build failure.

@raelga raelga self-assigned this Jul 1, 2020
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 1, 2020
@k8s-ci-robot k8s-ci-robot added language/es Issues or PRs related to Spanish language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Jul 1, 2020
@netlify
Copy link

netlify bot commented Jul 1, 2020

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

Built with commit a4390f1

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

@raelga raelga force-pushed the es-overview-components branch 2 times, most recently from 805c0f9 to cbbaf72 Compare July 2, 2020 10:15
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.

Informal feedback (I don't speak Spanish very well)

content/es/docs/concepts/overview/components.md Outdated Show resolved Hide resolved
content/es/docs/concepts/overview/components.md Outdated Show resolved Hide resolved
content/es/docs/concepts/overview/components.md Outdated Show resolved Hide resolved
content/es/docs/reference/glossary/controller.md Outdated Show resolved Hide resolved
content/es/docs/reference/glossary/kube-apiserver.md Outdated Show resolved Hide resolved
content/es/docs/reference/glossary/kube-apiserver.md Outdated Show resolved Hide resolved
content/es/docs/reference/glossary/kube-apiserver.md Outdated Show resolved Hide resolved
content/es/docs/reference/glossary/namespace.md Outdated Show resolved Hide resolved
content/es/docs/reference/glossary/namespace.md Outdated Show resolved Hide resolved
@raelga raelga force-pushed the es-overview-components branch 3 times, most recently from 90b3a1c to 891b912 Compare July 4, 2020 08:33
@raelga raelga requested a review from sftim July 4, 2020 16:46
@sftim
Copy link
Contributor

sftim commented Jul 5, 2020

@raelga that was just an informal review - I'm confident you understood what fixes I was suggesting

@raelga
Copy link
Member Author

raelga commented Jul 6, 2020

/cc @emedina :D

@raelga raelga requested a review from emedina July 6, 2020 20:02
Copy link
Contributor

@emedina emedina left a comment

Choose a reason for hiding this comment

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

@bureado, por favor, revisa los cambios sugeridos...

content/es/docs/concepts/overview/components.md Outdated Show resolved Hide resolved
content/es/docs/concepts/overview/components.md Outdated Show resolved Hide resolved
content/es/docs/concepts/overview/components.md Outdated Show resolved Hide resolved
content/es/docs/concepts/overview/components.md Outdated Show resolved Hide resolved
content/es/docs/concepts/overview/components.md Outdated Show resolved Hide resolved
content/es/docs/reference/glossary/controller.md Outdated Show resolved Hide resolved
content/es/docs/reference/glossary/controller.md Outdated Show resolved Hide resolved
content/es/docs/reference/glossary/kube-scheduler.md Outdated Show resolved Hide resolved
content/es/docs/reference/glossary/kube-scheduler.md Outdated Show resolved Hide resolved
content/es/docs/reference/glossary/kube-scheduler.md Outdated Show resolved Hide resolved
@raelga raelga force-pushed the es-overview-components branch from 7d25989 to 2a396be Compare July 8, 2020 22:34
@k8s-ci-robot k8s-ci-robot added the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Jul 8, 2020
@sftim
Copy link
Contributor

sftim commented Jul 8, 2020

If you did have time to rebase this further @raelga you could probably cut it from 16 commits down to 1

@raelga raelga force-pushed the es-overview-components branch from 2a396be to 16f864d Compare July 8, 2020 22:41
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Jul 8, 2020
@raelga raelga force-pushed the es-overview-components branch from 16f864d to f3b2172 Compare July 8, 2020 23:01
@raelga
Copy link
Member Author

raelga commented Jul 8, 2020

Gracias @emedina, he aplicado tus sugerencias en f3b2172.

Échale un vistazo y me dices!

@raelga
Copy link
Member Author

raelga commented Jul 8, 2020

@raelga that was just an informal review - I'm confident you understood what fixes I was suggesting

I reduced the number of commits, anyhow, this will be squashed on merge.

raelga and others added 3 commits July 9, 2020 01:08
Add controller glossary term
Add etcd glossary term
Add kube-apiserver glossary term
Add kube-controller-manager glossary term
Add kube-sccheduler glossary term
Add namespace glossary term
Co-authored-by: Enrique Medina Montenegro <[email protected]>
@raelga raelga force-pushed the es-overview-components branch from f3b2172 to a4390f1 Compare July 8, 2020 23:08
@sftim sftim added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jul 8, 2020
@sftim
Copy link
Contributor

sftim commented Jul 8, 2020

I've marked this for squash on merge (the default is now merge-method-merge).

@emedina
Copy link
Contributor

emedina commented Jul 9, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 9, 2020
@raelga
Copy link
Member Author

raelga commented Jul 9, 2020

I've marked this for squash on merge (the default is now merge-method-merge).

Good to know, thanks! I like to keep some minimum number of logical commits to make easier reviewing and working on the documentation. I will add the label on the next PRs!

/lgtm

Thanks @emedina !

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: raelga

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 Jul 9, 2020
@k8s-ci-robot k8s-ci-robot merged commit 9799d0f into kubernetes:master Jul 9, 2020
@sftim
Copy link
Contributor

sftim commented Jul 9, 2020

One more thing on squashing @raelga - if the commits are squashed down as much as you think they can go and each commit message describes a logically separate change, then there's no need to select a squash merge method.

@sftim
Copy link
Contributor

sftim commented Jul 9, 2020

Looking back at this, it's fine, I'd be happy to see that sequence of commits go in as a merge. When I saw more than 30 though I was thinking it could definitely use a tidying.

@raelga
Copy link
Member Author

raelga commented Jul 9, 2020

The 30 commit spike was just the result of accepting all @emedina suggestions. It makes easier to accept all the suggestions using the GitHub PR discussion interface and then squash them into a single accepted suggestions commit coauthored by the reviewer. But you catch me in the middle of the process :P.

irvifa pushed a commit to irvifa/website that referenced this pull request Jul 12, 2020
* Add content/es/docs/concepts/overview/components.md

* Apply kubernetes#14678 suggestions

* Replace content_template with content_type

* Remove capture shortcode

* Add missing glossary terms

Add controller glossary term
Add etcd glossary term
Add kube-apiserver glossary term
Add kube-controller-manager glossary term
Add kube-sccheduler glossary term
Add namespace glossary term

* Remove `master` references

* Apply emedina suggestions

Co-authored-by: Enrique Medina Montenegro <[email protected]>

Co-authored-by: Jose Miguel Parrella <[email protected]>
Co-authored-by: Enrique Medina Montenegro <[email protected]>
@raelga raelga deleted the es-overview-components branch September 7, 2020 10:04
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/es Issues or PRs related to Spanish 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/L Denotes a PR that changes 100-499 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants