Skip to content

Commit 4bdcb95

Browse files
grodrigues3grodrigues3
authored
Merge pull request kubernetes#1934 from kubernetes/release-1.5
Merge Release 1.5 to Master, Publishing 1.5 docs live
2 parents 62fc011 + 4ba5c70 commit 4bdcb95

File tree

84 files changed

+4943
-678
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+4943
-678
lines changed

‎_data/concepts.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ toc:
77
section:
88
- title: Annotations
99
path: /docs/concepts/object-metadata/annotations/
10+
- title: Controllers
11+
section:
12+
- title: StatefulSets
13+
path: /docs/concepts/abstractions/controllers/statefulsets/

‎_data/guides.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ toc:
237237
path: /docs/getting-started-guides/coreos
238238
- title: Ubuntu
239239
path: /docs/getting-started-guides/ubuntu/
240+
- title: Windows Server Containers
241+
path: /docs/getting-started-guides/windows/
240242
- title: Validate Node Setup
241243
path: /docs/admin/node-conformance
242244
- title: Portable Multi-Node Cluster
@@ -272,8 +274,6 @@ toc:
272274
path: /docs/admin/cluster-components/
273275
- title: Configuring Kubernetes Use of etcd
274276
path: /docs/admin/etcd/
275-
- title: Federating Clusters
276-
path: /docs/admin/federation/
277277
- title: Using Multiple Clusters
278278
path: /docs/admin/multi-cluster/
279279
- title: Changing Cluster Size
@@ -302,3 +302,10 @@ toc:
302302
path: /docs/admin/node-problem/
303303
- title: AppArmor
304304
path: /docs/admin/apparmor/
305+
306+
- title: Administering Federation
307+
section:
308+
- title: Using `kubefed`
309+
path: /docs/admin/federation/kubfed/
310+
- title: Using `federation-up` and `deploy.sh`
311+
path: /docs/admin/federation/

‎_data/reference.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,15 @@ toc:
178178
- title: kube-scheduler
179179
path: /docs/admin/kube-scheduler/
180180
- title: kubelet
181-
path: /docs/admin/kubelet/
181+
section:
182+
- title: Overview
183+
path: /docs/admin/kubelet/
184+
- title: Master-Node communication
185+
path: /docs/admin/master-node-communication/
186+
- title: TLS bootstrapping
187+
path: /docs/admin/kubelet-tls-bootstrapping/
188+
- title: Kubelet authentication/authorization
189+
path: /docs/admin/kubelet-authentication-authorization/
182190

183191
- title: Glossary
184192
section:
@@ -254,6 +262,12 @@ toc:
254262
section:
255263
- title: Federation User Guide
256264
path: /docs/user-guide/federation/
265+
- title: Federated ConfigMap
266+
path: /docs/user-guide/federation/configmap/
267+
- title: Federated DaemonSet
268+
path: /docs/user-guide/federation/daemonsets/
269+
- title: Federated Deployment
270+
path: /docs/user-guide/federation/deployment/
257271
- title: Federated Events
258272
path: /docs/user-guide/federation/events/
259273
- title: Federated Ingress

‎_data/tasks.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,30 @@ toc:
2727
section:
2828
- title: Using an HTTP Proxy to Access the Kubernetes API
2929
path: /docs/tasks/access-kubernetes-api/http-proxy-access-api/
30+
3031
- title: Administering a Cluster
3132
section:
3233
- title: Assigning Pods to Nodes
3334
path: /docs/tasks/administer-cluster/assign-pods-nodes/
35+
- title: Autoscaling the DNS Service in a Cluster
36+
path: /docs/tasks/administer-cluster/dns-horizontal-autoscaling/
37+
- title: Safely Draining a Node while Respecting Application SLOs
38+
path: /docs/tasks/administer-cluster/safely-drain-node/
39+
40+
- title: Managing Stateful Applications
41+
section:
42+
- title: Upgrading from PetSets to StatefulSets
43+
path: /docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set/
44+
- title: Scaling a StatefulSet
45+
path: /docs/tasks/manage-stateful-set/scale-stateful-set/
46+
- title: Deleting a Stateful Set
47+
path: /docs/tasks/manage-stateful-set/deleting-a-statefulset/
48+
- title: Debugging a StatefulSet
49+
path: /docs/tasks/manage-stateful-set/debugging-a-statefulset/
50+
- title: Force Deleting StatefulSet Pods
51+
path: /docs/tasks/manage-stateful-set/delete-pods/
3452

