Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Himanshu Pandey authored Jun 3, 2019
2 parents af81b51 + 42b422b commit d9770e0
Show file tree
Hide file tree
Showing 18 changed files with 38 additions and 34 deletions.
12 changes: 5 additions & 7 deletions README-de.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@ Weitere Informationen zum Beitrag zur Kubernetes-Dokumentation finden Sie unter:

## `README.md`'s Localizing Kubernetes Documentation

### Koreanisch
### Deutsch
Die Betreuer der deutschen Lokalisierung erreichen Sie unter:

Lesen Sie die Übersetzung von `README.md` und detailliertere Anleitungen für koreanische Mitwirkende auf der Seite [Koreanischen README](README-ko.md).

Sie können die Betreuer der koreanischen Lokalisierung erreichen unter:

* June Yi ([GitHub - @gochist](https://github.com/gochist))
* [Slack Kanal](https://kubernetes.slack.com/messages/kubernetes-docs-ko)
* Benedikt Rollik ([@bene2k1](https://github.com/bene2k1))
* Max Körbächer ([@mkorbi](https://github.com/mkorbi))
* [Slack Kanal](https://kubernetes.slack.com/messages/kubernetes-docs-de)

## Site lokal mit Docker ausführen

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ different Kubernetes components.
| `GCERegionalPersistentDisk` | `true` | Beta | 1.10 | 1.12 |
| `GCERegionalPersistentDisk` | `true` | GA | 1.13 | - |
| `HugePages` | `false` | Alpha | 1.8 | 1.9 |
| `HugePages` | `true` | Beta| 1.10 | |
| `HugePages` | `true` | Beta| 1.10 | 1.13 |
| `HugePages` | `true` | GA | 1.14 | |
| `HyperVContainer` | `false` | Alpha | 1.10 | |
| `Initializers` | `false` | Alpha | 1.7 | 1.13 |
| `Initializers` | - | Deprecated | 1.14 | |
Expand All @@ -110,7 +111,8 @@ different Kubernetes components.
| `MountPropagation` | `false` | Alpha | 1.8 | 1.9 |
| `MountPropagation` | `true` | Beta | 1.10 | 1.11 |
| `MountPropagation` | `true` | GA | 1.12 | |
| `NodeLease` | `false` | Alpha | 1.12 | |
| `NodeLease` | `false` | Alpha | 1.12 | 1.13 |
| `NodeLease` | `true` | Beta | 1.14 | |
| `PersistentLocalVolumes` | `false` | Alpha | 1.7 | 1.9 |
| `PersistentLocalVolumes` | `true` | Beta | 1.10 | 1.13 |
| `PersistentLocalVolumes` | `true` | GA | 1.14 | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: Container Environment Variables
id: container-env-variables
date: 2018-04-12
full_link: /docs/concepts/containers/container-environment-variables.md
full_link: /docs/concepts/containers/container-environment-variables/
short_description: >
Container environment variables are name=value pairs that provide useful information into containers running in a Pod.
Expand Down
11 changes: 7 additions & 4 deletions content/en/docs/setup/minikube.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,10 @@ This brief demo guides you on how to start, use, and delete Minikube locally. Fo
Creating machine...
Starting local Kubernetes cluster...
```
For more information on starting your cluster on a specific Kubernetes version, VM, or container runtime, see [Starting a Cluster](/docs/setup/minikube/#starting-a-cluster).

2. Now, you can interact with your cluster using kubectl. For more information, see [Interacting with Your Cluster](/docs/setup/minikube/#interacting-with-your-cluster).
For more information on starting your cluster on a specific Kubernetes version, VM, or container runtime, see [Starting a Cluster](#starting-a-cluster).

2. Now, you can interact with your cluster using kubectl. For more information, see [Interacting with Your Cluster](#interacting-with-your-cluster).

Let’s create a Kubernetes Deployment using an existing image named `echoserver`, which is a simple HTTP server and expose it on port 8080 using `--port`.
```shell
Expand Down Expand Up @@ -144,7 +145,9 @@ This brief demo guides you on how to start, use, and delete Minikube locally. Fo
Stopping "minikube"...
"minikube" stopped.
```
For more information, see [Stopping a Cluster](/docs/setup/minikube/#stopping-a-cluster).

For more information, see [Stopping a Cluster](#stopping-a-cluster).

10. Delete the local Minikube cluster:
```shell
minikube delete
Expand All @@ -154,7 +157,7 @@ This brief demo guides you on how to start, use, and delete Minikube locally. Fo
Deleting "minikube" ...
The "minikube" cluster has been deleted.
```
For more information, see [Deleting a cluster](/docs/setup/minikube/#deleting-a-cluster).
For more information, see [Deleting a cluster](#deleting-a-cluster).

## Managing your Cluster

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ which should produce output like this:
Selector: app=example
Type: LoadBalancer
IP: 10.67.252.103
LoadBalancer Ingress: 123.45.67.89
LoadBalancer Ingress: 192.0.2.89
Port: <unnamed> 80/TCP
NodePort: <unnamed> 32445/TCP
Endpoints: 10.64.0.4:80,10.64.1.5:80,10.64.2.4:80
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ This section describes how the authentication and authorization flows work, and

The high-level flow is as follows:

1. Kubenetes apiserver: authenticate the requesting user and authorize their rights to the requested API path.
2. Kubenetes apiserver: proxy the request to the extension apiserver
1. Kubernetes apiserver: authenticate the requesting user and authorize their rights to the requested API path.
2. Kubernetes apiserver: proxy the request to the extension apiserver
3. Extension apiserver: authenticate the request from the Kubernetes apiserver
4. Extension apiserver: authorize the request from the original user
5. Extension apiserver: execute
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ To apply network policies use one of the following:

{{% capture whatsnext %}}

Once your have installed Romana, you can follow the [Declare Network Policy](/docs/tasks/administer-cluster/declare-network-policy/) to try out Kubernetes NetworkPolicy.
Once you have installed Romana, you can follow the [Declare Network Policy](/docs/tasks/administer-cluster/declare-network-policy/) to try out Kubernetes NetworkPolicy.

{{% /capture %}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ kubectl get pod private-reg

* Learn more about [Secrets](/docs/concepts/configuration/secret/).
* Learn more about [using a private registry](/docs/concepts/containers/images/#using-a-private-registry).
* Learn more about [adding image pull secrets to a service account](/docs/tasks/configure-pod-container/configure-service-account/#add-imagepullsecrets-to-a-service-account).
* See [kubectl create secret docker-registry](/docs/reference/generated/kubectl/kubectl-commands/#-em-secret-docker-registry-em-).
* See [Secret](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#secret-v1-core).
* See the `imagePullSecrets` field of [PodSpec](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#podspec-v1-core).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ you need is an existing `docker-compose.yml` file.
Selector: service=frontend
Type: LoadBalancer
IP: 10.0.0.183
LoadBalancer Ingress: 123.45.67.89
LoadBalancer Ingress: 192.0.2.89
Port: 80 80/TCP
NodePort: 80 31144/TCP
Endpoints: 172.17.0.4:80
Expand All @@ -189,7 +189,7 @@ you need is an existing `docker-compose.yml` file.
If you're using a cloud provider, your IP will be listed next to `LoadBalancer Ingress`.

```sh
$ curl http://123.45.67.89
$ curl http://192.0.2.89
```

{{% /capture %}}
Expand Down
6 changes: 3 additions & 3 deletions content/en/docs/tasks/tls/managing-tls-in-a-cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ cat <<EOF | cfssl genkey - | cfssljson -bare server
"hosts": [
"my-svc.my-namespace.svc.cluster.local",
"my-pod.my-namespace.pod.cluster.local",
"172.168.0.24",
"192.0.2.24",
"10.0.34.2"
],
"CN": "my-pod.my-namespace.pod.cluster.local",
Expand All @@ -81,7 +81,7 @@ cat <<EOF | cfssl genkey - | cfssljson -bare server
EOF
```

Where `172.168.0.24` is the service's cluster IP,
Where `192.0.2.24` is the service's cluster IP,
`my-svc.my-namespace.svc.cluster.local` is the service's DNS name,
`10.0.34.2` is the pod's IP and `my-pod.my-namespace.pod.cluster.local`
is the pod's DNS name. You should see the following output:
Expand Down Expand Up @@ -147,7 +147,7 @@ Subject:
Serial Number:
Subject Alternative Names:
DNS Names: my-svc.my-namespace.svc.cluster.local
IP Addresses: 172.168.0.24
IP Addresses: 192.0.2.24
10.0.34.2
Events: <none>
```
Expand Down
4 changes: 2 additions & 2 deletions content/id/docs/concepts/workloads/pods/podpreset.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Dalam rangka untuk menggunakan Pod Preset di dalam kluster kamu, kamu harus mema

1. Kamu telah mengaktifkan tipe API `settings.k8s.io/v1alpha1/podpreset`. Sebagai contoh, ini bisa dilakukan dengan menambahkan `settings.k8s.io/v1alpha1=true` di dalam opsi `--runtime-config` untuk API _server_. Dalam _minikube_ tambahkan argumen berikut `--extra-config=apiserver.runtime-config=settings.k8s.io/v1alpha1=true` saat menginisialisasi kluster.

2. Kamu telah mengaktifkan _admission controller_ dari `PodPreset`. Salah satu cara untuk melakukannya adalah dengan menambahkan `PodPreset` di dalam nilai opsi `--enable-admission-plugins` yang dispesifikasikan untuk API _server_. Dalam _minikube_ tambahkan argumen berikut `--extra-config=apiserver.enable-admission-plugins=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota,PodPreset ` saat menginisialisasi kluster.
2. Kamu telah mengaktifkan _admission controller_ dari `PodPreset`. Salah satu cara untuk melakukannya adalah dengan menambahkan `PodPreset` di dalam nilai opsi `--enable-admission-plugins` yang dispesifikasikan untuk API _server_. Dalam _minikube_ tambahkan argumen berikut `--extra-config=apiserver.enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota,PodPreset ` saat menginisialisasi kluster.

3. Kamu telah membuat objek `PodPreset` pada _namespace_ yang kamu gunakan dengan cara mendefinisikan Pod Preset.

Expand All @@ -53,4 +53,4 @@ Dalam rangka untuk menggunakan Pod Preset di dalam kluster kamu, kamu harus mema
{{% capture whatsnext %}}
* [Memasukkan data ke dalam sebuah Pod dengan PodPreset](/docs/concepts/workloads/pods/pod/#injecting-data-into-a-pod-using-podpreset.md)

{{% /capture %}}
{{% /capture %}}
2 changes: 1 addition & 1 deletion content/pt/community/code-of-conduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ css: /css/community.css
Kubernetes segue
<a href="https://github.com/cncf/foundation/blob/master/code-of-conduct.md">CNCF Código de Conduta</a>.
O texto do CNC CoC é reproduzido abaixo, a partir de
<a href="https://github.com/cncf/foundation/blob/0ce4694e5103c0c24ca90c189da81e5408a46632/code-of-conduct.md">commit 0ce4694</a>.
<a href="https://github.com/cncf/foundation/blob/214585e24aab747fb85c2ea44fbf4a2442e30de6/code-of-conduct.md">commit 214585e</a>.
Se você perceber que isso está desatualizado, por favor
<a href="https://github.com/kubernetes/website/issues/new">abra um bug</a>.

Expand Down
Loading

0 comments on commit d9770e0

Please sign in to comment.