whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update with master content resolving merge conflicts

Browse Source
This commit is contained in:
MAKOSCAFEE
2019-06-19 19:10:18 +03:00
parent b42f019aae 42cbe1256e
commit 8781518d32
1439 changed files with 70927 additions and 43295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/en/docs/tasks/access-application-cluster/communicate-containers-same-pod-shared-volume.md
+3 -1
View File
@@ -7,7 +7,7 @@ weight: 110
{{% capture overview %}}
This page shows how to use a Volume to communicate between two Containers running
in the same Pod.
in the same Pod. See also how to allow processes to communicate by [sharing process namespace](/docs/tasks/configure-pod-container/share-process-namespace/) between containers.
{{% /capture %}}
@@ -141,6 +141,8 @@ the shared Volume is lost.
* See
[Configuring a Pod to Use a Volume for Storage](/docs/tasks/configure-pod-container/configure-volume-storage/).
* See [Configure a Pod to share process namespace between containers in a Pod](/docs/tasks/configure-pod-container/share-process-namespace/)
* See [Volume](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#volume-v1-core).
* See [Pod](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#pod-v1-core).
content/en/docs/tasks/access-application-cluster/configure-access-multiple-clusters.md
+6 -6
View File
@@ -262,12 +262,12 @@ For example:
### Linux
```shell
export KUBECONFIG_SAVED=$KUBECONFIG
export KUBECONFIG_SAVED=$KUBECONFIG
```
### Windows PowerShell
```shell
$Env:KUBECONFIG_SAVED=$ENV:KUBECONFIG
```
$Env:KUBECONFIG_SAVED=$ENV:KUBECONFIG
```
The `KUBECONFIG` environment variable is a list of paths to configuration files. The list is
colon-delimited for Linux and Mac, and semicolon-delimited for Windows. If you have
a `KUBECONFIG` environment variable, familiarize yourself with the configuration files
@@ -277,7 +277,7 @@ Temporarily append two paths to your `KUBECONFIG` environment variable. For exam
### Linux
```shell
export KUBECONFIG=$KUBECONFIG:config-demo:config-demo-2
export KUBECONFIG=$KUBECONFIG:config-demo:config-demo-2
```
### Windows PowerShell
```shell
@@ -344,7 +344,7 @@ export KUBECONFIG=$KUBECONFIG:$HOME/.kube/config
```
### Windows Powershell
```shell
$Env:KUBECONFIG=($Env:KUBECONFIG;$HOME/.kube/config)
$Env:KUBECONFIG=($Env:KUBECONFIG;$HOME/.kube/config)
```
View configuration information merged from all the files that are now listed
@@ -363,7 +363,7 @@ export KUBECONFIG=$KUBECONFIG_SAVED
```
Windows PowerShell
```shell
$Env:KUBECONFIG=$ENV:KUBECONFIG_SAVED
$Env:KUBECONFIG=$ENV:KUBECONFIG_SAVED
```
{{% /capture %}}
content/en/docs/tasks/access-application-cluster/create-external-load-balancer.md
+1 -1
View File
@@ -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
content/en/docs/tasks/access-application-cluster/ingress-minikube.md
+6 -9
View File
@@ -135,8 +135,6 @@ The following file is an Ingress resource that sends traffic to your Service via
1. Create `example-ingress.yaml` from the following file:
```yaml
---
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
@@ -152,7 +150,6 @@ The following file is an Ingress resource that sends traffic to your Service via
backend:
serviceName: web
servicePort: 8080
```
1. Create the Ingress resource by running the following command:
@@ -232,12 +229,12 @@ The following file is an Ingress resource that sends traffic to your Service via
1. Edit the existing `example-ingress.yaml` and add the following lines:
```yaml
- path: /v2/*
backend:
serviceName: web2
servicePort: 8080
```
```yaml
- path: /v2/*
backend:
serviceName: web2
servicePort: 8080
```
1. Apply the changes:
content/en/docs/tasks/access-application-cluster/port-forward-access-application-cluster.md
+10 -10
View File
@@ -90,30 +90,30 @@ for database debugging.
## Forward a local port to a port on the pod
1. `kubectl port-forward` allows using resource name, such as a service name, to select a matching pod to port forward to since Kubernetes v1.10.
1. `kubectl port-forward` allows using resource name, such as a pod name, to select a matching pod to port forward to since Kubernetes v1.10.
kubectl port-forward redis-master-765d459796-258hz 6379:6379
kubectl port-forward redis-master-765d459796-258hz 7000:6379
which is the same as
kubectl port-forward pods/redis-master-765d459796-258hz 6379:6379
kubectl port-forward pods/redis-master-765d459796-258hz 7000:6379
or
kubectl port-forward deployment/redis-master 6379:6379
kubectl port-forward deployment/redis-master 7000:6379
or
kubectl port-forward rs/redis-master 6379:6379
kubectl port-forward rs/redis-master 7000:6379
or
kubectl port-forward svc/redis-master 6379:6379
kubectl port-forward svc/redis-master 7000:6379
Any of the above commands works. The output is similar to this:
I0710 14:43:38.274550 3655 portforward.go:225] Forwarding from 127.0.0.1:6379 -> 6379
I0710 14:43:38.274797 3655 portforward.go:225] Forwarding from [::1]:6379 -> 6379
I0710 14:43:38.274550 3655 portforward.go:225] Forwarding from 127.0.0.1:7000 -> 6379
I0710 14:43:38.274797 3655 portforward.go:225] Forwarding from [::1]:7000 -> 6379
2. Start the Redis command line interface:
@@ -121,7 +121,7 @@ for database debugging.
3. At the Redis command line prompt, enter the `ping` command:
127.0.0.1:6379>ping
127.0.0.1:7000>ping
A successful ping request returns PONG.
@@ -132,7 +132,7 @@ for database debugging.
## Discussion
Connections made to local port 6379 are forwarded to port 6379 of the pod that
Connections made to local port 7000 are forwarded to port 6379 of the pod that
is running the Redis server. With this connection in place you can use your
local workstation to debug the database that is running in the pod.