Merge pull request #229 from jpetazzo/master

Merging in updates
This commit is contained in:
Bridget Kromhout
2018-04-22 13:44:51 -05:00
committed by GitHub
4 changed files with 25 additions and 25 deletions

View File

@@ -199,22 +199,22 @@ We also have one too many pods.
- We still have the old `rng` *deployment*
```
NAME DESIRED CURRENT UP-TO-DATE AVAILABLE AGE
rng 1 1 1 1 11m
NAME DESIRED CURRENT UP-TO-DATE AVAILABLE AGE
deployment.apps/rng 1 1 1 1 18m
```
- But now we have the new `rng` *daemon set* as well
```
NAME DESIRED CURRENT READY UP-TO-DATE AVAILABLE NODE SELECTOR AGE
rng 2 2 2 2 2 <none> 11s
NAME DESIRED CURRENT READY UP-TO-DATE AVAILABLE NODE SELECTOR AGE
daemonset.apps/rng 2 2 2 2 2 <none> 9s
```
---
## Too many pods
- If we look at the pods, we have:
- If we check with `kubectl get pods`, we see:
- *one pod* for the deployment (named `rng-xxxxxxxxxx-yyyyy`)
@@ -432,9 +432,9 @@ Of course, option 2 offers more learning opportunities. Right?
.exercise[
- Check the logs of all `run=rng` pods to confirm that exactly one per node is now active:
- Check the most recent log line of all `run=rng` pods to confirm that exactly one per node is now active:
```bash
kubectl logs -l run=rng
kubectl logs -l run=rng --tail 1
```
]

View File

@@ -50,11 +50,11 @@ OK, what just happened?
--
We should see the following things:
- `deploy/pingpong` (the *deployment* that we just created)
- `rs/pingpong-xxxx` (a *replica set* created by the deployment)
- `po/pingpong-yyyy` (a *pod* created by the replica set)
- `deployment.apps/pingpong` (the *deployment* that we just created)
- `replicaset.apps/pingpong-xxxxxxxxxx` (a *replica set* created by the deployment)
- `pod/pingpong-xxxxxxxxxx-yyyyy` (a *pod* created by the replica set)
Note: as of 1.10.0, types aren't displayed! [This is a bug and will be corrected in 1.10.1.](https://github.com/kubernetes/kubernetes/issues/62340)
Note: as of 1.10.1, resource types are displayed in more detail.
---
@@ -83,25 +83,25 @@ Note: as of 1.10.0, types aren't displayed! [This is a bug and will be corrected
## Our `pingpong` deployment
- `kubectl run` created a *deployment*, `deploy/pingpong`
- `kubectl run` created a *deployment*, `deployment.apps/pingpong`
```
NAME DESIRED CURRENT UP-TO-DATE AVAILABLE AGE
pingpong 1 1 1 1 24m
NAME DESIRED CURRENT UP-TO-DATE AVAILABLE AGE
deployment.apps/pingpong 1 1 1 1 10m
```
- That deployment created a *replica set*, `rs/pingpong-xxxx`
- That deployment created a *replica set*, `replicaset.apps/pingpong-xxxxxxxxxx`
```
NAME DESIRED CURRENT READY AGE
pingpong-68bbb64457 1 1 1 24m
NAME DESIRED CURRENT READY AGE
replicaset.apps/pingpong-7c8bbcd9bc 1 1 1 10m
```
- That replica set created a *pod*, `po/pingpong-yyyy`
- That replica set created a *pod*, `pod/pingpong-xxxxxxxxxx-yyyyy`
```
NAME READY STATUS RESTARTS AGE
pingpong-68bbb64457-x7vss 1/1 Running 0 24m
NAME READY STATUS RESTARTS AGE
pod/pingpong-7c8bbcd9bc-6c9qz 1/1 Running 0 10m
```
- We'll see later how these folks play together for:
@@ -172,7 +172,7 @@ pingpong-68bbb64457-x7vss 1/1 Running 0 24m
]
Note: what if we tried to scale `rs/pingpong-xxxx`?
Note: what if we tried to scale `replicaset.apps/pingpong-xxxxxxxxxx`?
We could! But the *deployment* would notice it right away, and scale back to the initial level.
@@ -200,7 +200,7 @@ We could! But the *deployment* would notice it right away, and scale back to the
- Destroy a pod:
```bash
kubectl delete pod pingpong-yyyy
kubectl delete pod pingpong-xxxxxxxxxx-yyyyy
```
]

View File

@@ -63,7 +63,7 @@
## Kubernetes network model: in practice
- The nodes that we are using have been set up to use Weave
- The nodes that we are using have been set up to use [Weave](https://github.com/weaveworks/weave)
- We don't endorse Weave in a particular way, it just Works For Us

View File

@@ -1,6 +1,6 @@
## Versions installed
- Kubernetes 1.10.0
- Kubernetes 1.10.1
- Docker Engine 18.03.0-ce
- Docker Compose 1.20.1
@@ -22,7 +22,7 @@ class: extra-details
## Kubernetes and Docker compatibility
- Kubernetes 1.10 only validates Docker Engine versions [1.11.2 to 1.13.1 and 17.03.x](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies)
- Kubernetes 1.10.x only validates Docker Engine versions [1.11.2 to 1.13.1 and 17.03.x](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies)
--