Commit Graph

188 Commits (daded6b51a4237350c00bc664778946587bf141e)

Author SHA1 Message Date
Xiaoyu Zhang 801bb14040 Merge branch 'master' into patch-39 2017-03-29 14:29:31 +08:00
Steve Perry b974f72bd3 Move Guide topic: Assigning Pods to Nodes. (#3071) 2017-03-28 20:59:32 -07:00
Xiaoyu Zhang 693bd1e2cb Fix urls of kubectl cmd
Fix urls of kubectl cmd
2017-03-29 10:58:07 +08:00
Xiaoyu Zhang 879507f72c Fix a typo
add a slash
2017-03-29 05:59:10 +08:00
Xiaoyu Zhang e37768c7b6 update urls (#3056)
* update urls

relative path may be fine :)

* change them to new ones

change them to new ones
2017-03-28 14:48:12 -07:00
Xiaoyu Zhang eef81f78b3 update the url
This link may be much better.
2017-03-28 14:34:02 -07:00
Xiaoyu Zhang f7494aff36 Fix the urls
Fix the urls
2017-03-29 04:26:00 +08:00
Andrew Chen 1c902d0fde Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io: (21 commits)
  revert issue URL, turn into link
  docs/admin/authorization: remove duplicated phrase (#3045)
  update urls
  Fix a typo and update one url
  update urls
  update a url
  update urls
  update invalid links
  update some urls
  modify the url of RestartPolicy (#3034)
  Fix the url
  amend the url
  amend the readiness probes (#3031)
  modify the link url (#3030)
  change the url (#3029)
  Fix the typo.
  Fix the link url
  delete redundant example
  fix typo
  change a link's url
  ...

# Conflicts:
#	docs/admin/authorization/index.md
2017-03-28 11:33:09 -07:00
Andrew Chen dc19b3109d revert issue URL, turn into link 2017-03-28 11:23:21 -07:00
Xiaoyu Zhang ba0ba4930c Fix a typo and update one url
Fix a typo and update one url
2017-03-28 11:04:08 -07:00
Xiaoyu Zhang 37b086593d update urls
update urls
2017-03-28 11:02:50 -07:00
Xiaoyu Zhang 38c9367671 update urls
update urls
2017-03-28 10:56:32 -07:00
Xiaoyu Zhang ed33fe51d4 update some urls
update some urls of the file
2017-03-28 10:49:44 -07:00
jianglingxia 6ac0388165 modify the url of RestartPolicy (#3034)
/docs/concepts/workloads/pods/pod-lifecycle/#restart-policy
2017-03-28 10:38:45 -07:00
Xiaoyu Zhang 5ad1c725e0 Fix the url
Fix the url
2017-03-28 10:38:03 -07:00
Xiaoyu Zhang af1f6d5a2d amend the url
Fix the wrong link
2017-03-28 10:36:04 -07:00
jianglingxia cd91dac59e modify the link url (#3030)
Headless
Services(https://kubernetes.io/docs/user-guide/services/#headless-services
2017-03-28 10:34:01 -07:00
jianglingxia e6c26bc7bb change the url (#3029)
/docs/concepts/overview/working-with-objects/annotations/
2017-03-28 10:33:20 -07:00
Xiaoyu Zhang 9a71927012 Fix the link url
The changed link and url look better, I think.
2017-03-28 10:31:27 -07:00
Drinky Pool c1d1b06685 delete redundant example
The example does not offer other aspects about the hostPath, it's some kind of duplicate to the preceding one. So, maybe only the preceding one is enough.
2017-03-28 10:30:02 -07:00
chenhuan12 d79cb68bad fix typo
fix typo
2017-03-28 10:28:32 -07:00
Xiaoyu Zhang 3cfd1547b8 change a link's url
Openshift origin 's homepage is https://www.openshift.org/. I think this one is much better than a github page.
2017-03-28 10:27:05 -07:00
chenhuan12 9243bd883d fix typo
1、column IP is missed
2、column AGE is missed
2017-03-28 14:39:30 +08:00
Andrew Chen 043c32ec86 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  add some links
  Fix the link
  Update staging container
2017-03-27 22:37:22 -07:00
Xiaoyu Zhang 7fa8b63fa8 add some links
With these links, it may help users easier to find the concepts.
2017-03-27 22:36:13 -07:00
Xiaoyu Zhang df563da532 Fix the link
The old link and title have changed. Updating them would be better.
2017-03-27 22:34:49 -07:00
Andrew Chen 403c2c1510 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  s/Wildard/Wildcard/
  rephrase the sentence
  Fix the number of processes on Kubernetes master (#2985)
  Pod Security Policy doc improvements (#3010)
  docs/admin: document OpenID Connect plugin "extra-scopes" field

# Conflicts:
#	docs/admin/kubelet.md
#	docs/user-guide/pod-security-policy/index.md
2017-03-27 16:12:50 -07:00
Xiaoyu Zhang 63afe80021 Fix the number of processes on Kubernetes master (#2985)
* Fix the number of processes on Kubernetes master 

According to https://kubernetes.io/docs/getting-started-guides/centos/centos_manual_config/, we can know that there are only three processes of Kubernetes running on the master. etcd and flannel are three-party softwares. These are kube-apiserver, kube-controller-manager, and kube-scheduler. If we want to deploy pod on master, we need to start other two processes: kube-proxy and kubelet. So Three or Five is correct. In this case, I perfer Three. Pure master without Pod is fine.

* fix the pr

fix the pr

* Fix the pr

Fix the pr
2017-03-27 16:04:19 -07:00
Andrew Chen aa100411c3 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  fix the command output
  delete invalid link
  Revert "fix the command output"
  fix the command output
  Delete the useless spaces
  Dollar signs used before commands without showing output
  bare-url-used
  Fix typo in authorization docs
  Update networking.md
2017-03-27 09:31:30 -07:00
Xiaoyu Zhang d8e8fb9ffb delete invalid link
These two links do not exist yet.
2017-03-27 09:17:01 -07:00
Andrew Chen d48512e387 Revert "fix the command output"
This reverts commit 100daaa794.
2017-03-27 09:09:04 -07:00
chenhuan12 100daaa794 fix the command output
fix the command output
2017-03-27 09:08:30 -07:00
aniket-contrail b7ca839623 Update networking.md
Added section on OpenContrail with a brief description.
2017-03-27 08:59:53 -07:00
devin-donnelly 1e817bb0d6 Merge pull request #2845 from vladimirvivien/scaleio-k8s-doc-volumes
PR for adding ScaleIO PV documentation in volumes.md
2017-03-26 18:34:44 -07:00
devin-donnelly 647b3df3df Merge pull request #2886 from caesarxuchao/gc-update-1.6
Update garbage collection doc for foreground garbage collection
2017-03-26 18:33:25 -07:00
devin-donnelly 9939c7c953 Update garbage-collection.md 2017-03-26 18:25:03 -07:00
Vladimir Vivien c98bfdf085 ScaleIO storage documentation in docs/concepts/storage 2017-03-25 07:49:53 -04:00
Andrew Chen d4349f10cb Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  change the link icon
  fix command kubectl get serviceAccounts output
  Flannel is not longer the only network addon that supports ARM

# Conflicts:
#	docs/getting-started-guides/kubeadm.md
2017-03-24 18:09:32 -07:00
Xiaoyu Zhang 13fd2d0f51 change the link icon
The link now is a page of kubernetes.io, not a github's .md file any more.
So I think use the link page's title( Building High-Availability Clusters) is fine.
"high-availability.md" may be the older edition's link icon.
2017-03-24 11:20:01 -07:00
Maciej Szulik c4dca21649 New deployments endpoint (#2986)
* Update deployments for 1.6

* Update all deployments in docs to use the new endpoint
2017-03-24 11:03:01 -07:00
Andrew Chen 4568e52bd1 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Update some description about secrets
  [Federation] Add a note about DNS API scopes to the Federation tutorial (#2943)
  Delete the useless spaces in html files
  Fix typo
  update resource-usage-monitoring.md
2017-03-23 15:23:47 -07:00
Xiaoyu Zhang 4cdf55fedc update resource-usage-monitoring.md
"purpose–built" means "designed and built for a particular use"
2017-03-23 19:44:20 +08:00
Andrew Chen 996723bc8f Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Replace the tab with 4 spaces in md files (#2797)
  fix link error
  Replace the tab with 4 spaces in html files
  hitting the `ClusterIP` from a pod (#2826)

# Conflicts:
#	docs/admin/accessing-the-api.md
#	docs/api-reference/extensions/v1beta1/definitions.html
#	docs/getting-started-guides/kubeadm.md
#	docs/user-guide/kubectl/index.md
2017-03-23 00:19:33 -07:00
Andy Yu 9ce54855d5 Replace the tab with 4 spaces in md files (#2797)
* Replace the tab with 4 spaces in md files

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>

* Fix typos of accessing-the-api.md

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>

* Fix typos of manage-compute-resources-container.md

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>

* Fix typos of run-to-completion-finite-workloads.md

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>

* Fix typos of connect-applications-service.md

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>

* Fix typos of init-containers.md

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>

* Fix typos of calico.md

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>

* Fix typos of ingress.md

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>

* Fix typos of index.md

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>

* Fix typos of index.md

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>

* Fix typos of apparmor.md

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>

* Fix typos of run-stateful-application.md

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>

* Fix typos of index.md

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>

* Fix typos of index.md

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>

* Fix typos of replicasets.md

Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
2017-03-23 00:10:00 -07:00
Andrew Chen 31221c3a76 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  rephrase the expression of configmap/index.md
  Do not link to org/team links on GitHub
  Fixed typos (#2721)
  Revert "update init-containers.md"
  Fix doc sentence
  Add Minikube reference in the Kubectl configuration doc
  Mention Minikube in the Kubectl configuration doc

# Conflicts:
#	docs/tasks/index.md
2017-03-22 13:39:24 -07:00
devin-donnelly 1494504741 Update garbage-collection.md 2017-03-22 13:28:37 -07:00
Jordan Liggitt 5ff30086e4
Switch to proxy subresource 2017-03-22 16:00:30 -04:00
devin-donnelly 9f4214fc2c Revert "update init-containers.md" 2017-03-21 23:03:14 -07:00
Andrew Chen 4eba51d6f2 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Fix incorrect sentence (#2876)
  fixing typo
  fix typo
  Update kubeadm.md

# Conflicts:
#	docs/getting-started-guides/kubeadm.md
2017-03-21 19:30:14 -07:00
Sahdev Zala dccb59fddd Fix incorrect sentence (#2876)
* Fix incorrect sentence

The changes removes an unnecessary word to correct doc sentence.

* Fix incorrect sentence

Remove an extra incorrect word from the sentence.
2017-03-21 19:20:57 -07:00