Skip to content

Commit 70fd7dc

Browse files
steveperry-53k8s-ci-robot
authored andcommitted
Move walkthroughs from user-guide to tutorials. (kubernetes#8933)
1 parent 6c5685b commit 70fd7dc

File tree

15 files changed

+18
-41
lines changed

15 files changed

+18
-41
lines changed

content/en/docs/user-guide/walkthrough/deployment-update.yaml renamed to content/en/docs/tutorials/deployment-update.yaml

File renamed without changes.
File renamed without changes.

content/en/docs/user-guide/walkthrough/_index.md renamed to content/en/docs/tutorials/k8s101.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ reviewers:
33
- eparis
44
- mikedanese
55
title: Kubernetes 101
6-
toc_hide: true
76
---
87

98
## Kubectl CLI and Pods
@@ -12,7 +11,7 @@ For Kubernetes 101, we will cover kubectl, Pods, Volumes, and multiple container
1211

1312
{{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
1413

15-
In order for the kubectl usage examples to work, make sure you have an example directory locally, either from [a release](https://github.com/kubernetes/kubernetes/releases) or the latest `.yaml` files located [here](https://github.com/kubernetes/website/tree/master/content/en/docs/user-guide/walkthrough).
14+
In order for the kubectl usage examples to work, make sure you have an example directory locally, either from [a release](https://github.com/kubernetes/kubernetes/releases) or the latest `.yaml` files located [here](https://github.com/kubernetes/website/tree/master/content/en/docs/tutorials).
1615

1716
{{< toc >}}
1817

@@ -45,10 +44,10 @@ For more information, see [Kubernetes Design Documents and Proposals](https://gi
4544

4645
#### Pod Management
4746

48-
Create a Pod containing an nginx server ([pod-nginx.yaml](/docs/user-guide/walkthrough/pod-nginx.yaml)):
47+
Create a Pod containing an nginx server ([pod-nginx.yaml](/docs/tutorials/pod-nginx.yaml)):
4948

5049
```shell
51-
$ kubectl create -f docs/user-guide/walkthrough/pod-nginx.yaml
50+
$ kubectl create -f docs/tutorials/pod-nginx.yaml
5251
```
5352

5453
List all Pods:
@@ -103,7 +102,7 @@ volumeMounts:
103102
```
104103
105104
106-
Here is an example of Redis Pod definition with a persistent storage volume ([pod-redis.yaml](/docs/user-guide/walkthrough/pod-redis.yaml)):
105+
Here is an example of Redis Pod definition with a persistent storage volume ([pod-redis.yaml](/docs/tutorials/pod-redis.yaml)):
107106
108107
109108
{{< code file="pod-redis.yaml" >}}
@@ -162,5 +161,5 @@ Finally, we have also introduced an environment variable to the `git-monitor` co
162161

163162
## What's Next?
164163

165-
Continue on to [Kubernetes 201](/docs/user-guide/walkthrough/k8s201/) or
164+
Continue on to [Kubernetes 201](/docs/tutorials/k8s201/) or
166165
for a complete application see the [guestbook example](https://github.com/kubernetes/examples/tree/{{< param "githubbranch" >}}/guestbook/)

content/en/docs/user-guide/walkthrough/k8s201.md renamed to content/en/docs/tutorials/k8s201.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ title: Kubernetes 201
77

88
## Labels, Deployments, Services and Health Checking
99

10-
If you went through [Kubernetes 101](/docs/user-guide/walkthrough/), you learned about kubectl, Pods, Volumes, and multiple containers.
10+
If you went through [Kubernetes 101](/docs/tutorials/k8s1.1/), you learned about kubectl, Pods, Volumes, and multiple containers.
1111
For Kubernetes 201, we will pick up where 101 left off and cover some slightly more advanced topics in Kubernetes, related to application productionization, Deployment and
1212
scaling.
1313

@@ -30,14 +30,14 @@ To add a label, add a labels section under metadata in the Pod definition:
3030
app: nginx
3131
```
3232
33-
For example, here is the nginx Pod definition with labels ([pod-nginx-with-label.yaml](/docs/user-guide/walkthrough/pod-nginx-with-label.yaml)):
33+
For example, here is the nginx Pod definition with labels ([pod-nginx-with-label.yaml](/docs/tutorials/pod-nginx-with-label.yaml)):
3434
3535
{{< code file="pod-nginx-with-label.yaml" >}}
3636
37-
Create the labeled Pod ([pod-nginx-with-label.yaml](/docs/user-guide/walkthrough/pod-nginx-with-label.yaml)):
37+
Create the labeled Pod ([pod-nginx-with-label.yaml](/docs/tutorials/pod-nginx-with-label.yaml)):
3838
3939
```shell
40-
kubectl create -f https://k8s.io/docs/user-guide/walkthrough/pod-nginx-with-label.yaml
40+
kubectl create -f https://k8s.io/docs/tutorials/pod-nginx-with-label.yaml
4141
```
4242

4343
List all Pods with the label `app=nginx`:
@@ -74,7 +74,7 @@ Here is a Deployment that instantiates two nginx Pods:
7474
Create an nginx Deployment:
7575

7676
```shell
77-
kubectl create -f https://k8s.io/docs/user-guide/walkthrough/deployment.yaml
77+
kubectl create -f https://k8s.io/docs/tutorials/deployment.yaml
7878
```
7979

8080
List all Deployments:
@@ -95,7 +95,7 @@ contains the desired changes:
9595
{{< code file="deployment-update.yaml" >}}
9696

9797
```shell
98-
kubectl apply -f https://k8s.io/docs/user-guide/walkthrough//deployment-update.yaml
98+
kubectl apply -f https://k8s.io/docs/tutorials/deployment-update.yaml
9999
```
100100

101101
Watch the Deployment create Pods with new names and delete the old Pods:
@@ -117,17 +117,17 @@ For more information, such as how to rollback Deployment changes to a previous v
117117

118118
Once you have a replicated set of Pods, you need an abstraction that enables connectivity between the layers of your application. For example, if you have a Deployment managing your backend jobs, you don't want to have to reconfigure your front-ends whenever you re-scale your backends. Likewise, if the Pods in your backends are scheduled (or rescheduled) onto different machines, you can't be required to re-configure your front-ends. In Kubernetes, the service abstraction achieves these goals. A service provides a way to refer to a set of Pods (selected by labels) with a single static IP address. It may also provide load balancing, if supported by the provider.
119119

120-
For example, here is a service that balances across the Pods created in the previous nginx Deployment example ([service.yaml](/docs/user-guide/walkthrough/service.yaml)):
120+
For example, here is a service that balances across the Pods created in the previous nginx Deployment example ([service.yaml](/docs/tutorials/service.yaml)):
121121

122122
{{< code file="service.yaml" >}}
123123

124124

125125
### Service Management
126126

127-
Create an nginx service ([service.yaml](/docs/user-guide/walkthrough/service.yaml)):
127+
Create an nginx service ([service.yaml](/docs/tutorials/service.yaml)):
128128

129129
```shell
130-
kubectl create -f https://k8s.io/docs/user-guide/walkthrough/service.yaml
130+
kubectl create -f https://k8s.io/docs/tutorials/service.yaml
131131
```
132132

133133
List all services:
@@ -222,11 +222,11 @@ In all cases, if the Kubelet discovers a failure the container is restarted.
222222

223223
The container health checks are configured in the `livenessProbe` section of your container config. There you can also specify an `initialDelaySeconds` that is a grace period from when the container is started to when health checks are performed, to enable your container to perform any necessary initialization.
224224

225-
Here is an example config for a Pod with an HTTP health check ([pod-with-http-healthcheck.yaml](/docs/user-guide/walkthrough/pod-with-http-healthcheck.yaml)):
225+
Here is an example config for a Pod with an HTTP health check ([pod-with-http-healthcheck.yaml](/docs/tutorials/pod-with-http-healthcheck.yaml)):
226226

227227
{{< code file="pod-with-http-healthcheck.yaml" >}}
228228

229-
And here is an example config for a Pod with a TCP Socket health check ([pod-with-tcp-socket-healthcheck.yaml](/docs/user-guide/walkthrough/pod-with-tcp-socket-healthcheck.yaml)):
229+
And here is an example config for a Pod with a TCP Socket health check ([pod-with-tcp-socket-healthcheck.yaml](/docs/tutorials/pod-with-tcp-socket-healthcheck.yaml)):
230230

231231
{{< code file="pod-with-tcp-socket-healthcheck.yaml" >}}
232232

content/en/docs/user-guide/walkthrough/pod-nginx-with-label.yaml renamed to content/en/docs/tutorials/pod-nginx-with-label.yaml

File renamed without changes.
File renamed without changes.
File renamed without changes.

content/en/docs/user-guide/walkthrough/pod-with-http-healthcheck.yaml renamed to content/en/docs/tutorials/pod-with-http-healthcheck.yaml

File renamed without changes.

content/en/docs/user-guide/walkthrough/pod-with-tcp-socket-healthcheck.yaml renamed to content/en/docs/tutorials/pod-with-tcp-socket-healthcheck.yaml

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)