-
Notifications
You must be signed in to change notification settings - Fork 14.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update with master content resolving merge conflicts
- Loading branch information
Showing
1,439 changed files
with
70,917 additions
and
43,285 deletions.
There are no files selected for viewing
16 changes: 8 additions & 8 deletions
16
.github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/bug-report.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| --- | ||
| name: Feature Request | ||
| about: Suggest a/an feature/enhancement to the Kubernetes Website project | ||
| labels: | ||
| - kind/feature | ||
| --- | ||
| **This is a Feature Request** | ||
|
|
||
| <!-- Please only use this template for submitting feature/enhancement requests --> | ||
| <!-- See https://kubernetes.io/docs/contribute/start/ for guidance on writing an actionable issue description. --> | ||
|
|
||
| **What would you like to be added** | ||
| <!-- Describe as precisely as possible how this feature/enhancement should work from the user perspective. What should be changed, etc. --> | ||
|
|
||
| **Why is this needed** | ||
|
|
||
| **Comments** | ||
| <!-- Any additional related comments that might help. Drawings/mockups would be extremely helpful (if required). --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| --- | ||
| name: Support Request | ||
| about: Support request or question relating to Kubernetes Dashboard project | ||
| labels: | ||
| - triage/support | ||
| --- | ||
| **This is Support** | ||
|
|
||
| <!-- | ||
| STOP -- PLEASE READ! | ||
| GitHub is not the right place for support requests. | ||
| If you're looking for help, check [Stack Overflow](https://stackoverflow.com/questions/tagged/kubernetes) | ||
| You can also post your question on the [Kubernetes Slack](http://slack.k8s.io/) or the [Discuss Kubernetes](https://discuss.kubernetes.io/) forum. | ||
| If the matter is security related, please disclose it privately via https://kubernetes.io/security/. | ||
| --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| > Please delete this note before submitting the pull request. | ||
| > Remember to delete this note before submitting your pull request. | ||
| > | ||
| > For 1.14 Features: set Milestone to 1.14 and Base Branch to dev-1.14 | ||
| > For pull requests on 1.15 Features: set Milestone to 1.15 and Base Branch to dev-1.15 | ||
| > | ||
| > For Chinese localization, base branch to release-1.12 | ||
| > For pull requests on Chinese localization, set Base Branch to release-1.14 | ||
| > | ||
| > For Korean Localization: set Base Branch to dev-1.13-ko.<latest team milestone> | ||
| > For pull requests on Korean Localization: set Base Branch to dev-1.14-ko.\<latest team milestone> | ||
| > | ||
| > Help editing and submitting pull requests: | ||
| > If you need Help on editing and submitting pull requests, visit: | ||
| > https://kubernetes.io/docs/contribute/start/#improve-existing-content. | ||
| > | ||
| > Help choosing which branch to use: | ||
| > If you need Help on choosing which branch to use, visit: | ||
| > https://kubernetes.io/docs/contribute/start#choose-which-git-branch-to-use. | ||
| >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| > |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| **/.DS_Store | ||
| **/desktop.ini | ||
| _site/** | ||
| .sass-cache/** | ||
| CNAME | ||
| .travis.yml | ||
| .idea/ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| # La documentación de Kubernetes | ||
|
|
||
| [](https://travis-ci.org/kubernetes/website) | ||
| [](https://github.com/kubernetes/website/releases/latest) | ||
|
|
||
| Bienvenido! | ||
| Este repositorio contiene todos los recursos necesarios para construir el [sitio web de Kubernetes y su documentación](https://kubernetes.io/). ¡Estamos encantados de que quiera contribuir! | ||
|
|
||
| ## Contribuyendo con la documentación | ||
|
|
||
| Puede hacer clic en el botón **Fork** situado en la esquina superior derecha de la pantalla para crear una copia de este repositorio en su cuenta de GitHub. A ese tipo de copia se le llama **Fork** (bifurcación) y le permite editar el contenido del repositorio en su copia personal. Realice los cambios que quiera en su **fork** y, cuando esté listo para enviarnos esos cambios, vaya a **fork** en repositorio en su GitHub y cree una nueva **pull request** para que tengamos constancia de la propuesta de cambios. | ||
|
|
||
| Una vez la **pull request** ha sido creada, un revisor de Kubernetes asumirá la responsabilidad de proporcionar comentarios claros y prácticos sobre como continuar. Como propietario de la PR, **es su responsabilidad modificar la pull request para abordar los comentarios proporcionados por el revisor de Kubernetes.** Tenga en cuenta que algunas veces puede terminar teniendo más de un revisor de Kubernetes participando en la revisión, por lo que es posible que reciba comentarios de más revisores a parte del asignado originalmente en la creación de la **pull request**. Además, en algunas ocasiones, es posible que uno de sus revisores solicite una revisión técnica por parte de un [revisor técnico de Kubernetes](https://github.com/kubernetes/website/wiki/Tech-reviewers) si lo considera necesario. | ||
|
|
||
| Los revisores harán todo lo posible para proporcionar toda la información necesaria para que la **pull request** siga adelante en un tiempo razonable, pero este tiempo de respuesta puede variar según las circunstancias. | ||
|
|
||
| Para obtener más información sobre cómo contribuir a la documentación de Kubernetes, puede consultar: | ||
|
|
||
| * [Empezando a contribuir](https://kubernetes.io/docs/contribute/start/) | ||
| * [Visualizando sus cambios en su entorno local](http://kubernetes.io/docs/contribute/intermediate#view-your-changes-locally) | ||
| * [Utilizando las plantillas de las páginas](http://kubernetes.io/docs/contribute/style/page-templates/) | ||
| * [Guía de estilo de la documentación](http://kubernetes.io/docs/contribute/style/style-guide/) | ||
| * [Traduciendo la documentación de Kubernetes](https://kubernetes.io/docs/contribute/localization/) | ||
|
|
||
| ## Levantando el sitio web kubernetes.io en su entorno local con Docker | ||
|
|
||
| El método recomendado para levantar una copia local del sitio web kubernetes.io es utilizando la imagen de [Docker](https://docker.com) que incluye el generador de sitios estáticos [Hugo](https://gohugo.io). | ||
|
|
||
| > Para Windows, algunas otras herramientas como Make son necesarias. Puede instalarlas utilizando el gestor [Chocolatey](https://chocolatey.org). `choco install make` o siguiendo las instrucciones de [Make for Windows](http://gnuwin32.sourceforge.net/packages/make.htm). | ||
| > Si prefiere levantar el sitio web sin utilizar **Docker**, puede seguir las instrucciones disponibles en la sección [Levantando kubernetes.io en local con Hugo](#levantando-kubernetes.io-en-local-con-hugo). | ||
| Una vez tenga Docker [configurado en su máquina](https://www.docker.com/get-started), puede construir la imagen de Docker `kubernetes-hugo` localmente ejecutando el siguiente comando en la raíz del repositorio: | ||
|
|
||
| ```bash | ||
| make docker-image | ||
| ``` | ||
|
|
||
| Una vez tenga la imagen construida, puede levantar el sitio web ejecutando: | ||
|
|
||
| ```bash | ||
| make docker-serve | ||
| ``` | ||
|
|
||
| Abra su navegador y visite http://localhost:1313 para acceder a su copia local del sitio. A medida que vaya haciendo cambios en el código fuente, Hugo irá actualizando la página y forzará la actualización en el navegador. | ||
|
|
||
| ## Levantando kubernetes.io en local con Hugo | ||
|
|
||
| Revise la [documentación oficial de Hugo](https://gohugo.io/getting-started/installing/) para obtener las instrucciones de instalación en su sistema operativo. Asegúrese de instalar la versión de Hugo especificada en la variable de entorno `HUGO_VERSION` del fichero [`netlify.toml`](netlify.toml#L9). | ||
|
|
||
| Para levantar el sitio localmente una vez Hugo está instalado en su sistema, puede ejecutar el siguiente comando: | ||
|
|
||
| ```bash | ||
| make serve | ||
| ``` | ||
|
|
||
| Este comando levantará un servidor de Hugo en el puerto **1313** al que podrá acceder visitando http://localhost:1313 y dónde podrá visualizar su copia local del sitio web. A medida que vaya haciendo cambios en el código fuente, Hugo irá actualizando la página y forzará la actualización en el navegador. | ||
|
|
||
| ## Comunidad, discusión, contribuir y soporte | ||
|
|
||
| Aprenda como participar en la comunidad de Kubernetes visitando la [página de comunidad](http://kubernetes.io/community/). | ||
|
|
||
| Puede ponerse en contacto con los mantenedores de este proyecto en: | ||
|
|
||
| - [Slack](https://kubernetes.slack.com/messages/sig-docs) | ||
| - [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-docs) | ||
|
|
||
| ### Código de conducta | ||
|
|
||
| La participación en la comunidad de Kubernetes está regulada por el [Código de Conducta de Kubernetes](code-of-conduct.md). | ||
|
|
||
| ## ¡Muchas gracias! | ||
|
|
||
| Kubernetes es posible gracias a la participación de la comunidad y la documentación es vital para facilitar el acceso al proyecto. | ||
|
|
||
| Agradecemos muchísimo sus contribuciones a nuestro sitio web y nuestra documentación. |
Oops, something went wrong.
8781518There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it seems more conflict files are committed. More orig files add added.
8781518There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for catching this up ... I am addressing it now.
8781518There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@willseeyou this PR #15011 will address that. Thanks alot