Commit Graph

507 Commits (373d10f1fd9de8161ccf2e7346d8278b1706d300)

Author SHA1 Message Date
Ahmet Alp Balkan 1f6a98d134
Use correct apigroup for NetworkPolicy
Follow-up to #4225. networking -> networking.k8s.io.

Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2017-06-29 21:49:53 -07:00
Andrew Chen d74dbcc7d5 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  add small blurb about reclaim policies and SCs
2017-06-28 23:51:53 -07:00
Patrick Christopher 46be5c6bc7 add small blurb about reclaim policies and SCs 2017-06-28 23:27:17 -07:00
Andrew Chen b40d09fe77 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Update links to proper repos

# Conflicts:
#	docs/admin/kubeadm.md
#	docs/concepts/overview/kubernetes-api.md
#	docs/reference/api-overview.md
#	docs/setup/independent/create-cluster-kubeadm.md
#	docs/tasks/administer-cluster/configure-pod-disruption-budget.md
2017-06-28 22:29:21 -07:00
Christoph Blecker 2e192598a0 Update links to proper repos 2017-06-28 22:08:36 -07:00
Tim Hockin 472eccc83c Use correct apigroup for network policy 2017-06-28 17:25:22 -07:00
Andrew Chen 7b5394e725 Patch PR #4140 (#4215)
* Patch PR #4140

