Skip to content

Commit 44b51d6

Browse files
Bradamant3k8s-ci-robot
Bradamant3
authored and
k8s-ci-robot
committed
merge master to 1.10, with fixes (#7682)
1 parent bb8c59a commit 44b51d6

File tree

548 files changed

+12601
-319589
lines changed

Some content is hidden

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

548 files changed

+12601
-319589
lines changed

‎.github/ISSUE_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515

1616
**Page to Update:**
17-
http://kubernetes.io/...
17+
https://kubernetes.io/...
1818

1919
<!--Optional Information (remove the comment tags around information you would like to include)-->
2020
<!--Kubernetes Version:-->

‎.github/PULL_REQUEST_TEMPLATE.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
> For 1.10 Features: set Milestone to 1.10 and Base Branch to release-1.10
3+
>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
14
> NOTE: After opening the PR, please *un-check and re-check* the ["Allow edits from maintainers"](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) box so that maintainers can work on your patch and speed up the review process. This is a temporary workaround to address a known issue with GitHub.>
25
>
36
> Please delete this note before submitting the pull request.

‎Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ group :jekyll_plugins do
2727
gem "jekyll-github-metadata", "~> 2.2"
2828
gem "jekyll-optional-front-matter", "~> 0.1"
2929
gem "jekyll-readme-index", "0.0.3"
30-
gem "jekyll-redirect-from", "~> 0.11"
30+
gem "jekyll-redirect-from", "~> 0.13"
3131
gem "jekyll-relative-links", "~> 0.2"
3232
gem "jekyll-swiss", "~> 0.4"
3333
gem "jekyll-theme-architect", "0.0.3"

‎Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ GEM
4747
jekyll-paginate (1.1.0)
4848
jekyll-readme-index (0.0.3)
4949
jekyll (~> 3.0)
50-
jekyll-redirect-from (0.12.1)
50+
jekyll-redirect-from (0.13.0)
5151
jekyll (~> 3.3)
5252
jekyll-relative-links (0.5.1)
5353
jekyll (~> 3.3)
@@ -145,7 +145,7 @@ DEPENDENCIES
145145
jekyll-optional-front-matter (~> 0.1)
146146
jekyll-paginate (= 1.1.0)
147147
jekyll-readme-index (= 0.0.3)
148-
jekyll-redirect-from (~> 0.11)
148+
jekyll-redirect-from (~> 0.13)
149149
jekyll-relative-links (~> 0.2)
150150
jekyll-seo-tag
151151
jekyll-sitemap

‎OWNERS

+2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ reviewers:
22
- tengqm
33
- zhangxiaoyu-zidif
44
- xiangpengzhao
5+
- bradtopol
56
approvers:
67
- heckj
78
- a-mccarthy
89
- abiogenesis-now
910
- bradamant3
1011
- steveperry-53
1112
- zacharysarah
13+
- chenopis

‎OWNERS_ALIASES

+4-3
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ aliases:
9292
- bradamant3
9393
- steveperry-53
9494
- zacharysarah
95+
- bradtopol
9596
sig-federation: #Team: Federation; e.g. Federated Clusters
9697
- csbell
9798
sig-gcp: #Google Cloud Platform; GH: sig-gcp-pr-reviews
@@ -149,9 +150,9 @@ aliases:
149150
- feiskyer
150151
- nebril
151152
sig-openstack: #GH: sig-openstack-pr-reviews
152-
- idvoretskyi
153-
- xsgordon
154-
- NickrenREN
153+
- hogepodge
154+
- dklyle
155+
- rjmorse
155156
sig-pm: #aka Product Management
156157
- apsinha
157158
- idvoretskyi

‎_config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ incremental: true
1313
safe: false
1414
lsi: false
1515

16+
latest: "v1.9"
1617
defaults:
1718
-
1819
scope:

‎_data/concepts.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
bigheader: "Concepts"
22
abstract: "Detailed explanations of Kubernetes system concepts and abstractions."
3+
landing_page: /docs/concepts/index/
34
toc:
45
- docs/concepts/index.md
56

67
- title: Overview
8+
landing_page: /docs/concepts/overview/what-is-kubernetes/
79
section:
810
- docs/concepts/overview/what-is-kubernetes.md
911
- docs/concepts/overview/components.md
@@ -23,12 +25,14 @@ toc:
2325
- docs/concepts/overview/object-management-kubectl/declarative-config.md
2426

2527
- title: Kubernetes Architecture
28+
landing_page: /docs/concepts/architecture/nodes/
2629
section:
2730
- docs/concepts/architecture/nodes.md
2831
- docs/concepts/architecture/master-node-communication.md
2932
- docs/concepts/architecture/cloud-controller.md
3033

3134
- title: Extending Kubernetes
35+
landing_page: /docs/concepts/api-extension/custom-resources/
3236
section:
3337
- docs/concepts/overview/extending.md
3438
- title: Extending the Kubernetes API
@@ -43,12 +47,14 @@ toc:
4347
- docs/concepts/service-catalog/index.md
4448

4549
- title: Containers
50+
landing_page: /docs/concepts/containers/images/
4651
section:
4752
- docs/concepts/containers/images.md
4853
- docs/concepts/containers/container-environment-variables.md
4954
- docs/concepts/containers/container-lifecycle-hooks.md
5055

5156
- title: Workloads
57+
landing_page: /docs/concepts/workloads/pods/pod-overview/
5258
section:
5359
- title: Pods
5460
section:
@@ -70,6 +76,7 @@ toc:
7076
- docs/concepts/workloads/controllers/cron-jobs.md
7177

7278
- title: Configuration
79+
landing_page: /docs/concepts/configuration/overview/
7380
section:
7481
- docs/concepts/configuration/overview.md
7582
- docs/concepts/configuration/manage-compute-resources-container.md
@@ -80,6 +87,7 @@ toc:
8087
- docs/concepts/configuration/pod-priority-preemption.md
8188

8289
- title: Services, Load Balancing, and Networking
90+
landing_page: /docs/concepts/services-networking/service/
8391
section:
8492
- docs/concepts/services-networking/service.md
8593
- docs/concepts/services-networking/dns-pod-service.md
@@ -89,13 +97,15 @@ toc:
8997
- docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases.md
9098

9199
- title: Storage
100+
landing_page: /docs/concepts/storage/volumes/
92101
section:
93102
- docs/concepts/storage/volumes.md
94103
- docs/concepts/storage/persistent-volumes.md
95104
- docs/concepts/storage/storage-classes.md
96105
- docs/concepts/storage/dynamic-provisioning.md
97106

98107
- title: Cluster Administration
108+
landing_page: /docs/concepts/cluster-administration/cluster-administration-overview/
99109
section:
100110
- docs/concepts/cluster-administration/cluster-administration-overview.md
101111
- docs/concepts/cluster-administration/certificates.md
@@ -116,5 +126,3 @@ toc:
116126
section:
117127
- docs/concepts/policy/resource-quotas.md
118128
- docs/concepts/policy/pod-security-policy.md
119-
120-

‎_data/docs-home.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
1-
bigheader: "Documentation Home"
1+
bigheader: "About"
22
abstract: "Documentation for using and learning about Kubernetes."
33
toc:
44
- docs/home/index.md
5-
- docs/home/supported-doc-versions.md
65

7-
- title: Release Notes
8-
path: https://git.k8s.io/kubernetes/CHANGELOG.md
9-
- title: Release Roadmap
10-
path: https://github.com/kubernetes/kubernetes/milestones/
11-
12-
- docs/tasks/debug-application-cluster/troubleshooting.md
6+
- title: Supported Doc Versions
7+
path: /docs/home/supported-doc-versions/
138

149
- title: Contributing to the Kubernetes Docs
10+
landing_page: /editdocs/
1511
section:
1612
- editdocs.md
13+
- docs/home/contribute/participating.md
1714
- docs/home/contribute/create-pull-request.md
1815
- docs/home/contribute/write-new-topic.md
1916
- docs/home/contribute/stage-documentation-changes.md
2017
- docs/home/contribute/page-templates.md
2118
- docs/home/contribute/review-issues.md
2219
- docs/home/contribute/style-guide.md
2320
- docs/home/contribute/includes.md
21+
- docs/home/contribute/localization.md
2422

2523
- title: Updating Automatically Generated Reference Pages
2624
section:

‎_data/glossary/annotation.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
id: annotation
22
name: Annotation
3-
full-link: docs/concepts/overview/working-with-objects/annotations
3+
full-link: /docs/concepts/overview/working-with-objects/annotations
44
tags:
55
- fundamental
66
short-description: >

‎_data/glossary/certificate.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
id: certificate
2+
name: Certificate
3+
full-link: /docs/tasks/tls/managing-tls-in-a-cluster/
4+
tags:
5+
- security
6+
short-description: >
7+
A cryptographically secure file used to validate access to the Kubernetes cluster.
8+
long-description: >
9+
Certificates enable applications within a Kubernetes
10+
cluster to access the Kubernetes API securely. Certificates validate that
11+
clients are allowed to access the API.

‎_data/glossary/cloud-controller-manager.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
id: cloud-controller-manager
2+
name: Cloud Controller Manager
3+
full-link: https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/
4+
tags:
5+
- core-object
6+
- architecture
7+
- operation
8+
short-description: >
9+
Cloud Controller Manager is an alpha feature in 1.8. In upcoming releases it will be the preferred way to integrate Kubernetes with any cloud.
10+
long-description: >
11+
Kubernetes v1.6 contains a new binary called cloud-controller-manager. cloud-controller-manager is a daemon that embeds cloud-specific control loops.
12+
These cloud-specific control loops were originally in the kube-controller-manager. Since cloud providers develop and release at a different pace compared to the Kubernetes
13+
project, abstracting the provider-specific code to the cloud-controller-manager binary allows cloud vendors to evolve independently from the core Kubernetes code.

‎_data/glossary/code-contributor.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
id: code-contributor
22
name: Code Contributor
3+
full-link: /docs/imported/community/devel/
34
aka:
45
- Community Developer
56
tags:

‎_data/glossary/container-env-variables.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
id: container-env-variables
2+
name: Container Environment Variables
3+
full-link: /docs/concepts/containers/container-environment-variables.md
4+
tags:
5+
- fundamental
6+
short-description: >
7+
Container environment variables are name/value pairs that provide useful information into containers running in a Pod.
8+
long-description: >
9+
Container environment variables provide information that is required by the running containerized applications along with information about important resources to the [Containers] {% glossary_tooltip text="Containers" term_id="container" %}. For example, file system, information about the container itself and other cluster resources such as service endpoints, etc.

‎_data/glossary/customresourcedefinition.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
id: CustomResourceDefinition
2+
name: CustomResourceDefinition
3+
aka:
4+
- CRD
5+
- Formerly Known as ThirdPartyResources (TPR)
6+
tags:
7+
- fundamental
8+
- operation
9+
- extension
10+
full-link: docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/
11+
short-description: >
12+
Custom code that defines a resource to add to your Kubernetes API server without building a complete custom server.
13+
long-description: >
14+
Custom Resource Definitions let you extend the Kubernetes API for your environment if the publicly supported API resources can't meet your needs.

‎_data/glossary/daemonset.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ name: DaemonSet
33
full-link: /docs/concepts/workloads/controllers/daemonset
44
tags:
55
- fundamental
6+
- core-object
67
- workload
78
short-description: >
8-
Ensures a copy of a {% glossary_tooltip term_id="pod" %} is running across a set of nodes in a {% glossary_tooltip term_id="cluster" %}.
9+
Ensures a copy of a {% glossary_tooltip text="Pod" term_id="pod" %} is running across a set of nodes in a {% glossary_tooltip text="cluster" term_id="cluster" %}.
910
long-description: >
1011
Used to deploy system daemons such as log collectors and monitoring agents that typically must run on every {% glossary_tooltip term_id="node" %}.

‎_data/glossary/docker.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
id: docker
2+
name: docker
3+
full-link: /docs/reference/kubectl/docker-cli-to-kubectl/
4+
tags:
5+
- fundamental
6+
short-description: >
7+
Docker is a software technology providing operating-system-level virtualization also known as containers.
8+
long-description: >
9+
Docker uses the resource isolation features of the Linux kernel such as cgroups and kernel namespaces, and a union-capable file system such as OverlayFS and others to allow independent "containers" to run within a single Linux instance, avoiding the overhead of starting and maintaining virtual machines (VMs).

‎_data/glossary/dynamic-volume-provisioning.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
id: dynamicvolumeprovisioning
2+
name: Dynamic Volume Provisioning
3+
full-link: /docs/concepts/storage/dynamic-provisioning
4+
tags:
5+
- core-object
6+
- storage
7+
short-description: >
8+
Allows users to request automatic creation of storage {% glossary_tooltip text="Volumes" term_id="volume" %}.
9+
long-description: >
10+
Dynamic provisioning eliminates the need for cluster administrators to pre-provision storage. Instead, it automatically provisions storage by user request.
11+
Dynamic volume provisioning is based on an API object, {% glossary_tooltip text="StorageClass" term_id="storage-class" %}, referring to a {% glossary_tooltip text="Volume Plugin" term_id="volume-plugin" %} that provisions a {% glossary_tooltip text="Volume" term_id="volume" %} and the set of parameters to pass to the Volume Plugin.

‎_data/glossary/init-container.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
id: init-container
2+
name: Init Container
3+
tags:
4+
- fundamental
5+
short-description: >
6+
One or more initialization containers that must run to completion before any app containers run.
7+
long-description: >
8+
Initialization (init) containers are like regular app containers, with one difference: init containers must run to completion before any app containers can start. Init containers run in series: each init container must run to completion before the next init container begins.

‎_data/glossary/job.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ id: job
22
name: Job
33
full-link: /docs/concepts/workloads/controllers/jobs-run-to-completion
44
tags:
5+
- fundamental
56
- core-object
7+
- workload
68
short-description: >
79
A finite or batch task that runs to completion.
810
long-description: >

‎_data/glossary/kube-proxy.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
id: kube proxy
2+
name: kube-proxy
3+
full-link: /docs/reference/generated/kube-proxy
4+
tags:
5+
- fundamental
6+
- core-object
7+
short-description: >
8+
`kube-proxy` is a network proxy that runs on each node in the cluster.
9+
long-description: >
10+
`kube-proxy` is responsible for request forwarding. `kube-proxy` allows TCP and UDP stream forwarding or round robin TCP and UDP forwarding across a set of backend functions.

‎_data/glossary/kubelet.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
id: kubelet
22
name: Kubelet
3-
full-link: docs/reference/generated/kubelet
3+
full-link: /docs/reference/generated/kubelet
44
tags:
55
- fundamental
66
- core-object

‎_data/glossary/labels.yaml ‎_data/glossary/label.yaml

File renamed without changes.

‎_data/glossary/namespace.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ full-link: /docs/concepts/overview/working-with-objects/namespaces
44
tags:
55
- fundamental
66
short-description: >
7-
An abstraction used by Kubernetes to support multiple virtual clusters on the same physical {% glossary_tooltip term_id="cluster" %}.
7+
An abstraction used by Kubernetes to support multiple virtual clusters on the same physical {% glossary_tooltip text="cluster" term_id="cluster" %}.
88
long-description: >
99
Namespaces are used to organize objects in a cluster and provide a way to divide cluster resources.
1010
Names of resources need to be unique within a namespace, but not across namespaces.

‎_data/glossary/persistent-volume.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ tags:
1010
- core-object
1111
- storage
1212
short-description: >
13-
An API object that represents a piece of storage in the cluster. Available as a general, pluggable resource that persists beyond the lifecycle of any individual {% glossary_tooltip term_id="pod" %}.
13+
An API object that represents a piece of storage in the cluster. Available as a general, pluggable resource that persists beyond the lifecycle of any individual {% glossary_tooltip text="Pod" term_id="pod" %}.
1414
long-description: |
1515
PersistentVolumes (PVs) provide an API that abstracts details of how storage is provided from how it is consumed.
16-
PVs are used directly in scenarios where storage can be be created ahead of time (static provisioning).
16+
PVs are used directly in scenarios where storage can be created ahead of time (static provisioning).
1717
For scenarios that require on-demand storage (dynamic provisioning), PersistentVolumeClaims (PVCs) are used instead.

‎_data/glossary/podpreset.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
id: podpreset
2+
name: PodPreset
3+
tags:
4+
- operation
5+
short-description: >
6+
An API object that injects information such as secrets, volume mounts,
7+
and environment variables into pods at creation time.
8+
long-description: >
9+
This object chooses the pods to inject information into using
10+
standard selectors. This allows the podspec definitions to be
11+
nonspecific, decoupling the podspec from environment specific
12+
configuration.

‎_data/glossary/replica-set.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ full-link: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
44
related:
55
- replication-controller
66
tags:
7+
- fundamental
78
- core-object
8-
- architecture
9+
- workload
910
short-description: >
1011
ReplicaSet is the next-generation Replication Controller.
1112
long-description: >

‎_data/glossary/replication-controller.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
id: replication-controller
22
name: Replication Controller
33
tags:
4-
- fundamental
4+
- workload
5+
- core-object
56
short-description: >
67
Kubernetes service that ensures a specific number of instances of a pod are always running.
78
long-description: >

0 commit comments

Comments
 (0)