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

Revert merge #17133 #17138

Merged
merged 1 commit into from
Oct 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/support.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Support Request
about: Support request or question relating to Kubernetes Website project
about: Support request or question relating to Kubernetes Dashboard project
labels:
- triage/support
---
Expand Down
9 changes: 4 additions & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> Remember to delete this note before submitting your pull request.
>
> For pull requests on 1.17 Features: set Milestone to 1.17 and Base Branch to dev-1.17
> For pull requests on 1.15 Features: set Milestone to 1.15 and Base Branch to dev-1.15
>
> For pull requests on Chinese localization, set Base Branch to release-1.14
>
> For pull requests on Chinese localization, set Base Branch to release-1.16
> Feel free to ask questions in #kubernetes-docs-zh
>
> For pull requests on Korean Localization: set Base Branch to dev-1.16-ko.\<latest team milestone>
> For pull requests on Korean Localization: set Base Branch to dev-1.14-ko.\<latest team milestone>
>
> If you need Help on editing and submitting pull requests, visit:
> https://kubernetes.io/docs/contribute/start/#improve-existing-content.
Expand Down
2 changes: 0 additions & 2 deletions OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ approvers:
emeritus_approvers:
- chenopis
- jaredbhatti
# stewart-yu, you're welcome to return when you're ready to resume PR wrangling
- stewart-yu

labels:
- sig/docs
12 changes: 5 additions & 7 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ aliases:
- timothysc
- lukemarsden
- luxas
- roberthbailey
- fabriziopandini
sig-cluster-lifecycle-kubeadm-reviewers: # Reviewing kubeadm documentation
- timothysc
- lukemarsden
- luxas
- roberthbailey
- fabriziopandini
- kad
- xiangpengzhao
Expand Down Expand Up @@ -39,17 +41,18 @@ aliases:
- bradtopol
- chenopis
- cody-clark
- daminisatya
- gochist
- jaredbhatti
- jimangel
- kbarnard10
- kbhawkey
- makoscafee
- mistyhacks
- rajakavitha1
- ryanmcginnis
- simplytunde
- steveperry-53
- stewart-yu
- tengqm
- tfogo
- xiangpengzhao
Expand All @@ -58,6 +61,7 @@ aliases:
sig-docs-en-reviews: # PR reviews for English content
- rajakavitha1
- sftim
- stewart-yu
sig-docs-es-owners: # Admins for Spanish content
- raelga
- alexbrand
Expand Down Expand Up @@ -178,9 +182,3 @@ aliases:
- femrtnz
- jcjesus
- devlware
sig-docs-vi-owners: # Admins for Vietnamese content
- ngtuna
- truongnh1992
sig-docs-vi-reviews: # PR reviews for Vietnamese content
- ngtuna
- truongnh1992
2 changes: 1 addition & 1 deletion README-pt.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Bem vindos! Este repositório abriga todos os recursos necessários para criar o

Você pode clicar no botão **Fork** na área superior direita da tela para criar uma cópia desse repositório na sua conta do GitHub. Esta cópia é chamada de *fork*. Faça as alterações desejadas no seu fork e, quando estiver pronto para enviar as alterações para nós, vá até o fork e crie uma nova solicitação de pull para nos informar sobre isso.