* fix link and typos
2017-06-27 21:42:07 -07:00
Anthony Yeh 171a5aeddf Custom resource docs 2017-06-27 10:27:51 -07:00
Kenneth Owens 4641b51e1b Add update to statefulset concepts and basic tutorial (#4174)
* Add update to statefulset concpets and basic tutorial

* Address tech comments.
2017-06-27 09:46:39 -07:00
Andrew Chen 0e08493616 Merge pull request #4202 from kubernetes/chenopis-4080-patch
Fix typo for PR #4080
2017-06-27 09:31:24 -07:00
Andrew Chen a3b46cfcdf Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Replace remaining kargo usages to kubespray
  update example templates
  redirect fix for meanstack article
2017-06-27 09:23:04 -07:00
Andrew Chen b2161bcc6a Fix typo for #4080 2017-06-27 09:21:29 -07:00
Ricky Pai 79754a0ffa documentation for using hostAliases to manage hosts file (#4080)
* documentation for using hostAliases to manage hosts file

* add to table of contents

* review comments

* update the right command to see hosts file

* reformat doc based on suggestion and change some wording
2017-06-27 09:19:41 -07:00
Andrew Chen 025f2faff4 API Aggregator (#4173)
* API Aggregator

* Additional bullet points

* incorporated feedback for apiserver-aggregation.md

* split setup-api-aggregator.md into two docs and address feedback

* fix link

* addressed docs feedback

* incorporate feedback

* integrate feedback
2017-06-27 00:22:47 -07:00
Andrew Chen 4d3a7a315d update example templates 2017-06-26 16:12:21 -07:00
Eric Tune 4ff5587583 PodDisruptionBudget documentation Improvements (#4140)
* Changes from #3885

Title: Update PDB documentation to explain new field
Author: foxish

* Added Placeholder Disruptions Concept Guide

New file: docs/concepts/workloads/pods/disruptions.md
Intented contents: concept for Pod Disruption Budget,
 cross reference to Eviction and Preemption docs.
Linked from: concepts > workloads > pods

* Added placeholder Configuring PDB Task

New file: docs/tasks/run-application/configure-pdb.md
Intented contents: task for writing a Pod Disruption Budget.
Linked from: tasks > configuring-applications > configure pdb.

* Add refs to the "drain a node" task.

* Refactor PDB docs.

Move the "Requesting an eviction" section from:
docs/tasks/administer-cluster/configure-pod-disruption-budget.md
-- which is going away -- to:
docs/tasks/administer-cluster/safely-drain-node.md

The move is verbatim, except for an introductory sentence.

Also added assignees.

* Refactor of PDB docs

Moved the section:
Specifying a PodDisruptionBudget
from:
docs/tasks/administer-cluster/configure-pod-disruption-budget.md
to:
docs/tasks/run-application/configure-pdb.md
because that former file is going away.
Move is verbatim.

* Explain how Eviction tools should handle failures

* Refactor PDB docs

Move text from:
docs/tasks/administer-cluster/configure-pod-disruption-budget.md
to:
docs/concepts/workloads/pods/disruptions.md

Delete the now empty:
docs/tasks/administer-cluster/configure-pod-disruption-budget.md

Added a redirects_from section to the new doc, containing the path
of the now-deleted doc, plus all the redirects from the deleted
doc.

* Expand PDB Concept guide

Building on a little content from the old task,
greatly expanded the Disruptions concept
guide, including an abstract example.

* Update creating a pdb Task.

* Address review comments.

* Fixed for all cody-clark's review comments

* Address review comments from mml

* Address review comments from maisem

* Fix missing backtick
2017-06-26 13:54:25 -07:00
Andrew Chen 3d417575df Merge pull request #4138 from gnufied/controller-metrics
Add documentation about controller metrics
2017-06-26 11:12:43 -07:00
Andrew Chen fbbd8922a4 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Document kubeadm KUBELET_DNS_ARGS issue
  CronJobs aren't enabled in 1.6 by default
  Fix typo
  Document pod-template-hash label
  Rename last remaining reference of kargo to kubespray
2017-06-26 10:58:27 -07:00
Hemant Kumar 99ff364e61 Add documentation about controller metrics 2017-06-26 13:16:54 -04:00
Denis Gladkikh 8716e152b3 CronJobs aren't enabled in 1.6 by default 2017-06-26 08:56:03 -07:00
hanks 386a2a0982 Fix typo
trivial update `kublet` to `kubelet`
2017-06-26 08:46:54 -07:00
Michail Kargakis 8c414800a0 Document pod-template-hash label
Signed-off-by: Michail Kargakis <mkargaki@redhat.com>
2017-06-25 20:42:50 -07:00
Andrew Chen 9e283a542a Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  fixed loopback plugin link
2017-06-25 12:29:05 -07:00
Matej Baćo 9347a503c8 fixed loopback plugin link 2017-06-25 12:23:10 -07:00
Andrew Chen cec3167df2 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  fixed #3968 (#4105)
2017-06-23 14:05:27 -07:00
Vincent 80c90ba8fb fixed #3968 (#4105)
* fixed #3968

* advise from @chenopis
2017-06-23 14:03:07 -07:00
Michelle Au 034c7929e2 Add local volume documentation (#4050)
* Add local volume documentation

* Add PV local volume example
2017-06-22 15:06:05 -07:00
Andrew Chen 6b3c84602d Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  whatisk8s - Chinese version (#3243)
  split rows and nest to stack columns (#4129)
  Updates to docs/admin/kubelet-tls-bootstrapping (#3617)
  Replace "Pod Injection Policy" with "Pod Preset" (#3667)
  Change example PersistentVolumeClaim
  add PodNodeSelector to admission-controllers (#3691)
  Get pods using a label selector instead of hardcoded indexes. Use JsonPath instead of go-template.
  correct_init_container_state (#3972)
  kubernetes.github.io/docs/tasks/administer-cluster: operating etcd clusters
  Remove --no-check-certificate flag in bare_metal_offline.md
2017-06-22 14:43:14 -07:00
Weihua Meng 4d89c1421b correct_init_container_state (#3972) 2017-06-22 14:14:12 -07:00
Michael Burke 83474c06d6 removed lt and gt as operators (#4152)
* removed lt and gt as operators

* replace lt and gt for node-affinfity

* updated based on bsalamat review
2017-06-22 13:28:12 -07:00
Andrew Chen f4dcee7526 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  networkpolicies.md --> network-policies.md for SEO
  Added link (#4161)
  Use "sudo -i" instead of "sudo su -"
  Create a section for kubeadm topics
  Consolidate SecurityContext topics. (#4005)
  Typo fix in "Adding ConfigMap data to a Volume" section (#3966)
2017-06-22 10:57:56 -07:00
Andrew Chen 43b9e97774 Merge pull request #4151 from crassirostris/fix-logging-concept-page
Fix title and add a TOC to the logging concept page
2017-06-22 10:51:32 -07:00
Ahmet Alp Balkan e883a27f3b networkpolicies.md --> network-policies.md for SEO
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2017-06-22 10:47:34 -07:00
Steve Perry 9da5890274 Consolidate SecurityContext topics. (#4005) 2017-06-21 18:12:44 -07:00
Andrew Chen c8f3f8f19f Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  bump openstack cli tools versions to working values
  fix header size for sub-sections under Services
  Finish #4036
  Be more specific about cpu-shares passed to Docker (#4016)
  Clarify the required uniqueness of Label Key
  Add --show-all to documentation
  docs(service): remove invalid `,` from example
  Add  "remove" example for kubectl patch (#4042)
  Fix wrong link to create a ConfigMap
  Fix a typo in the High Availability docs (#4048)
  Remove ports from ExternalName Service example
  remove extra that
  update kops installation instructions
2017-06-21 14:43:13 -07:00
Mikhail Vyatskov fe903aaae3 Fix title and add a TOC to the logging concept page 2017-06-21 17:32:49 +02:00
Andrew Chen 76cb30a271 Merge pull request #4095 from croomes/storageos
Storageos Volume Plugin
2017-06-20 16:27:10 -07:00
Ricky Pai cdf729e223 fix header size for sub-sections under Services 2017-06-20 16:14:09 -07:00
Andrew Chen f81a6fc682 Finish #4036 2017-06-20 16:07:42 -07:00
Eric Mountain @ Amadeus e53bdeb5d0 Be more specific about cpu-shares passed to Docker (#4016)
Docker documentation (https://docs.docker.com/engine/reference/run/) reads:
  
"To modify the proportion from the default of 1024, use the -c or --cpu-shares flag to set the weighting to 2 or higher. If 0 is set, the system will ignore the value and use the default of 1024."

So the Kubernetes documentation gives the impression that if requests.cpu is zero, Docker would end up applying a value of 1024, which isn't the case.

This change makes the explanation more precise, hopefully without making it much more difficult to read.
2017-06-20 16:01:16 -07:00
Sahdev P. Zala 82449c5dcf Clarify the required uniqueness of Label Key
fixes #16812

https://github.com/kubernetes/kubernetes/issues/16812

The issue was opened year back against Kubernetes, not moving it to k8s.
github.io issues but I will close the issue once these changes merge.
2017-06-20 15:58:26 -07:00
Ross Guarino 2d159b86f6 docs(service): remove invalid `,` from example
Remove invalid `,` from the ExternalIP example YAML.
2017-06-20 15:49:20 -07:00
Mark Petrovic 8e06188af4 Remove ports from ExternalName Service example
The text of this document says Services of type ExternalName do not define ports.  This PR removes the port definition from the example.
2017-06-20 15:08:41 -07:00
Pooya Sanooei f58cc22a20 remove extra that 2017-06-20 14:27:10 -07:00
Andrew Chen 91ecf67ad4 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  fixes typos and corrects links in the minikube guide (#4051)
  Use native patch functionality instead of JQ
  add the introduce of using wildcard '*' in nonResourceURL
  Rephrase doc about Deployment .spec.rollbackTo field
  create-cluster-kubeadm: add ToC using task template
  install-kubeadm: fix What's Next link text
2017-06-20 14:23:19 -07:00
Janet Kuo fcbef29da7 Rephrase doc about Deployment .spec.rollbackTo field 2017-06-20 11:09:34 -07:00
Andrew Chen bea52c8e5c Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  info about cron jobs updated (#4110)
  fix example in configure-pod-configmap.md
  Remove extraneous files from autogeneration of ref pages. (#4044)
  Add notes for file/flag precedence
  Removed "networked" from PersistentVolume (PV) definition. (#4121)
  Fix syntax err in example
2017-06-20 10:52:58 -07:00
Jorge Bianquetti eb3f374d37 info about cron jobs updated (#4110) 2017-06-20 10:33:22 -07:00
ianchakeres b4b64e9dc2 Removed "networked" from PersistentVolume (PV) definition. (#4121) 2017-06-19 16:31:08 -07:00
Andrew Chen 628e88ecc6 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Fix typo 'bash' -> 'brew'
  update pod persistent volume example storage class (#3979)
  Change Task titles to imperative: Admin. (#4033)
  Change Task titles to imperative: Daemons, GPUs. (#4032)
  Change Task titles to imperative: Federation. (#4031)
  Change Task titles to imperative: TLS. (#4030)
  Change Task titles to imperative: Access Extend. (#4029)
  Change Task titles to imperative: Monitor. (#4028)
  Change Task titles to imperative: Access Apps. (#4027)
  Change Task title to imperative: Run Job. (#4026)
  Change Task titles to imperative: Run Apps. (#4025)
  Change Task titles to imperative: Inject. (#4024)
  Change Task titles to imperative: Tools. (#4023)
  Change Task titles to imperative. (#4022)
  Fix typo in update-imported-docs.sh
  Add internal provisioner support matrix (#4009)

# Conflicts:
#	docs/tasks/administer-cluster/declare-network-policy.md
2017-06-19 10:15:52 -07:00
Jeremy Ayerst a988182a96 Fix syntax err in example
Missing " made example unusable
2017-06-18 09:44:13 -05:00
Simon Croome 69cebea16b StorageOS Volume plugin 2017-06-15 16:56:42 +01:00
Mitsuhiro Tanino 67ece8bc15 Add internal provisioner support matrix (#4009)
* Add internal provisioner support matrix

* Change links and add example of NFS plugin

* Remove usages related to hostpath
2017-06-07 14:12:59 -07:00
Dan Winship 4b6b970d51 Update NetworkPolicy docs for v1 2017-06-07 10:21:23 -07:00
Andrew Chen 0b15bf57e8 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Add TCP socket health check example (#3977)
  Update networking.md (#3950)
  [authorization] fix invalid href for webhook
2017-06-05 14:06:37 -07:00
kshafiee 8d20ed8580 Update networking.md (#3950)
* Update networking.md

Added CNI-Genie as one of the many options

* Update networking.md

Addressed!

* Update networking.md
2017-06-05 11:04:45 -07:00
Andrew Chen 36b472183b Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Remove self-referential link
  Add fibre channel volume explanation (#3967)
2017-06-05 10:41:54 -07:00
Mitsuhiro Tanino 1cec609586 Add fibre channel volume explanation (#3967)
* Add fibre channel volume explanation

This patch adds explanation of fibre channel volume including
usage of multiple WWNs.

Fix #33602

* Fix typos
2017-06-02 14:53:19 -07:00
Charlie R.C 952e5b4497 add host paths to psp (#3971)
* add host paths to psp

* add italics
2017-06-02 14:11:38 -07:00
Andrew Chen de0f19682a Merge branches 'master' and 'release-1.7' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Fix example in the "Adding ConfigMap data to a Volume" section
  Update ExternalName example
  Completes PR #3325

* 'release-1.7' of https://github.com/kubernetes/kubernetes.github.io:
2017-06-01 16:20:18 -07:00
Andrew Martin 35f6ce8b6f Update ExternalName example
As per design proposal: https://github.com/kubernetes/community/blob/master/contributors/design-proposals/service-external-name.md

The existing example is not validated by Kubernetes 1.6.3
2017-06-01 15:12:07 -07:00
pospispa d448129de9 Admins Can Configure Zones in Storage Class
The PR #38505 (https://github.com/kubernetes/kubernetes/pull/38505) added zones optional parameter to Storage Class for AWS and GCE provisioners.

That's why documentation needs to be updated accordingly.
2017-06-01 13:25:43 -07:00
Andrew Chen 7f9eec2b61 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  networking.md: Add reference to the Cilium network plugin
  Fix typo in cluster api docs
  [Kubeadm] bugfix in the index listing
2017-05-31 12:49:02 -07:00
Thomas Graf 42f0b93b68 networking.md: Add reference to the Cilium network plugin
Signed-off-by: Thomas Graf <tgraf@suug.ch>
2017-05-31 11:00:58 -07:00
Andrew Chen b695c0f78b Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Fix log rotation description in the logging doc (#3918)
  Add colon to #3897
  add prompt about KUBE_REPO_PREFIX (#3597)
  Warn against managing ReplicaSets owned by Deployments
  Update small typo in components page (#3930)
  change the service name to pod ip (#3926)
2017-05-31 10:52:49 -07:00
Mik Vyatskov f4fd9e79ed Fix log rotation description in the logging doc (#3918)
* Fix log rotation description in the logging doc

* Review comments

* Address review comments

* Address review comments
2017-05-31 10:50:04 -07:00
Andrew Chen 5b26c42be5 Add colon to #3897 2017-05-31 10:47:02 -07:00
Michail Kargakis 4471d3dbf0 Warn against managing ReplicaSets owned by Deployments
Signed-off-by: Michail Kargakis <mkargaki@redhat.com>
2017-05-31 10:37:40 -07:00
Swapnil Kulkarni 71177ff37a Update small typo in components page (#3930)
[1] page has a typo in Master Components section.
Updated the document.

[1] https://kubernetes.io/docs/concepts/overview/components/
2017-05-31 10:34:51 -07:00
Andrew Chen b1ee47f7d5 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Reimplement #2756 (#3935)
2017-05-30 16:31:02 -07:00
Andrew Chen e0a852eb28 Reimplement #2756 (#3935) 2017-05-30 16:30:02 -07:00
Andrew Chen b56358283a Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Fixed a minor mistake
  docs/concepts/policy/pod-security-policy.md: add projected to list of allowed types.
  Init container exists beta in 1.6.
2017-05-30 15:52:35 -07:00
roshandawrani c7ba600025 Fixed a minor mistake
The word "creating" seemed missing. global allocation map should have an entry for an IP address that the service gets while it's created, right?
2017-05-30 14:34:44 -07:00
Slava Semushin 1bed34e5c9 docs/concepts/policy/pod-security-policy.md: add projected to list of allowed types. 2017-05-30 14:20:39 -07:00
Guangya Liu 8c881a35cd Init container exists beta in 1.6. 2017-05-30 12:03:52 -07:00
Andrew Chen cca652bf00 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  fix typo (#3895)
  add unit of --ttl duration (#3915)
  Fixes broken links
  Prototype of custom description meta tags. (#3928)
  Site URL for canonical URLs. (#3927)
  Warn about implications on selector updates
  grammar patch to #3922 (#3923)
  add calico to the table of solution
  Minor grammatical change
2017-05-30 11:59:54 -07:00
wangxunbo ee92eafd82 fix typo (#3895)
I Created a  deployment yaml file tomcatdp.yaml, and did not set the .spec.strategy,then run 
kubectl create -f tomcatdp.yaml,
and then run 
kubectl get deployment tomcat-deployment -o yaml,
the tomcat-deployment is the name of the deployment,found that the MaxUnavailable and MaxSurge default value is 25%
2017-05-30 11:47:18 -07:00
Michail Kargakis 8a27d982e6 Warn about implications on selector updates
Signed-off-by: Michail Kargakis <mkargaki@redhat.com>
2017-05-26 18:31:12 -07:00
roshandawrani 02f1800bbd Minor grammatical change 2017-05-26 17:14:57 -07:00
Andrew Chen 0702830cde Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Fix sentence
  Minor grammatical correction
  Remove beta as K8s support on Bluemix Container Service is live
  Fix some output
  replace REASON with STATUS
  column IP is missed
  replace kubectl.sh with kubectl
  replace KUBECTL with kubectl
  fix the command output
  fix the command output
  fix the command output
  Correcting the typo in init-container's name
  fix typo
  fix typo
  fix typo
  fix typo
  fix typo
  Update pod-overview.md (#3881)
  apps/v1beta1 is not valid (#3814)
  Get access to search console. (#3901)
2017-05-26 13:39:26 -07:00
Kevin J. Qiu fd4ce1860a Fix sentence 2017-05-26 10:44:37 -07:00
chenhuan12 940335cd67 column IP is missed
column IP is missed
2017-05-26 10:39:40 -07:00
chenhuan12 61c39cf9df replace kubectl.sh with kubectl
replace kubectl.sh with kubectl
2017-05-26 10:39:24 -07:00
chenhuan12 8b745c2e9e replace KUBECTL with kubectl
replace KUBECTL with kubectl
2017-05-26 10:34:13 -07:00
chenhuan12 7d4f3c5587 fix the command output
fix the command output
2017-05-26 10:33:50 -07:00
roshandawrani ffaafb2276 Correcting the typo in init-container's name 2017-05-26 10:31:20 -07:00
chenhuan12 9dc7cfbebb fix typo
fix typo
2017-05-26 10:30:08 -07:00
chenhuan12 6ab0577e3e fix typo
fix typo
2017-05-26 10:29:43 -07:00
Peter Lee 80bf5cb316 fix typo 2017-05-26 10:27:32 -07:00
Selvi K d86f9ec781 Update pod-overview.md (#3881)
Fixed some typos
2017-05-26 10:27:09 -07:00
Francesc Campoy 35e959df7b apps/v1beta1 is not valid (#3814)
* apps/v1beta1 is not valid

Replacing it with extensions/v1beta1 which actually works

* Add note for versions before 1.6.0
2017-05-25 23:56:42 -07:00
Andrew Chen 64a7d876f0 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Remove instructions to stage from <username>github.io. (#3893)
  Add drop-in templates
2017-05-25 12:31:24 -07:00
Andrew Chen 7091925c9f Add drop-in templates 2017-05-24 14:48:20 -07:00
Andrew Chen cd54a86f81 Merge branch 'release-1.7' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'release-1.7' of https://github.com/kubernetes/kubernetes.github.io:
  Minor fixes in the Deployment doc
2017-05-23 22:38:33 -07:00
Henrique Truta fbcc2e9fde Add cluster resource federation page
Adds a page in Federation resources list describing
clusters.
2017-05-23 22:37:34 -07:00
Andrew Chen d0bfe261f3 Merge pull request #3862 from kargakis/minor-deployment-fixes
Minor fixes in the Deployment doc
2017-05-23 22:21:25 -07:00
Andrew Chen 9ea89e011e Reimplement #3783 2017-05-23 14:21:56 -07:00
Michail Kargakis 1d12a4bc89
Minor fixes in the Deployment doc
Signed-off-by: Michail Kargakis <mkargaki@redhat.com>
2017-05-23 10:51:06 +02:00
John Shanahan 4e28d9b8af Fixed typo under the Supervisord section 2017-05-22 14:15:06 -07:00
kshafiee 729e4b6897 Update addons.md (#3857)
* Update addons.md

Added CNI-Genie as another addon, i.e., CNI alternative.

* Update addons.md

Addressed the comment!
2017-05-22 14:12:15 -07:00