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.
kubernetes · Apr 16, 2018 · 3b3ef25 · 3b3ef25
1 parent d74ce9b
commit 3b3ef25
Show file tree

Hide file tree

Showing 4 changed files with 203 additions and 9 deletions.
diff --git a/_includes/partner-script.js b/_includes/partner-script.js
@@ -1519,7 +1519,7 @@
 			type: 1,
 			name: 'Kloia',
 			logo: 'kloia',
-			link: 'https://devops-as-a-service.kloia.com/',
+			link: 'https://kloia.com/kubernetes/',
 			blurb: 'Kloia is DevOps and Microservices Consultancy company that helps its customers to migrate their environment to cloud platforms for enabling more scalable and secure environments. We use Kubernetes to provide our customers all-in-one solutions in an cloud-agnostic way.'
 				},
 		{
@@ -1550,13 +1550,6 @@
 			link: 'https://www.bloombase.com/go/kubernetes',
 			blurb: 'Bloombase provides high bandwidth, defense-in-depth data-at-rest encryption to lock down Kubernetes crown-jewels at scale.'
 				},
-		{
-			type: 0,
-			name: 'Kloia',
-			logo: 'kloia',
-			link: 'https://docs.codefresh.io/docs/codefresh-kubernetes-integration-beta',
-			blurb: 'Kloia is DevOps and Microservices Consultancy company that helps its customers to migrate their environment to cloud platforms for enabling more scalable and secure environments. We use Kubernetes to provide our customers all-in-one solutions in an cloud-agnostic way.'
-				},
 		{
 			type: 0,
 			name: 'Kasten',
@@ -1620,13 +1613,104 @@
 			link: 'http://harmonycloud.cn/products/rongqiyun/',
 			blurb: 'Harmonycloud - Harmonycloud Container Platform'
 				},
+		{
+			type: 3,
+			name: 'Woqutech',
+			logo: 'woqutech',
+			link: 'http://www.woqutech.com/product/product-16-247.html#sss',
+			blurb: 'Woqutech - QFusion'
+				},
+		{
+			type: 3,
+			name: 'Baidu',
+			logo: 'baidu',
+			link: 'https://cloud.baidu.com/product/cce.html',
+			blurb: 'Baidu Cloud - Baidu Cloud Container Engine'
+				},
 		{
 			type: 3,
 			name: 'ZTE',
 			logo: 'zte',
-			link: 'https://sdnfv.zte.com.cn/zh-CN/home',
+			link: 'https://sdnfv.zte.com.cn/en/home',
 			blurb: 'ZTE - TECS OpenPalette'
 				},