Depois que seu **pull request** for criado, um revisor do Kubernetes assumirá a responsabilidade de fornecer um feedback claro e objetivo. Como proprietário do pull request, **é sua responsabilidade modificar seu pull request para abordar o feedback que foi fornecido a você pelo revisor do Kubernetes.** Observe também que você pode acabar tendo mais de um revisor do Kubernetes para fornecer seu feedback ou você pode acabar obtendo feedback de um revisor do Kubernetes que é diferente daquele originalmente designado para lhe fornecer feedback. Além disso, em alguns casos, um de seus revisores pode solicitar uma revisão técnica de um [revisor de tecnologia Kubernetes](https://github.com/kubernetes/website/wiki/Tech-reviewers) quando necessário. Os revisores farão o melhor para fornecer feedback em tempo hábil, mas o tempo de resposta pode variar de acordo com as circunstâncias.
Depois que seu **pull request** for criada, um revisor do Kubernetes assumirá a responsabilidade de fornecer um feedback claro e objetivo. Como proprietário do pull request, **é sua responsabilidade modificar seu pull request para abordar o feedback que foi fornecido a você pelo revisor do Kubernetes.** Observe também que você pode acabar tendo mais de um revisor do Kubernetes para fornecer seu feedback ou você pode acabar obtendo feedback de um revisor do Kubernetes que é diferente daquele originalmente designado para lhe fornecer feedback. Além disso, em alguns casos, um de seus revisores pode solicitar uma revisão técnica de um [revisor de tecnologia Kubernetes](https://github.com/kubernetes/website/wiki/Tech-reviewers) quando necessário. Os revisores farão o melhor para fornecer feedback em tempo hábil, mas o tempo de resposta pode variar de acordo com as circunstâncias.

Para mais informações sobre como contribuir com a documentação do Kubernetes, consulte:

Expand Down
72 changes: 0 additions & 72 deletions README-vi.md

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ For more information about contributing to the Kubernetes documentation, see:
|[German README](README-de.md)|[Portuguese README](README-pt.md)|
|[Hindi README](README-hi.md)|[Spanish README](README-es.md)|
|[Indonesian README](README-id.md)|[Chinese README](README-zh.md)|
|[Japanese README](README-ja.md)|[Vietnamese README](README-vi.md)|
|[Japanese README](README-ja.md)||
|||

## Running the website locally using Docker
Expand Down
10 changes: 10 additions & 0 deletions assets/sass/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# See the OWNERS docs at https://go.k8s.io/owners

# Allow CSS/SASS updates from blog and case studies owners
options:
no_parent_owners: false
reviewers:
- alexcontini
approvers:
- alexcontini

9 changes: 3 additions & 6 deletions assets/sass/_base.sass
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,7 @@ header
background-size: contain
background-position: center center
background-repeat: no-repeat

#blog
&.flip-nav, &.open-nav
.logo
background-image: url(../images/nav_logo2.svg)


// Blog post tables
.blog-content
Expand Down Expand Up @@ -894,6 +890,7 @@ dd
font-family: $mono-font
vertical-align: baseline
font-size: 14px
font-weight: bold
padding: 2px 4px

a code
Expand Down Expand Up @@ -1065,7 +1062,7 @@ dd
position: fixed
bottom: 0

.miceType
#miceType
clear: both
font-size: 11px
line-height: 18px
Expand Down
7 changes: 0 additions & 7 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,3 @@ contentDir = "content/hi"
[languages.hi.params]
time_format_blog = "01.02.2006"
language_alternatives = ["en"]

[languages.vi]
title = "Kubernetes"
description = "Production-Grade Container Orchestration"
languageName = "Vietnamese"
contentDir = "content/vi"
weight = 12
2 changes: 1 addition & 1 deletion content/de/case-studies/_index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: Fallstudien
linkTitle: Fallstudien
bigheader: Kubernetes Anwenderberichte
bigheader: Kubernetes Anwenderberichte
abstract: Eine Sammlung von Benutzern, die Kubernetes in Produktion verwenden.
layout: basic
class: gridPage
Expand Down
6 changes: 3 additions & 3 deletions content/de/community/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ <h3>Special Interest Groups (SIGs)</h3>

<div class="content">
<h3>Verhaltensregeln</h3>
<p>Die Kubernetes-Community schätzt Respekt und Inklusivität und setzt einen <a href="code-of-conduct/">Verhaltenskodex</a>
in allen Interaktionen durch. Wenn Sie einen Verstoß gegen den Verhaltenskodex bei einer Veranstaltung oder Sitzung,
in Slack oder in einem anderen Kommunikationsmechanismus feststellen, wenden Sie sich
<p>Die Kubernetes-Community schätzt Respekt und Inklusivität und setzt einen <a href="code-of-conduct/">Verhaltenskodex</a>
in allen Interaktionen durch. Wenn Sie einen Verstoß gegen den Verhaltenskodex bei einer Veranstaltung oder Sitzung,
in Slack oder in einem anderen Kommunikationsmechanismus feststellen, wenden Sie sich
bitte an das <a href="https://github.com/kubernetes/community/tree/master/committee-code-of-conduct">Kubernetes Code of Conduct Committee</a> <a href="mailto:[email protected]">[email protected]</a>. Ihre Anonymität wird geschützt.
</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions content/de/docs/concepts/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Im Abschnitt Konzepte erfahren Sie mehr über die Teile des Kubernetes-Systems u

## Überblick

Um mit Kubernetes zu arbeiten, verwenden Sie *Kubernetes-API-Objekte*, um den *gewünschten Status Ihres Clusters* zu beschreiben:
Um mit Kubernetes zu arbeiten, verwenden Sie *Kubernetes-API-Objekte*, um den *gewünschten Status Ihres Clusters* zu beschreiben:
welche Anwendungen oder anderen Workloads Sie ausführen möchten, welche Containerimages sie verwenden, die Anzahl der Replikate, welche Netzwerk- und Festplattenressourcen Sie zur Verfügung stellen möchten, und vieles mehr. Sie legen den gewünschten Status fest, indem Sie Objekte mithilfe der Kubernetes-API erstellen, normalerweise über die Befehlszeilenschnittstelle `kubectl`. Sie können die Kubernetes-API auch direkt verwenden, um mit dem Cluster zu interagieren und den gewünschten Status festzulegen oder zu ändern.

Sobald Sie den gewünschten Status eingestellt haben, wird das *Kubernetes Control Plane* dafür sorgen, dass der aktuelle Status des Clusters mit dem gewünschten Status übereinstimmt. Zu diesem Zweck führt Kubernetes verschiedene Aufgaben automatisch aus, z. B. Starten oder Neustarten von Containern, Skalieren der Anzahl der Repliken einer bestimmten Anwendung und vieles mehr. Das Kubernetes Control Plane besteht aus einer Reihe von Prozessen, die in Ihrem Cluster ausgeführt werden:
Expand All @@ -27,7 +27,7 @@ Sobald Sie den gewünschten Status eingestellt haben, wird das *Kubernetes Contr

## Kubernetes Objects

Kubernetes enthält eine Reihe von Abstraktionen, die den Status Ihres Systems darstellen: implementierte containerisierte Anwendungen und Workloads, die zugehörigen Netzwerk- und Festplattenressourcen sowie weitere Informationen zu den Aufgaben Ihres Clusters. Diese Abstraktionen werden durch Objekte in der Kubernetes-API dargestellt; Lesen Sie [Kubernetes Objects Überblick](/docs/concepts/abstractions/overview/) für weitere Details.
Kubernetes enthält eine Reihe von Abstraktionen, die den Status Ihres Systems darstellen: implementierte containerisierte Anwendungen und Workloads, die zugehörigen Netzwerk- und Festplattenressourcen sowie weitere Informationen zu den Aufgaben Ihres Clusters. Diese Abstraktionen werden durch Objekte in der Kubernetes-API dargestellt; Lesen Sie [Kubernetes Objects Überblick](/docs/concepts/abstractions/overview/) für weitere Details.

Die grundlegenden Objekte von Kubernetes umfassen:

Expand Down
Loading