Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/kubernetes/website into r…
Browse files Browse the repository at this point in the history
…elease-1.9

* 'master' of https://github.com/kubernetes/website: (549 commits)
  Update service.md (#7810)
  Prune inactive maintainers (#7830)
  add Amadeus to index page and add feature image (#7827)
  Update conventions.md (#7668)
  Adding Tenxcloud as KCSP and Hedvig typo (#7826)
  Update outdated documentation about secret key validation. (#7675)
  Update imperative-command.md (#7699)
  Update manage-deployment.md (#7774)
  Add the OCI runtime description. (#7769)
  fix flag (#7814)
  fix flag (#7813)
  Add files via upload (#7816)
  Remove CoreOS guide that use Kubernetes v0.15.0 (#7821)
  "Nagions" should be "Nagios“ (#7762)
  Update docker-cli-to-kubectl.md (#7748)
  adjust a note format (#7812)
  add a note when mount a configmap to pod (#7745)
  Make using sysctls a task instead of a concept (#6808)
  Partners page updates (#7802)
  Fix a missing word in endpoint reconciler section (#7804)
  ...
  • Loading branch information
chenopis committed Mar 26, 2018
2 parents ca4f9f8 + 770440d commit d97a9cf
Show file tree
Hide file tree
Showing 2,844 changed files with 23,034 additions and 680,644 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


**Page to Update:**
http://kubernetes.io/...
https://kubernetes.io/...

<!--Optional Information (remove the comment tags around information you would like to include)-->
<!--Kubernetes Version:-->
Expand Down
3 changes: 3 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> For 1.10 Features: set Milestone to 1.10 and Base Branch to release-1.10
>^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> 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.>
>
> Please delete this note before submitting the pull request.
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ group :jekyll_plugins do
gem "jekyll-github-metadata", "~> 2.2"
gem "jekyll-optional-front-matter", "~> 0.1"
gem "jekyll-readme-index", "0.0.3"
gem "jekyll-redirect-from", "~> 0.11"
gem "jekyll-redirect-from", "~> 0.13"
gem "jekyll-relative-links", "~> 0.2"
gem "jekyll-swiss", "~> 0.4"
gem "jekyll-theme-architect", "0.0.3"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ GEM
jekyll-paginate (1.1.0)
jekyll-readme-index (0.0.3)
jekyll (~> 3.0)
jekyll-redirect-from (0.12.1)
jekyll-redirect-from (0.13.0)
jekyll (~> 3.3)
jekyll-relative-links (0.5.1)
jekyll (~> 3.3)
Expand Down Expand Up @@ -145,7 +145,7 @@ DEPENDENCIES
jekyll-optional-front-matter (~> 0.1)
jekyll-paginate (= 1.1.0)
jekyll-readme-index (= 0.0.3)
jekyll-redirect-from (~> 0.11)
jekyll-redirect-from (~> 0.13)
jekyll-relative-links (~> 0.2)
jekyll-seo-tag
jekyll-sitemap
Expand Down
9 changes: 7 additions & 2 deletions OWNERS
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
reviewers:
- a-mccarthy
- abiogenesis-now
- tengqm
- zhangxiaoyu-zidif
- xiangpengzhao
approvers:
- heckj
- bradamant3
- bradtopol
- steveperry-53
- zacharysarah
- chenopis
11 changes: 5 additions & 6 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ aliases:
- grodrigues3
- spxtr
sig-docs: #Team: documentation; GH: sig-docs-pr-reviews
- a-mccarthy
- abiogenesis-now
- bradamant3
- steveperry-53
- zacharysarah
- bradtopol
- heckj
sig-federation: #Team: Federation; e.g. Federated Clusters
- csbell
sig-gcp: #Google Cloud Platform; GH: sig-gcp-pr-reviews
Expand Down Expand Up @@ -149,9 +149,9 @@ aliases:
- feiskyer
- nebril
sig-openstack: #GH: sig-openstack-pr-reviews
- idvoretskyi
- xsgordon
- NickrenREN
- hogepodge
- dklyle
- rjmorse
sig-pm: #aka Product Management
- apsinha
- idvoretskyi
Expand Down Expand Up @@ -203,4 +203,3 @@ aliases:
- floreks
sig-windows:
- michmike

2 changes: 2 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ incremental: true
safe: false
lsi: false

latest: "v1.9"
defaults:
-
scope:
Expand Down Expand Up @@ -88,3 +89,4 @@ tocs:
- reference
- samples
- search
- imported
21 changes: 17 additions & 4 deletions _data/concepts.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,38 @@
bigheader: "Concepts"
abstract: "Detailed explanations of Kubernetes system concepts and abstractions."
landing_page: /docs/concepts/index/
toc:
- docs/concepts/index.md

- title: Overview
landing_page: /docs/concepts/overview/what-is-kubernetes/
section:
- docs/concepts/overview/what-is-kubernetes.md
- docs/concepts/overview/components.md
- docs/concepts/overview/kubernetes-api.md
- title: Working with Kubernetes Objects
section:
- docs/concepts/overview/working-with-objects/kubernetes-objects.md
- docs/concepts/overview/working-with-objects/names.md
- docs/concepts/overview/working-with-objects/namespaces.md
- docs/concepts/overview/working-with-objects/labels.md
- docs/concepts/overview/working-with-objects/annotations.md
- docs/concepts/overview/kubernetes-api.md
- title: Object Management Using kubectl
section:
- docs/concepts/overview/object-management-kubectl/overview.md
- docs/concepts/overview/object-management-kubectl/imperative-command.md
- docs/concepts/overview/object-management-kubectl/imperative-config.md
- docs/concepts/overview/object-management-kubectl/declarative-config.md

- title: Kubernetes Architecture
landing_page: /docs/concepts/architecture/nodes/
section:
- docs/concepts/architecture/nodes.md
- docs/concepts/architecture/master-node-communication.md
- docs/concepts/architecture/cloud-controller.md

- title: Extending Kubernetes
landing_page: /docs/concepts/api-extension/custom-resources/
section:
- docs/concepts/overview/extending.md
- title: Extending the Kubernetes API
Expand All @@ -33,16 +43,17 @@ toc:
section:
- docs/concepts/cluster-administration/network-plugins.md
- docs/concepts/cluster-administration/device-plugins.md
- docs/concepts/cluster-administration/sysctl-cluster.md
- docs/concepts/service-catalog/index.md

- title: Containers
landing_page: /docs/concepts/containers/images/
section:
- docs/concepts/containers/images.md
- docs/concepts/containers/container-environment-variables.md
- docs/concepts/containers/container-lifecycle-hooks.md

- title: Workloads
landing_page: /docs/concepts/workloads/pods/pod-overview/
section:
- title: Pods
section:
Expand All @@ -64,6 +75,7 @@ toc:
- docs/concepts/workloads/controllers/cron-jobs.md

- title: Configuration
landing_page: /docs/concepts/configuration/overview/
section:
- docs/concepts/configuration/overview.md
- docs/concepts/configuration/manage-compute-resources-container.md
Expand All @@ -74,6 +86,7 @@ toc:
- docs/concepts/configuration/pod-priority-preemption.md

- title: Services, Load Balancing, and Networking
landing_page: /docs/concepts/services-networking/service/
section:
- docs/concepts/services-networking/service.md
- docs/concepts/services-networking/dns-pod-service.md
Expand All @@ -83,13 +96,15 @@ toc:
- docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases.md

- title: Storage
landing_page: /docs/concepts/storage/volumes/
section:
- docs/concepts/storage/volumes.md
- docs/concepts/storage/persistent-volumes.md
- docs/concepts/storage/storage-classes.md
- docs/concepts/storage/dynamic-provisioning.md

- title: Cluster Administration
landing_page: /docs/concepts/cluster-administration/cluster-administration-overview/
section:
- docs/concepts/cluster-administration/cluster-administration-overview.md
- docs/concepts/cluster-administration/certificates.md
Expand All @@ -110,5 +125,3 @@ toc:
section:
- docs/concepts/policy/resource-quotas.md
- docs/concepts/policy/pod-security-policy.md


20 changes: 13 additions & 7 deletions _data/docs-home.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
bigheader: "Documentation Home"
bigheader: "About"
abstract: "Documentation for using and learning about Kubernetes."
toc:
- docs/home/index.md

- title: Release Notes
path: https://git.k8s.io/kubernetes/CHANGELOG.md
- title: Release Roadmap
path: https://github.com/kubernetes/kubernetes/milestones/

- docs/tasks/debug-application-cluster/troubleshooting.md
- title: Supported Doc Versions
path: /docs/home/supported-doc-versions/

- title: Contributing to the Kubernetes Docs
landing_page: /editdocs/
section:
- editdocs.md
- docs/home/contribute/participating.md
- docs/home/contribute/create-pull-request.md
- docs/home/contribute/write-new-topic.md
- docs/home/contribute/stage-documentation-changes.md
- docs/home/contribute/page-templates.md
- docs/home/contribute/review-issues.md
- docs/home/contribute/style-guide.md
- docs/home/contribute/includes.md
- docs/home/contribute/localization.md

- title: Updating Automatically Generated Reference Pages
section:
- docs/home/contribute/generated-reference/kubernetes-components.md
- docs/home/contribute/generated-reference/kubectl.md
- docs/home/contribute/generated-reference/kubernetes-api.md
- docs/home/contribute/generated-reference/federation-api.md
1 change: 1 addition & 0 deletions _data/globals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ tocs:
- reference
- samples
- support
- imported
2 changes: 1 addition & 1 deletion _data/glossary/_example.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
id: _example
name: Example K8s Term
full-link: kubernetes.io/docs/link-to-long-dedicated-docs-page
full-link: /docs/link-to-long-dedicated-docs-page
aka:
- Slang K8s Term
- Misnomer
Expand Down
2 changes: 1 addition & 1 deletion _data/glossary/annotation.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
id: annotation
name: Annotation
full-link: docs/concepts/overview/working-with-objects/annotations
full-link: /docs/concepts/overview/working-with-objects/annotations
tags:
- fundamental
short-description: >
Expand Down
11 changes: 11 additions & 0 deletions _data/glossary/certificate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
id: certificate
name: Certificate
full-link: /docs/tasks/tls/managing-tls-in-a-cluster/
tags:
- security
short-description: >
A cryptographically secure file used to validate access to the Kubernetes cluster.
long-description: >
Certificates enable applications within a Kubernetes
cluster to access the Kubernetes API securely. Certificates validate that
clients are allowed to access the API.
13 changes: 13 additions & 0 deletions _data/glossary/cloud-controller-manager.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
id: cloud-controller-manager
name: Cloud Controller Manager
full-link: https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/
tags:
- core-object
- architecture
- operation
short-description: >
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.
long-description: >
Kubernetes v1.6 contains a new binary called cloud-controller-manager. cloud-controller-manager is a daemon that embeds cloud-specific control loops.
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
project, abstracting the provider-specific code to the cloud-controller-manager binary allows cloud vendors to evolve independently from the core Kubernetes code.
10 changes: 10 additions & 0 deletions _data/glossary/cloud-provider.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
id: cloud-provider
name: Cloud Provider
full-link: /docs/concepts/cluster-administration/cloud-providers
tags:
- community
short-description: >
Cloud provider is a company that offers cloud computing platform that can run Kubernetes clusters.
long-description: >
Cloud providers or sometime called Cloud Service Provider (CSPs) provides cloud computing platforms. They may offer services such as Infrastructure as a Service (IaaS) or Platform as a Service (PaaS). Cloud providers host the Kubernetes cluster and also provide services that interact with the cluster, such as Load Balancers, Storage Classes etc.
1 change: 1 addition & 0 deletions _data/glossary/code-contributor.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
id: code-contributor
name: Code Contributor
full-link: /docs/imported/community/devel/
aka:
- Community Developer
tags:
Expand Down
9 changes: 9 additions & 0 deletions _data/glossary/container-env-variables.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
id: container-env-variables
name: Container Environment Variables
full-link: /docs/concepts/containers/container-environment-variables.md
tags:
- fundamental
short-description: >
Container environment variables are name/value pairs that provide useful information into containers running in a Pod.
long-description: >
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.
12 changes: 12 additions & 0 deletions _data/glossary/controller.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
id: controller
name: Controller
full-link: /docs/admin/kube-controller-manager/
related:
- controller-manager
tags:
- architecture
- fundamental
short-description: >
A control loop that watches the shared state of the cluster through the {% glossary_tooltip text="apiserver" term_id="kube-apiserver" %} and makes changes attempting to move the current state towards the desired state.
long-description: >
Examples of controllers that ship with Kubernetes today are the replication controller, endpoints controller, namespace controller, and serviceaccounts controller.
14 changes: 14 additions & 0 deletions _data/glossary/customresourcedefinition.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
id: CustomResourceDefinition
name: CustomResourceDefinition
aka:
- CRD
- Formerly Known as ThirdPartyResources (TPR)
tags:
- fundamental
- operation
- extension
full-link: docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/
short-description: >
Custom code that defines a resource to add to your Kubernetes API server without building a complete custom server.
long-description: >
Custom Resource Definitions let you extend the Kubernetes API for your environment if the publicly supported API resources can't meet your needs.
3 changes: 2 additions & 1 deletion _data/glossary/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ name: DaemonSet
full-link: /docs/concepts/workloads/controllers/daemonset
tags:
- fundamental
- core-object
- workload
short-description: >
Ensures a copy of a {% glossary_tooltip term_id="pod" %} is running across a set of nodes in a {% glossary_tooltip term_id="cluster" %}.
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" %}.
long-description: >
Used to deploy system daemons such as log collectors and monitoring agents that typically must run on every {% glossary_tooltip term_id="node" %}.
9 changes: 9 additions & 0 deletions _data/glossary/docker.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
id: docker
name: docker
full-link: /docs/reference/kubectl/docker-cli-to-kubectl/
tags:
- fundamental
short-description: >
Docker is a software technology providing operating-system-level virtualization also known as containers.
long-description: >
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).
11 changes: 11 additions & 0 deletions _data/glossary/dynamic-volume-provisioning.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
id: dynamicvolumeprovisioning
name: Dynamic Volume Provisioning
full-link: /docs/concepts/storage/dynamic-provisioning
tags:
- core-object
- storage
short-description: >
Allows users to request automatic creation of storage {% glossary_tooltip text="Volumes" term_id="volume" %}.
long-description: >
Dynamic provisioning eliminates the need for cluster administrators to pre-provision storage. Instead, it automatically provisions storage by user request.
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.
11 changes: 11 additions & 0 deletions _data/glossary/etcd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
id: etcd
name: etcd
full-link: /docs/tasks/administer-cluster/configure-upgrade-etcd/
tags:
- architecture
- storage
short-description: >
Consistent and highly-available key value store used as Kubernetes' backing store for all cluster data.
long-description: >
Always have a backup plan for etcd's data for your Kubernetes cluster.
For in-depth information on etcd, see [etcd documentation](https://github.com/coreos/etcd/blob/master/Documentation/docs.md).
6 changes: 4 additions & 2 deletions _data/glossary/horizontal-pod-autoscaler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ aka:
- HPA
related:
- pod
- replication-controller
- deployment
tags:
- operation
short-description: >
An API resource that automatically scales the number of pod replicas based on targeted CPU
utilization or custom metric targets.
long-description: >
HPA is typically used with replication controllers, deployments or replica sets and cannot be
applied to objects that cannot be scaled, for example DaemonSets.
HPA is typically used with {% glossary_tooltip text="Replication Controllers" term_id="replication-controller" %}, {% glossary_tooltip text="Deployments" term_id="deployment" %}, or Replica Sets.
It cannot be applied to objects that cannot be scaled, for example {% glossary_tooltip text="DaemonSets" term_id="daemonset" %}.
Loading

0 comments on commit d97a9cf

Please sign in to comment.