Release 1.10 (#7818)
* Refreshing installation instructions (#7495) * Refreshing installation instructions Added conjure-up. Updated displays and juju versions to current versions. * Updated anchors * Fixed image value version typo (#7768) Was inconsistent with other values * Update flocker reference to the github repo (#7784) * Fix typo in federation document (#7779) * an user -> a user (#7778) * Events are namespaced (#7767) * fix 'monitoring' link lose efficacy problem' (#7764) * docs/concepts/policy/pod-security-policy.md: minor fix. (#7659) * Update downward-api-volume-expose-pod-information.md (#7771) * Update downward-api-volume-expose-pod-information.md The pod spec puts the downward api files into /etc/podinfo, not directly in /etc. Updated docs to reflect this fact. * Update downward-api-volume-expose-pod-information.md One more spot needed fixing. * Update downward-api-volume-expose-pod-information.md Yet another fix, in the container example. * Add Amadeus Case Study (#7783) * Add Amadeus Case Study * add Amadeus logo * Fixed Cyrillic с in 'kube-proxy-cm' (#7787) There was a typo (wrong character) in kube-proxy-cm.yaml - Cyrillic с (UTF-8 0x0441) was used instead of Latin c. * install-kubectl: choose one installation method (#7705) The previous text layout suggested that all installations had to be done, one after another. * Update install-kubeadm.md (#7781) Add note to kubeadm install instruction to help install in other arch i.e. aarch64, ppc64le etc. * repair failure link (#7788) * repair failure link * repair failure link * do change as required * Update k8s201.md (#7777) * Update k8s201.md Change instructions to download yams files directly from the website (as used in other pages.) Added instructions to delete labeled pod to avoid warnings in the subsequent deployment step. * Update k8s201.md Added example of using the exposed host from the a node running Kubernetes. (This works on AWS with Weave; not able to test it on other variations...) * Gramatical fix to kompose introduction (#7792) The original wording didn't through very well. As much of the original sentence has been preserved as possible, primarily to ensure the kompose web address is see both in text and as a href link. * update amadeus.html (#7800) * Fix a missing word in endpoint reconciler section (#7804) * Partners page updates (#7802) * Partners page updates * Update to ZTE link * Make using sysctls a task instead of a concept (#6808) Closes: #4505 * add a note when mount a configmap to pod (#7745) * adjust a note format (#7812) * Update docker-cli-to-kubectl.md (#7748) * Update docker-cli-to-kubectl.md Edited the document for adherence to the style guide and word usage. * Update docker-cli-to-kubectl.md * Incorporated the changes suggested.
This commit is contained in:
Jennifer Rondeau
committed by
zacharysarah
zacharysarah
parent
d74ce9b80b
commit
3b3ef25cca
@@ -1,15 +1,25 @@
|
||||
---
|
||||
<<<<<<< HEAD:docs/tasks/administer-cluster/sysctl-cluster.md
|
||||
<<<<<<< HEAD:docs/tasks/administer-cluster/sysctl-cluster.md
|
||||
||||||| merged common ancestors
|
||||
approvers:
|
||||
- sttts
|
||||
=======
|
||||
||||||| merged common ancestors
|
||||
=======
|
||||
title: Using Sysctls in a Kubernetes Cluster
|
||||
>>>>>>> Release 1.10 (#7818):docs/tasks/administer-cluster/sysctl-cluster.md
|
||||
reviewers:
|
||||
- sttts
|
||||
<<<<<<< HEAD:docs/tasks/administer-cluster/sysctl-cluster.md
|
||||
>>>>>>> merge master to 1.10, with fixes (#7682):docs/concepts/cluster-administration/sysctl-cluster.md
|
||||
title: Using Sysctls in a Kubernetes Cluster
|
||||
reviewers:
|
||||
- sttts
|
||||
||||||| merged common ancestors
|
||||
title: Using Sysctls in a Kubernetes Cluster
|
||||
=======
|
||||
>>>>>>> Release 1.10 (#7818):docs/tasks/administer-cluster/sysctl-cluster.md
|
||||
---
|
||||
|
||||
{% capture overview %}
|
||||
@@ -127,10 +137,39 @@ metadata:
|
||||
spec:
|
||||
...
|
||||
```
|
||||
<<<<<<< HEAD:docs/tasks/administer-cluster/sysctl-cluster.md
|
||||
{% endcapture %}
|
||||
|
||||
{% capture discussion %}
|
||||
|
||||
**Warning**: Due to their nature of being _unsafe_, the use of _unsafe_ sysctls
|
||||
is at-your-own-risk and can lead to severe problems like wrong behavior of
|
||||
containers, resource shortage or complete breakage of a node.
|
||||
{: .warning}
|
||||
||||||| merged common ancestors
|
||||
=======
|
||||
{% endcapture %}
|
||||
|
||||
{% capture discussion %}
|
||||
>>>>>>> Release 1.10 (#7818):docs/tasks/administer-cluster/sysctl-cluster.md
|
||||
|
||||
<<<<<<< HEAD:docs/tasks/administer-cluster/sysctl-cluster.md
|
||||
It is good practice to consider nodes with special sysctl settings as
|
||||
_tainted_ within a cluster, and only schedule pods onto them which need those
|
||||
sysctl settings. It is suggested to use the Kubernetes [_taints and toleration_
|
||||
feature](/docs/user-guide/kubectl/{{page.version}}/#taint) to implement this.
|
||||
|
||||
A pod with the _unsafe_ sysctls will fail to launch on any node which has not
|
||||
enabled those two _unsafe_ sysctls explicitly. As with _node-level_ sysctls it
|
||||
is recommended to use
|
||||
[_taints and toleration_ feature](/docs/user-guide/kubectl/{{page.version}}/#taint) or
|
||||
[taints on nodes](/docs/concepts/configuration/taint-and-toleration/)
|
||||
||||||| merged common ancestors
|
||||
**Note**: a pod with the _unsafe_ sysctls specified above will fail to launch on
|
||||
any node which has not enabled those two _unsafe_ sysctls explicitly. As with
|
||||
_node-level_ sysctls it is recommended to use [_taints and toleration_
|
||||
feature](/docs/user-guide/kubectl/{{page.version}}/#taint) or [taints on nodes](/docs/concepts/configuration/taint-and-toleration/)
|
||||
=======
|
||||
**Warning**: Due to their nature of being _unsafe_, the use of _unsafe_ sysctls
|
||||
is at-your-own-risk and can lead to severe problems like wrong behavior of
|
||||
containers, resource shortage or complete breakage of a node.
|
||||
@@ -146,6 +185,7 @@ enabled those two _unsafe_ sysctls explicitly. As with _node-level_ sysctls it
|
||||
is recommended to use
|
||||
[_taints and toleration_ feature](/docs/user-guide/kubectl/{{page.version}}/#taint) or
|
||||
[taints on nodes](/docs/concepts/configuration/taint-and-toleration/)
|
||||
>>>>>>> Release 1.10 (#7818):docs/tasks/administer-cluster/sysctl-cluster.md
|
||||
to schedule those pods onto the right nodes.
|
||||
<<<<<<< HEAD:docs/tasks/administer-cluster/sysctl-cluster.md
|
||||
|
||||
@@ -169,6 +209,7 @@ metadata:
|
||||
spec:
|
||||
...
|
||||
```
|
||||
<<<<<<< HEAD:docs/tasks/administer-cluster/sysctl-cluster.md
|
||||
|
||||
{% endcapture %}
|
||||
|
||||
@@ -195,3 +236,10 @@ spec:
|
||||
...
|
||||
```
|
||||
>>>>>>> merge master to 1.10, with fixes (#7682):docs/concepts/cluster-administration/sysctl-cluster.md
|
||||
||||||| merged common ancestors
|
||||
=======
|
||||
|
||||
{% endcapture %}
|
||||
|
||||
{% include templates/task.md %}
|
||||
>>>>>>> Release 1.10 (#7818):docs/tasks/administer-cluster/sysctl-cluster.md
|
||||
|
||||
Reference in New Issue
Block a user