53+
- title: Troubleshooting
54+
section:
55+
- title: Debugging Init Containers
56+
path: /docs/tasks/troubleshoot/debug-init-containers/

‎_data/tutorials.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,9 @@ toc:
5353
path: /docs/tutorials/stateless-application/expose-external-ip-address/
5454
- title: Stateful Applications
5555
section:
56+
- title: StatefulSet Basics
57+
path: /docs/tutorials/stateful-application/basic-stateful-set/
5658
- title: Running a Single-Instance Stateful Application
5759
path: /docs/tutorials/stateful-application/run-stateful-application/
60+
- title: Running a Replicated Stateful Application
61+
path: /docs/tutorials/stateful-application/run-replicated-stateful-application/

‎_includes/default-storage-class-prereqs.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
You need to either have a dynamic PersistentVolume provisioner with a default
2+
[StorageClass](/docs/user-guide/persistent-volumes/#storageclasses),
3+
or [statically provision PersistentVolumes](/docs/user-guide/persistent-volumes/#provisioning)
4+
yourself to satisfy the [PersistentVolumeClaims](/docs/user-guide/persistent-volumes/#persistentvolumeclaims)
5+
used here.
6+

‎docs/admin/authentication.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ assignees:
44
- lavalamp
55
- ericchiang
66
- deads2k
7+
- liggitt
78

89
---
910
* TOC
@@ -382,6 +383,13 @@ option to the API server during startup. The plugin is implemented in
382383
`plugin/pkg/auth/authenticator/password/keystone/keystone.go` and currently uses
383384
basic auth to verify used by username and password.
384385

386+
If you have configured self-signed certificates for the Keystone server,
387+
you may need to set the `--experimental-keystone-ca-file=SOMEFILE` option when
388+
starting the Kubernetes API server. If you set the option, the Keystone
389+
server's certificate is verified by one of the authorities in the
390+
`experimental-keystone-ca-file`. Otherwise, the certificate is verified by
391+
the host's root Certificate Authority.
392+
385393
For details on how to use keystone to manage projects and users, refer to the
386394
[Keystone documentation](http://docs.openstack.org/developer/keystone/). Please
387395
note that this plugin is still experimental, under active development, and likely

‎docs/admin/authorization.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
assignees:
33
- erictune
44
- lavalamp
5+
- deads2k
6+
- liggitt
57

68
---
79

@@ -565,10 +567,10 @@ Access to non-resource paths are sent as:
565567

566568
Non-resource paths include: `/api`, `/apis`, `/metrics`, `/resetMetrics`,
567569
`/logs`, `/debug`, `/healthz`, `/swagger-ui/`, `/swaggerapi/`, `/ui`, and
568-
`/version.` Clients require access to `/api`, `/api/*/`, `/apis/`, `/apis/*`,
569-
`/apis/*/*`, and `/version` to discover what resources and versions are present
570-
on the server. Access to other non-resource paths can be disallowed without
571-
restricting access to the REST api.
570+
`/version.` Clients require access to `/api`, `/api/*`, `/apis`, `/apis/*`,
571+
and `/version` to discover what resources and versions are present on the server.
572+
Access to other non-resource paths can be disallowed without restricting access
573+
to the REST api.
572574

573575
For further documentation refer to the authorization.v1beta1 API objects and
574576
plugin/pkg/auth/authorizer/webhook/webhook.go.

‎docs/admin/disruptions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
assignees:
3-
- mml
3+
- davidopp
44

55
---
66
This guide is for anyone wishing to specify safety constraints on pods or anyone
@@ -59,7 +59,7 @@ itself. To attempt an eviction (perhaps more REST-precisely, to attempt to
5959

6060
```json
6161
{
62-
"apiVersion": "policy/v1alpha1",
62+
"apiVersion": "policy/v1beta1",
6363
"kind": "Eviction",
6464
"metadata": {
6565
"name": "quux",

‎docs/admin/dns.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,3 +356,5 @@ for more information.
356356
357357
- [Docs for the DNS cluster addon](http://releases.k8s.io/{{page.githubbranch}}/build-tools/kube-dns/README.md)
358358
359+
## What's next
360+
- [Autoscaling the DNS Service in a Cluster](/docs/tasks/administer-cluster/dns-horizontal-autoscaling/).

0 commit comments

Comments
 (0)