Commit Graph

4597 Commits (ce3fc44034d8c47bcd2057c88bf2975da3c573a8)

Author SHA1 Message Date
Konstantinos Tsakalozos 923aeb8bda Update backups.md 2017-03-02 10:34:18 -08:00
Konstantinos Tsakalozos 5e5d91e3c2 Update validation.md 2017-03-02 10:34:18 -08:00
Konstantinos Tsakalozos a15d5c1223 Update installation.md 2017-03-02 10:34:18 -08:00
Konstantinos Tsakalozos 6dc694a161 Update index.md 2017-03-02 10:34:18 -08:00
xilabao 7aa8b474f8 support extra arguments in kubeadm master config 2017-03-02 10:14:42 -08:00
Andrew Chen a292ca987a Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Correct the certificate name
2017-03-02 10:12:48 -08:00
Manjunath A Kumatagi 0d7bcf5e6e Correct the certificate name 2017-03-02 09:59:57 -08:00
Andrew Chen 06b5791afa Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  getting-started-guides: add CoreOS Tectonic
  add DefaultTolerationSeconds admission controller
  Move Guide topic: Connect with Proxies. (#2663)
  Move Guide topic: Bootstrapping Pet Sets. (#2662)
  Move Guide topic: Using Port Forwarding. (#2661)
  fix typo (#2656)
  Move Guide topic: Using Environment Variables. (#2645)
  missing word
  Prototype for deprecating User Guide topic.
  Update static-pods.md
  Update static-pods.md
2017-03-02 09:49:33 -08:00
Rob Szumski c3e5ad74c5 getting-started-guides: add CoreOS Tectonic 2017-03-02 09:47:54 -08:00
xilabao 06416ac6e8 add DefaultTolerationSeconds admission controller 2017-03-01 16:27:13 -08:00
Andrew Chen 92c897998b Merge pull request #2518 from scjane/patch-7
Update static-pods.md
2017-03-01 16:25:08 -08:00
Jared a562f77ce0 Merge pull request #2643 from steveperry-53/deprecation
Prototype for deprecating User Guide topic.
2017-03-01 14:38:54 -08:00
Jared 034a978c5f Merge branch 'master' into deprecation 2017-03-01 14:35:33 -08:00
Steve Perry 6b675d9b69 Move Guide topic: Connect with Proxies. (#2663)
* Move Guide topic: Connect with Proxies.

* Fix link.
2017-03-01 09:42:05 -08:00
Steve Perry a642102dc8 Move Guide topic: Bootstrapping Pet Sets. (#2662)
* Move Guide topic: Bootstrapping Pet Sets.

* Add TOC entry.
2017-03-01 09:20:52 -08:00
Steve Perry a2fbc82bd0 Move Guide topic: Using Port Forwarding. (#2661) 2017-03-01 08:55:15 -08:00
tanshanshan b9ca35076b fix typo (#2656)
fix typo
2017-03-01 08:26:42 -08:00
Steve Perry 1564ae52b7 Move Guide topic: Using Environment Variables. (#2645) 2017-02-28 19:05:31 -08:00
Wang Jie fd9ff4c4e0 Merge branch 'master' into patch-7 2017-03-01 09:53:37 +08:00
Philipp T 04f2e50caa missing word
The return of the OCD.
2017-02-28 15:17:19 -08:00
devin-donnelly 46c212b7a8 Merge pull request #2647 from devin-donnelly/release-1.6
Merge latest from master into Release 1.6
2017-02-28 14:34:08 -08:00
Devin Donnelly 9a96256e49 Merge remote-tracking branch 'upstream/master' into release-1.6 2017-02-28 14:33:19 -08:00
steveperry-53 8ab16cb669 Prototype for deprecating User Guide topic. 2017-02-28 11:15:54 -08:00
jianglingxia 4bb9a3a6af kubeadm reference -- /
set up/manage mean set up or manage ? it's better use or?
2017-02-28 10:03:43 -08:00
mlambert890b 2ef4477df3 mirantis_logo.png
,/images/community_logos/mirantis_logo.png updated per Mirantis request
2017-02-28 09:52:04 -08:00
chenhuan12 764225a7a0 fix the command output
fix the command output
2017-02-28 09:50:58 -08:00
EJ 8b97c4265f fix link to go to pod-lifecycle page 2017-02-28 09:37:33 -08:00
Steve Perry 6f83f5070a Move Guide Topic: Multi-container pods. (#2642) 2017-02-28 09:08:11 -08:00
Wang Jie dd595ae05b Update static-pods.md
It works. Please review it again.
2017-02-28 18:57:54 +08:00
Steve Perry 3c20c4da09 Update landing pages for Tasks and Tutorials. (#2634) 2017-02-27 17:45:20 -08:00
xilabao eb57603fcb add http proxy infomation in kubeadm 2017-02-27 17:36:01 -08:00
huzhifeng 1cbd24e888 Merge two pieces to one words 2017-02-27 17:34:21 -08:00
huzhifeng 06104e35a3 Update grammar for kubeadm.md, thanks @chenopis 2017-02-27 17:34:21 -08:00
huzhifeng d30c4a7c78 Add diagnose tips when you face problem. 2017-02-27 17:34:21 -08:00
chenhuan12 11f3e0fec1 Delete the parameter "--google-json-key string"
“# kube-scheduler -help”can not find --google-json-key option

# kubectl version
Client Version: version.Info{Major:"1", Minor:"5", GitVersion:"v1.5.1+82450d0", GitCommit:"f5ef9802914a47c848fd84c287333f8b4d28bbc1", GitTreeState:"dirty", BuildDate:"2017-01-23T00:04:39Z", GoVersion:"go1.7", Compiler:"gc", Platform:"linux/amd64", USEEVersion:"V1.02.01_alpha", USEEPublishDate:"2017-1-10 00:00:00"}
Server Version: version.Info{Major:"1", Minor:"5", GitVersion:"v1.5.1+82450d0", GitCommit:"f5ef9802914a47c848fd84c287333f8b4d28bbc1", GitTreeState:"dirty", BuildDate:"2017-01-22T23:56:57Z", GoVersion:"go1.7", Compiler:"gc", Platform:"linux/amd64", USEEVersion:"V1.02.01_alpha", USEEPublishDate:"2017-1-10 00:00:00"}
2017-02-27 14:28:14 -08:00
Steve Perry 650d632519 Move Compute Resources topic to Concepts. (#2410) 2017-02-27 14:16:14 -08:00
Andrew Chen 3213006abc Merge pull request #2619 from xsgordon/issue-1600
Provide correct location for KUBE_ETCD_SERVERS
2017-02-27 14:00:50 -08:00
Stephen Gordon 29b3f2b99a Provide correct location for KUBE_ETCD_SERVERS
Provide correct location for KUBE_ETCD_SERVERS configuration key. It was
previously listed as being in /etc/kubernetes/config but is actually in
/etc/kubernetes/apiserver.

Related: https://github.com/kubernetes/kubernetes.github.io/issues/1600
2017-02-25 16:12:07 -05:00
Andrew Chen 86df553c4b Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io: (136 commits)
  Clarify minimum version of kubernetes supporting PSP authz
  Fix typo: federation-controller-mananger => federation-controller-manager
  Fix typo: federation-controller-mananger => federation-controller-manager
  fix command kubectl get svc,pod output
  limitrange-update
  doc-walkthrough-content
  package apt-transport-https should be installed
  Fix apimachinery vendored dependencies in examples_test.
  Delete the parameter "--google-json-key string"
  Removed Extra space in the KUBE2GO commit
  Added KUBE2GO.io
  fix some wrong links
  Update hello-minikube.md
  show kubectl_rollingupdate svg
  Fixed flag for eviction-soft.
  Update review-issues.md
  Move Guide topic: Garbage Collection. (#2488)
  Update source-ip.md
  Update source-ip.md
  concepts/abstractions: init containers example.
  ...
2017-02-24 15:14:21 -08:00
Andrew Chen b1cae4beb6 Merge pull request #2602 from tailnode/fix_links
Fix links
2017-02-24 15:12:12 -08:00
Jordan Liggitt 6d133c64d5 Clarify minimum version of kubernetes supporting PSP authz 2017-02-24 15:04:21 -08:00
Patrick Decat ae56b5bf07 Fix typo: federation-controller-mananger => federation-controller-manager 2017-02-24 15:04:04 -08:00
Patrick Decat 30023fb5b5 Fix typo: federation-controller-mananger => federation-controller-manager 2017-02-24 15:03:46 -08:00
chenhuan12 4508f114f9 fix command kubectl get svc,pod output
fix command kubectl get svc,pod output
2017-02-24 15:03:17 -08:00
jianglingxia 474ae68f25 limitrange-update
I think it's redundant that the second to ,in order to do sth and do
sth!thanks!
2017-02-24 15:02:54 -08:00
jianglingxia eeb1367c64 doc-walkthrough-content
modify
2017-02-24 15:02:54 -08:00
huzhifeng 180a9b6abc package apt-transport-https should be installed
Ubuntu default install not include apt-transport-https. so if you want to download package from https repo, you need install apt-transport-https package first
2017-02-24 15:00:21 -08:00
Jeff Mendoza fc9b83e95d Fix apimachinery vendored dependencies in examples_test. 2017-02-24 14:44:38 -08:00
chenhuan12 58867752f5 Delete the parameter "--google-json-key string"
Delete the parameter "--google-json-key string"
2017-02-24 09:39:21 -08:00
tailnode 83bfcd018f Merge remote-tracking branch 'upstream/master' into fix_links 2017-02-24 08:18:34 +08:00