Commit Graph

5375 Commits

Author SHA1 Message Date
Xiaoyu Zhang 088c3c3ad4 Merge branch 'master' into patch-32 2017-03-22 07:10:10 +08:00
Xiaoyu Zhang f08a13eae9 Merge branch 'master' into patch-33 2017-03-22 07:10:00 +08:00
Xiaoyu Zhang 68dac29744 Merge branch 'master' into patch-34 2017-03-22 07:09:48 +08:00
Gurvinder Singh 180db357d0 updated PSP documentation with RBAC (#2552)
Added info about controller manager setup and current implementation when using PSP with RBAC support.
2017-03-21 16:09:37 -07:00
Andrew Chen 607105f918 Merge pull request #2935 from CaoShuFeng/audit-2
Audit filter is also available for the insecured endpoint
2017-03-21 16:01:04 -07:00
Andrew Chen 8d96337664 Merge pull request #2934 from CaoShuFeng/audit
Update baisc auditor's info
2017-03-21 16:00:49 -07:00
Andrew Chen 29607852ca 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 link of ogging-elasticsearch-kibana.md
  View $PAGE on Github without forking the repo
  update init-containers.md
  update out-of-resource.md
2017-03-21 15:54:53 -07:00
Andrew Chen b3ac35430c Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Create hyperlink
  Add files via upload
  Fix typo
  Remove from TOC/Search: pods/init-containers ... (#2694)
  Add files via upload
  fix to taint the master node
  Move Guide topics: Container Lifestyle Hooks, Images, Volumes
  Correct ASM logo filename
  fixed ASM blurb
  Repair Spotinst logo
  Remove redundant section in deployments

# Conflicts:
#	docs/getting-started-guides/kubeadm.md
#	docs/user-guide/volumes.md
2017-03-21 15:54:35 -07:00
Xiaoyu Zhang 590e1beff9 Merge branch 'master' into patch-34 2017-03-22 06:33:44 +08:00
Xiaoyu Zhang e22898914c Merge branch 'master' into patch-33 2017-03-22 06:33:33 +08:00
Xiaoyu Zhang 8e992ec358 Merge branch 'master' into patch-32 2017-03-22 06:33:22 +08:00
devin-donnelly 06a80c510c Merge pull request #2924 from ahmetb/edit-button
[UX] "View $PAGE on GitHub" without forking the repo
2017-03-21 15:33:19 -07:00
devin-donnelly 2ce643f56b Merge pull request #2910 from zhangxiaoyu-zidif/patch-29
update out-of-resource.md
2017-03-21 15:32:38 -07:00
devin-donnelly e85042f01d Merge pull request #2911 from zhangxiaoyu-zidif/patch-17
update init-containers.md
2017-03-21 15:32:05 -07:00
devin-donnelly 00a0eabf78 Merge pull request #2933 from zhangxiaoyu-zidif/patch-35
fix the link of logging-elasticsearch-kibana.md
2017-03-21 15:31:16 -07:00
Andrew Chen 296750f249 Merge pull request #2700 from kargakis/remove-redundant-section
Remove redundant section in deployments
2017-03-21 14:23:18 -07:00
Sahdev P. Zala 7da7a46211 Create hyperlink
Create hyperlink for kubernetes repo link.
2017-03-21 14:19:00 -07:00
mlambert890b d4107d0a08 Add files via upload 2017-03-21 14:15:18 -07:00
Jared c224a7ab66 Merge pull request #2945 from simonwydooghe/patch-1
Fix typo 'Kuberentes'
2017-03-21 14:14:06 -07:00
Simon Wydooghe b401010d3a Fix typo 2017-03-21 21:17:35 +01:00
Steve Perry d4b42e9c7e Remove from TOC/Search: pods/init-containers ... (#2694) 2017-03-21 13:11:03 -07:00
devin-donnelly ef32f29d08 Merge pull request #2932 from mlambert890b/master
Update Mirantis logo per Mirantis
2017-03-21 12:09:19 -07:00
devin-donnelly f9c06f48e2 Merge pull request #2900 from wlan0/master
add docs about cloud-controller-manager
2017-03-21 12:00:33 -07:00
devin-donnelly c0f3aa4abe Update running-cloud-controller.md 2017-03-21 11:57:01 -07:00
mlambert890b 8f9bdf5bad Merge branch 'master' into master 2017-03-21 11:56:35 -07:00
devin-donnelly a5899fc2ff Update components.md 2017-03-21 11:49:23 -07:00
devin-donnelly 8d31f21184 Merge pull request #2887 from pwittrock/release-1.6
Release 1.6
2017-03-21 11:38:53 -07:00
devin-donnelly edff5cbd3f Merge pull request #2927 from nikhiljindal/cascDel1.6
Updating cascading deletion info for federation
2017-03-21 11:34:17 -07:00
devin-donnelly 28cbea8ec6 Merge pull request #2878 from janetkuo/ds-rolling-update
Add Task: Rolling Update a DaemonSet
2017-03-21 11:09:45 -07:00
devin-donnelly c2c5f17fe4 Merge pull request #2745 from jsafrane/default-storage-class
Add documentation about default storage class
2017-03-21 11:01:30 -07:00
devin-donnelly 538a80d428 Merge pull request #2920 from xilabao/fix-taint-master-node
fix to taint the master node
2017-03-21 11:01:04 -07:00
Janet Kuo 6eeb3f74f4 Add Task: Rolling Update a DaemonSet 2017-03-21 10:40:17 -07:00
Jan Safranek 0eef44d130 Add documentation about default storage class 2017-03-21 09:25:01 +01:00
Cao Shufeng aaed3a4d38 Audit filter is also available for the insecured endpoint
See code here:
https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apiserver/pkg/server/config.go#L445
2017-03-21 04:12:02 -04:00
Cao Shufeng 173d1fd357 Update baisc auditor's info
See codes here:
https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go#L131
2017-03-21 04:09:09 -04:00
Xiaoyu Zhang 75fc7284a8 fix the link of ogging-elasticsearch-kibana.md
fix the link of url
2017-03-21 15:36:25 +08:00
mlambert890b 36f168a1fe Merge branch 'master' into master 2017-03-20 20:20:18 -07:00
mlambert890b 5f96e8a39a Add files via upload 2017-03-20 20:18:40 -07:00
xilabao b144d991a0 fix to taint the master node 2017-03-21 08:36:58 +08:00
Madhusudan.C.S b4ffa837a5 Address review comments. 2017-03-20 17:19:36 -07:00
Xiaoyu Zhang 2fe806fc00 Merge branch 'master' into patch-32 2017-03-21 08:19:20 +08:00
Xiaoyu Zhang 7dc36c1fff Merge branch 'master' into patch-34 2017-03-21 08:16:59 +08:00
Xiaoyu Zhang d05fd38de8 Merge branch 'master' into patch-33 2017-03-21 08:16:50 +08:00
Xiaoyu Zhang 4ba1d79c61 Merge branch 'master' into patch-17 2017-03-21 08:16:35 +08:00
Xiaoyu Zhang 863d58bef3 Merge branch 'master' into patch-29 2017-03-21 08:16:23 +08:00
Christian Bell c9e46a66e7 Remove fed ingress known issue for 1.6. It's been fixed. 2017-03-20 16:25:47 -07:00
Andrew Chen 763513ccce Merge pull request #2928 from kubernetes/migration-container-environment
Move Guide topics: Container Lifestyle Hooks, Images, Volumes
2017-03-20 15:57:31 -07:00
Andrew Chen f0cd49a007 Move Guide topics: Container Lifestyle Hooks, Images, Volumes 2017-03-20 15:35:51 -07:00
nikhiljindal 0007aa6404 Updating cascading deletion info for federation 2017-03-20 15:15:15 -07:00
devin-donnelly 18fb24df44 Merge pull request #2720 from DirectXMan12/feature/hpa-v2
Update HPA documentation to cover HPA v2
2017-03-20 15:10:54 -07:00