diff --git a/README.md b/README.md
index 381cd46567..2801eaead0 100644
--- a/README.md
+++ b/README.md
@@ -174,14 +174,7 @@ example. If creating an image for a doc, follow the
section on "Docker images" from the Kubernetes repository.
## Partners
-Kubernetes partners refers to the companies who contribute to the Kubernetes core codebase and/or extend their platform to support Kubernetes. Partners can get their logos added to the partner section of the [community page](http://k8s.io/community) by following the below steps and meeting the below logo specifications. Partners will also need to have a URL that is specific to integrating with Kubernetes ready; this URL will be the destination when the logo is clicked.
-
-* The partner product logo should be a transparent png image centered in a 215x125 px frame. (look at the existing logos for reference)
-* The logo must link to a URL that is specific to integrating with Kubernetes, hosted on the partner's site.
-* The logo should be named *product-name*_logo.png and placed in the `/images/community_logos` folder.
-* The image reference (including the link to the partner URL) should be added in `community.html` under ` ...
`.
-* Please do not change the order of the existing partner images. Append your logo to the end of the list.
-* Once completed and tested the look and feel, submit the pull request.
+Kubernetes partners refers to the companies who contribute to the Kubernetes core codebase, extend their platform to support Kubernetes or provide managed services to users centered around the Kubernetes platform. Partners can get their services and offerings added to the [partner page](https://k8s.io/partners) by completing and submitting the [partner request form](https://goo.gl/qcSnZF). Once the information and assets are verified, the partner product/services will be listed in the partner page. This would typically take 7-10 days.
## Thank you!
diff --git a/_data/concepts.yml b/_data/concepts.yml
index a69276201e..f9422daa98 100644
--- a/_data/concepts.yml
+++ b/_data/concepts.yml
@@ -1,4 +1,5 @@
bigheader: "Concepts"
+abstract: "Detailed explanations of Kubernetes system concepts and abstractions."
toc:
- title: Concepts
path: /docs/concepts/
diff --git a/_data/docs-home.yml b/_data/docs-home.yml
new file mode 100644
index 0000000000..1cb8c9b05a
--- /dev/null
+++ b/_data/docs-home.yml
@@ -0,0 +1,5 @@
+bigheader: "Kubernetes Documentation"
+abstract: "Documentation for using and learning about Kubernetes."
+toc:
+- title: Kubernetes Documentation
+ path: /docs/
diff --git a/_data/globals.yml b/_data/globals.yml
index 73978ea750..2994e8b519 100644
--- a/_data/globals.yml
+++ b/_data/globals.yml
@@ -1,4 +1,5 @@
tocs:
+- docs-home
- guides
- tutorials
- tasks
diff --git a/_data/guides.yml b/_data/guides.yml
index 40d47b08d6..f3ed275e9f 100644
--- a/_data/guides.yml
+++ b/_data/guides.yml
@@ -1,8 +1,8 @@
bigheader: "Guides"
-abstract: "How to get started, and achieve tasks, using Kubernetes"
+abstract: "How to get started, and accomplish tasks, using Kubernetes."
toc:
- title: Guides
- path: /docs/
+ path: /docs/user-guide/
- title: Getting Started
section:
@@ -10,8 +10,12 @@ toc:
path: /docs/whatisk8s/
- title: Installing Kubernetes on Linux with kubeadm
path: /docs/getting-started-guides/kubeadm/
+ - title: Installing Kubernetes on AWS with kops
+ path: /docs/getting-started-guides/kops/
- title: Hello World on Google Container Engine
path: /docs/hellonode/
+ - title: Installing kubectl
+ path: /docs/getting-started-guides/kubectl/
- title: Downloading or Building Kubernetes
path: /docs/getting-started-guides/binary_release/
- title: Online Training Course
@@ -68,6 +72,8 @@ toc:
path: /docs/getting-started-guides/network-policy/walkthrough/
- title: Using Calico for NetworkPolicy
path: /docs/getting-started-guides/network-policy/calico/
+ - title: Using Romana for NetworkPolicy
+ path: /docs/getting-started-guides/network-policy/romana/
- title: Batch Jobs
section:
diff --git a/_data/samples.yml b/_data/samples.yml
index 52ac8d572a..3a9f0bcf28 100644
--- a/_data/samples.yml
+++ b/_data/samples.yml
@@ -12,6 +12,8 @@ toc:
path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/rbd/
- title: CephFS
path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/cephfs/
+ - title: CockroachDB
+ path: https://github.com/kubernetes/kubernetes/tree/release-1.4/examples/cockroachdb/
- title: GlusterFS
path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/glusterfs/
- title: Hazelcast
diff --git a/_data/support.yml b/_data/support.yml
index e280c827d7..1b8e80699a 100644
--- a/_data/support.yml
+++ b/_data/support.yml
@@ -14,6 +14,8 @@ toc:
path: /docs/contribute/stage-documentation-changes/
- title: Using Page Templates
path: /docs/contribute/page-templates/
+ - title: Documentation Style Guide
+ path: /docs/contribute/style-guide/
- title: Troubleshooting
section:
diff --git a/_data/tasks.yml b/_data/tasks.yml
index 91bbe1bcca..9898fae32f 100644
--- a/_data/tasks.yml
+++ b/_data/tasks.yml
@@ -1,4 +1,5 @@
bigheader: "Tasks"
+abstract: "Step-by-step instructions for performing operations with Kuberentes."
toc:
- title: Tasks
path: /docs/tasks/
@@ -6,10 +7,22 @@ toc:
section:
- title: Defining Environment Variables for a Container
path: /docs/tasks/configure-pod-container/define-environment-variable-container/
+ - title: Defining a Command and Arguments for a Container
+ path: /docs/tasks/configure-pod-container/define-command-argument-container/
+ - title: Assigning CPU and RAM Resources to a Container
+ path: /docs/tasks/configure-pod-container/assign-cpu-ram-container/
- title: Accessing Applications in a Cluster
section:
- title: Using Port Forwarding to Access Applications in a Cluster
path: /docs/tasks/access-application-cluster/port-forward-access-application-cluster/
+
+
+- title: Debugging Applications in a Cluster
+ section:
+ - title: Determining the Reason for Pod Failure
+ path: /docs/tasks/debug-application-cluster/determine-reason-pod-failure/
+
+
- title: Accessing the Kubernetes API
section:
- title: Using an HTTP Proxy to Access the Kubernetes API
diff --git a/_data/tools.yml b/_data/tools.yml
index 8993e091bb..cf2afca34c 100644
--- a/_data/tools.yml
+++ b/_data/tools.yml
@@ -1,4 +1,5 @@
bigheader: "Tools"
+abstract: "Tools to help you use and enhance Kubernetes."
toc:
- title: Tools
path: /docs/tools/
diff --git a/_data/tutorials.yml b/_data/tutorials.yml
index 01440b09d7..61555427d1 100644
--- a/_data/tutorials.yml
+++ b/_data/tutorials.yml
@@ -1,4 +1,5 @@
bigheader: "Tutorials"
+abstract: "Detailed walkthroughs of common Kubernetes operations and workflows."
toc:
- title: Tutorials
path: /docs/tutorials/
@@ -50,3 +51,7 @@ toc:
path: /docs/tutorials/stateless-application/expose-external-ip-address-service/
- title: Exposing an External IP Address to Access an Application in a Cluster
path: /docs/tutorials/stateless-application/expose-external-ip-address/
+- title: Stateful Applications
+ section:
+ - title: Running a Single-Instance Stateful Application
+ path: /docs/tutorials/stateful-application/run-stateful-application/
diff --git a/_includes/footer.html b/_includes/footer.html
index 15dacb72e0..e7fa36d26a 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -20,6 +20,8 @@
Events Calendar
© {{ 'now' | date: "%Y" }} Kubernetes
diff --git a/_includes/partner-script.js b/_includes/partner-script.js
index 79cbf6d513..5763047efc 100644
--- a/_includes/partner-script.js
+++ b/_includes/partner-script.js
@@ -35,6 +35,27 @@
link: 'http://wercker.com/workflows/partners/kubernetes/',
blurb: 'Netscaler CPX gives app developers all the features they need to load balance their microservices and containerized apps with Kubernetes.'
},
+ {
+ type: 0,
+ name: 'Cockroach Labs',
+ logo: 'cockroach_labs',
+ link: 'https://www.cockroachlabs.com/blog/running-cockroachdb-on-kubernetes/',
+ blurb: 'CockroachDB is a distributed SQL database whose built-in replication and survivability model pair with Kubernetes to truly make data easy.'
+ },
+ {
+ type: 0,
+ name: 'Skippbox',
+ logo: 'skippbox',
+ link: 'http://www.skippbox.com/tag/products/',
+ blurb: 'Creator of Cabin the first mobile application for Kubernetes, and kompose. Skippbox’s solutions distill all the power of k8s in simple easy to use interfaces.'
+ },
+ {
+ type: 0,
+ name: 'Weave Works',
+ logo: 'weave_works',
+ link: ' https://weave.works/kubernetes',
+ blurb: 'Weaveworks enables Developers and Dev/Ops teams to easily connect, deploy, secure, manage, and troubleshoot microservices in Kubernetes.'
+ },
{
type: 0,
name: 'Wercker',
@@ -126,6 +147,48 @@
link: 'https://github.com/nuagenetworks/nuage-kubernetes',
blurb: 'The Nuage SDN platform provides policy-based networking between Kubernetes Pods and non-Kubernetes environments with visibility and security monitoring.'
},
+ {
+ type: 0,
+ name: 'Sematext',
+ logo: 'sematext',
+ link: 'https://sematext.com/kubernetes/',
+ blurb: 'Logging & Monitoring: Automatic collection and processing of Metrics, Events and Logs for auto-discovered pods and Kubernetes nodes.'
+ },
+ {
+ type: 0,
+ name: 'Diamanti',
+ logo: 'diamanti',
+ link: 'https://www.diamanti.com/products/',
+ blurb: 'Diamanti deploys containers with guaranteed performance using Kubernetes in the first hyperconverged appliance purpose built for containerized applications.'
+ },
+ {
+ type: 0,
+ name: 'Apprenda',
+ logo: 'apprenda',
+ link: 'https://apprenda.com/kubernetes-support/',
+ blurb: 'Apprenda creates and supports modern, enterprise-ready application platforms for both cloud native and traditional application workloads.'
+ },
+ {
+ type: 0,
+ name: 'Aporeto',
+ logo: 'aporeto',
+ link: 'https://aporeto.com/trireme',
+ blurb: 'Aporeto makes cloud-native applications secure by default without impacting developer velocity and works at any scale, on any cloud.'
+ },
+ {
+ type: 0,
+ name: 'Giant Swarm',
+ logo: 'giant_swarm',
+ link: 'https://giantswarm.io',
+ blurb: 'Giant Swarm provides fully-managed Kubernetes Clusters in your location of choice, so you can focus on your product.'
+ },
+ {
+ type: 0,
+ name: 'Mirantis',
+ logo: 'mirantis',
+ link: 'https://content.mirantis.com/Containerizing-OpenStack-on-Kubernetes-Video-Landing-Page.html',
+ blurb: 'Mirantis builds and manages private clouds with open source software such as OpenStack, deployed as containers orchestrated by Kubernetes.'
+ },
{
type: 1,
name: 'Apprenda',
@@ -167,30 +230,58 @@
logo: 'container_solutions',
link: 'http://container-solutions.com/resources/kubernetes/',
blurb: 'Container Solutions is a premium software consultancy that focuses on programmable infrastructure, offering our expertise in software development, strategy and operations to help you innovate at speed and scale.'
- }
+ },
+ {
+ type: 1,
+ name: 'Jetstack',
+ logo: 'jetstack',
+ link: 'https://www.jetstack.io/',
+ blurb: 'Jetstack is an organisation focused entirely on Kubernetes. They will help you to get the most out of Kubernetes through expert professional services and open source tooling. Get in touch, and accelerate your project.'
+ },
+ {
+ type: 0,
+ name: 'Tigera',
+ logo: 'tigera',
+ link: 'http://docs.projectcalico.org/v1.5/getting-started/kubernetes/',
+ blurb: 'Tigera builds high performance, policy driven, cloud native networking solutions for Kubernetes.'
+ },
+ {
+ type: 1,
+ name: 'Skippbox',
+ logo: 'skippbox',
+ link: 'http://www.skippbox.com/services/',
+ blurb: 'Skippbox brings its Kubernetes expertise to help companies embrace Kubernetes on their way to digital transformation. Skippbox offers both professional services and expert training.'
+ },
+ {
+ type: 1,
+ name: 'Endocode',
+ logo: 'endocode',
+ link: 'https://endocode.com/kubernetes/',
+ blurb: 'Endocode practices and teaches the open source way. Kernel to cluster - Dev to Ops. We offer Kubernetes trainings, services and support.'
+ }
]
-
+
var isvContainer = document.getElementById('isvContainer')
var servContainer = document.getElementById('servContainer')
-
+
var sorted = partners.sort(function (a, b) {
if (a.name > b.name) return 1
if (a.name < b.name) return -1
return 0
})
-
+
sorted.forEach(function (obj) {
var box = document.createElement('div')
box.className = 'partner-box'
var img = document.createElement('img')
img.src = '/images/square-logos/' + obj.logo + '.png'
-
+
var div = document.createElement('div')
-
+
var p = document.createElement('p')
p.textContent = obj.blurb
-
+
var link = document.createElement('a')
link.href = obj.link
link.target = '_blank'
@@ -201,8 +292,8 @@
box.appendChild(img)
box.appendChild(div)
-
+
var container = obj.type ? servContainer : isvContainer
container.appendChild(box)
})
-})();
\ No newline at end of file
+})();
diff --git a/_includes/v1.4/extensions-v1beta1-definitions.html b/_includes/v1.4/extensions-v1beta1-definitions.html
index 59be34cd40..62b899b9fd 100755
--- a/_includes/v1.4/extensions-v1beta1-definitions.html
+++ b/_includes/v1.4/extensions-v1beta1-definitions.html
@@ -69,12 +69,6 @@
v1beta1.NetworkPolicyList
-
-v1beta1.StorageClass
-
-
-v1beta1.StorageClassList
-
@@ -1213,71 +1207,6 @@ Examples:
-
-
-
v1beta1.StorageClass
-
-
StorageClass describes the parameters for a class of storage for which PersistentVolumes can be dynamically provisioned.
-
-
-
StorageClasses are non-namespaced; the name of the storage class according to etcd is in ObjectMeta.Name.
-
-
-
v1.ExecAction
@@ -1859,61 +1788,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.
-
-
-
v1beta1.StorageClassList
-
-
StorageClassList is a collection of storage classes.
-
-
-
v1.FlockerVolumeSource
@@ -6328,7 +6202,7 @@ Both these may change in the future. Incoming requests are matched against the h
diff --git a/_includes/v1.4/extensions-v1beta1-operations.html b/_includes/v1.4/extensions-v1beta1-operations.html
index 8ac8f8e6f3..a18a2f6030 100755
--- a/_includes/v1.4/extensions-v1beta1-operations.html
+++ b/_includes/v1.4/extensions-v1beta1-operations.html
@@ -11229,10 +11229,10 @@