+		{
+			type: 1,
+			name: 'Automatic Server AG',
+			logo: 'asag',
+			link: 'http://www.automatic-server.com/paas.html',
+			blurb: 'We install and operate Kubernetes in big enterprises, create deployment workflows and help to migrate.'
+				},
+		{
+			type: 1,
+			name: 'Circulo Siete',
+			logo: 'circulo',
+			link: 'https://circulosiete.com/consultoria/kubernetes/',
+			blurb: 'We are a Mexico based company offering training, consulting and support to migrate your workloads to Kubernetes, Cloud Native Microservices & Devops.'
+				},
+		{
+			type: 1,
+			name: 'DevOpsGuru',
+			logo: 'devopsguru',
+			link: 'http://devopsguru.ca/workshop',
+			blurb: 'DevOpsGuru work with small business to transform from physical to virtual to containerization.'
+				},
+		{
+			type: 1,
+			name: 'EIN Intelligence Co., Ltd',
+			logo: 'ein',
+			link: 'https://ein.io',
+			blurb: 'Startups and agile enterprises in South Korea.'
+				},
+		{
+			type: 0,
+			name: 'GuardiCore',
+			logo: 'guardicore',
+			link: 'https://www.guardicore.com/',
+			blurb: 'GuardiCore provided process level visibility and network policy enforcement on containerized assets on the Kubernetes platform.'
+				},
+		{
+			type: 0,
+			name: 'Hedvig',
+			logo: 'hevig',
+			link: 'https://www.hedviginc.com/blog/provisioning-hedvig-storage-with-kubernetes',
+			blurb: 'Hedvig is software-defined storage that uses NFS or iSCSI for persistent volumes for provisioning shared storage for pods and containers.'
+				},
+		{
+			type: 0,
+			name: 'Hewlett Packard Enterprise',
+			logo: 'hpe',
+			link: ' https://www.hpe.com/us/en/storage/containers.html',
+			blurb: 'Persistent Storage that makes data as easy to manage as containers: dynamic provisioning, policy-based performance & protection, QoS, & more.'
+				},
+		{
+			type: 0,
+			name: 'JetBrains',
+			logo: 'jetbrains',
+			link: 'https://blog.jetbrains.com/teamcity/2017/10/teamcity-kubernetes-support-plugin/',
+			blurb: 'Run TeamCity cloud build agents in a Kubernetes cluster. Provides Helm support as a build step.'
+				},
+		{
+			type: 2,
+			name: 'Opensense',
+			logo: 'opensense',
+			link: 'http://www.opensense.fr/en/kubernetes-en/',
+			blurb: 'We provide Kubernetes services (integration, operation, training) as well as development of banking microservices based on our extended experience with cloud of containers, microservices, data management and financial sector.'
+				},
+		{
+			type: 2,
+			name: 'SAP SE',
+			logo: 'sap',
+			link: 'https://cloudplatform.sap.com',
+			blurb: 'The SAP Cloud Platform provides in-memory capabilities and unique business services for building and extending applications. With open sourced Project Gardener, SAP utilizes the power of Kubernetes to enable an open, robust, multi-cloud experience for our customers. You can use simple, modern cloud native design principles and leverage skills your organization already has to deliver agile and transformative applications, while integrating with the latest SAP Leonardo business features.'
+				},
+		{
+			type: 1,
+			name: 'Mobilise Cloud Services Limited',
+			logo: 'mobilise',
+			link: 'http://www.mobilise.cloud/services/serverless-application-delivery',
+			blurb: 'Mobilise helps organisations adopt Kubernetes and integrate with their CI/CD tooling.'
+				},
 		{
 			type: 0,
 >>>>>>> merge master to 1.10, with fixes (#7682)

diff --git a/_redirects b/_redirects
@@ -59,7 +59,15 @@
 /docs/admin/resourcequota/limitstorageconsumption/     /docs/tasks/administer-cluster/limit-storage-consumption/ 301
 /docs/admin/resourcequota/walkthrough/     /docs/tasks/administer-cluster/quota-api-object/ 301
 /docs/admin/static-pods/     /docs/tasks/administer-cluster/static-pod/ 301
+<<<<<<< HEAD
+/docs/admin/sysctls/     /docs/tasks/administer-cluster/sysctl-cluster/ 301
+||||||| merged common ancestors
+/docs/admin/sysctls/     /docs/concepts/cluster-administration/sysctl-cluster/ 301
+/docs/admin/upgrade-1-6/     /docs/tasks/administer-cluster/upgrade-1-6/ 301
+=======
 /docs/admin/sysctls/     /docs/tasks/administer-cluster/sysctl-cluster/ 301
+/docs/admin/upgrade-1-6/     /docs/tasks/administer-cluster/upgrade-1-6/ 301
+>>>>>>> Release 1.10 (#7818)
 /docs/admin/resource-quota/     /docs/concepts/policy/resource-quotas/     301
 /docs/admin/upgrade-1-6/     /docs/tasks/administer-cluster/upgrade-downgrade/upgrade-1-6/ 301
 

diff --git a/docs/reference/kubectl/docker-cli-to-kubectl.md b/docs/reference/kubectl/docker-cli-to-kubectl.md
@@ -13,7 +13,13 @@ You can use the Kubernetes command line tool kubectl to interact with the api. Y
 
 #### docker run
 
+<<<<<<< HEAD
 To run an nginx Deployment and expose the Deployment, see [kubectl run](/docs/user-guide/kubectl/{{page.version}}/#run).
+||||||| merged common ancestors
+How do I run an nginx Deployment and expose it to the world? Checkout [kubectl run](/docs/user-guide/kubectl/{{page.version}}/#run).
+=======
+To run an nginx Deployment and expose the Deployment, see [kubectl run](/docs/reference/generated/kubectl/kubectl-commands/{{page.version}}/#run).
+>>>>>>> Release 1.10 (#7818)
 
 docker:
 
@@ -59,7 +65,13 @@ To destroy the Deployment and its pods you need to run `kubectl delete deploymen
 
 #### docker ps
 
+<<<<<<< HEAD
 To list what is currently running, see [kubectl get](/docs/user-guide/kubectl/{{page.version}}/#get).
+||||||| merged common ancestors
+How do I list what is currently running? Checkout [kubectl get](/docs/user-guide/kubectl/{{page.version}}/#get).
+=======
+To list what is currently running, see [kubectl get](/docs/reference/generated/kubectl/kubectl-commands/{{page.version}}/#get).
+>>>>>>> Release 1.10 (#7818)
 
 docker:
 
@@ -81,7 +93,13 @@ ubuntu                      0/1       Completed   0          20s
 
 #### docker attach
 
+<<<<<<< HEAD
 To attach a process that is already running in a container, see [kubectl attach](/docs/user-guide/kubectl/{{page.version}}/#attach).
+||||||| merged common ancestors
+How do I attach to a process that is already running in a container?  Checkout [kubectl attach](/docs/user-guide/kubectl/{{page.version}}/#attach).
+=======
+To attach a process that is already running in a container, see [kubectl attach](/docs/reference/generated/kubectl/kubectl-commands/{{page.version}}/#attach).
+>>>>>>> Release 1.10 (#7818)
 
 docker:
 
@@ -109,7 +127,13 @@ To detach from the container, you can type the escape sequence Ctrl+P followed b
 
 #### docker exec
 
+<<<<<<< HEAD
 To execute a command in a container, see [kubectl exec](/docs/user-guide/kubectl/{{page.version}}/#exec).
+||||||| merged common ancestors
+How do I execute a command in a container? Checkout [kubectl exec](/docs/user-guide/kubectl/{{page.version}}/#exec).
+=======
+To execute a command in a container, see [kubectl exec](/docs/reference/generated/kubectl/kubectl-commands/{{page.version}}/#exec).
+>>>>>>> Release 1.10 (#7818)
 
 docker:
 
@@ -154,7 +178,13 @@ For more information, see [Get a Shell to a Running Container](/docs/tasks/debug
 
 #### docker logs
 
+<<<<<<< HEAD
 To follow stdout/stderr of a process that is running, see [kubectl logs](/docs/user-guide/kubectl/{{page.version}}/#logs).
+||||||| merged common ancestors
+How do I follow stdout/stderr of a running process? Checkout [kubectl logs](/docs/user-guide/kubectl/{{page.version}}/#logs).
+=======
+To follow stdout/stderr of a process that is running, see [kubectl logs](/docs/reference/generated/kubectl/kubectl-commands/{{page.version}}/#logs).
+>>>>>>> Release 1.10 (#7818)
 
 
 docker:
@@ -181,11 +211,23 @@ $ kubectl logs --previous nginx-app-zibvs
 10.240.63.110 - - [14/Jul/2015:01:09:02 +0000] "GET / HTTP/1.1" 200 612 "-" "curl/7.26.0" "-"
 ```
 
+<<<<<<< HEAD
 For more information, see [Logging Architecture](/docs/concepts/cluster-administration/logging/).
+||||||| merged common ancestors
+See [Logging and Monitoring Cluster Activity](/docs/concepts/cluster-administration/logging/) for more information.
+=======
+For more information, see [Logging Architecture](docs/concepts/cluster-administration/logging/).
+>>>>>>> Release 1.10 (#7818)
 
 #### docker stop and docker rm
 
+<<<<<<< HEAD
 To stop and delete a running process, see [kubectl delete](/docs/user-guide/kubectl/{{page.version}}/#delete).
+||||||| merged common ancestors
+How do I stop and delete a running process? Checkout [kubectl delete](/docs/user-guide/kubectl/{{page.version}}/#delete).
+=======
+To stop and delete a running process, see [kubectl delete](/docs/reference/generated/kubectl/kubectl-commands/{{page.version}}/#delete).
+>>>>>>> Release 1.10 (#7818)
 
 docker:
 
@@ -228,7 +270,13 @@ There is no direct analog of `docker login` in kubectl. If you are interested in
 
 #### docker version
 
+<<<<<<< HEAD
 To get the version of client and server, see [kubectl version](/docs/user-guide/kubectl/{{page.version}}/#version).
+||||||| merged common ancestors
+How do I get the version of my client and server? Checkout [kubectl version](/docs/user-guide/kubectl/{{page.version}}/#version).
+=======
+To get the version of client and server, see [kubectl version](/docs/reference/generated/kubectl/kubectl-commands{{page.version}}/#version).
+>>>>>>> Release 1.10 (#7818)
 
 docker:
 
@@ -256,7 +304,13 @@ Server Version: version.Info{Major:"1", Minor:"6", GitVersion:"v1.6.9+a3d1dfa6f4
 
 #### docker info
 
+<<<<<<< HEAD
 To get miscellaneous information about the environment and configuration, see [kubectl cluster-info](/docs/user-guide/kubectl/{{page.version}}/#cluster-info).
+||||||| merged common ancestors
+How do I get miscellaneous info about my environment and configuration? Checkout [kubectl cluster-info](/docs/user-guide/kubectl/{{page.version}}/#cluster-info).
+=======
+To get miscellaneous information about the environment and configuration, see [kubectl cluster-info](/docs/reference/generated/kubectl/kubectl-commands/{{page.version}}/#cluster-info).
+>>>>>>> Release 1.10 (#7818)
 
 docker:
 

diff --git a/docs/tasks/administer-cluster/sysctl-cluster.md b/docs/tasks/administer-cluster/sysctl-cluster.md
@@ -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,6 +137,7 @@ metadata:
 spec:
   ...
 ```
+<<<<<<< HEAD:docs/tasks/administer-cluster/sysctl-cluster.md
 {% endcapture %}
 
 {% capture discussion %}
@@ -135,7 +146,14 @@ spec:
 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_
@@ -146,6 +164,28 @@ 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.
+{: .warning}
+
+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/)
+>>>>>>> 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