Skip to content

Commit 53cd650

Browse files
jaredbhattijaredbhatti
authored
Merge branch 'master' into patch-2
2 parents 4641c5f + 5d6460b commit 53cd650

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1463
-298
lines changed

‎README.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,7 @@ example. If creating an image for a doc, follow the
174174
section on "Docker images" from the Kubernetes repository.
175175

176176
## Partners
177-
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.
178-
179-
* The partner product logo should be a transparent png image centered in a 215x125 px frame. (look at the existing logos for reference)
180-
* The logo must link to a URL that is specific to integrating with Kubernetes, hosted on the partner's site.
181-
* The logo should be named *product-name*_logo.png and placed in the `/images/community_logos` folder.
182-
* The image reference (including the link to the partner URL) should be added in `community.html` under `<div class="partner-logos" > ...</div>`.
183-
* Please do not change the order of the existing partner images. Append your logo to the end of the list.
184-
* Once completed and tested the look and feel, submit the pull request.
177+
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.
185178

186179
## Thank you!
187180

‎_data/concepts.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
bigheader: "Concepts"
2+
abstract: "Detailed explanations of Kubernetes system concepts and abstractions."
23
toc:
34
- title: Concepts
45
path: /docs/concepts/

‎_data/docs-home.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
bigheader: "Kubernetes Documentation"
2+
abstract: "Documentation for using and learning about Kubernetes."
3+
toc:
4+
- title: Kubernetes Documentation
5+
path: /docs/

‎_data/globals.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
tocs:
2+
- docs-home
23
- guides
34
- tutorials
45
- tasks

‎_data/guides.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
bigheader: "Guides"
2-
abstract: "How to get started, and achieve tasks, using Kubernetes"
2+
abstract: "How to get started, and accomplish tasks, using Kubernetes."
33
toc:
44
- title: Guides
5-
path: /docs/
5+
path: /docs/user-guide/
66

77
- title: Getting Started
88
section:
@@ -14,6 +14,8 @@ toc:
1414
path: /docs/getting-started-guides/kops/
1515
- title: Hello World on Google Container Engine
1616
path: /docs/hellonode/
17+
- title: Installing kubectl
18+
path: /docs/getting-started-guides/kubectl/
1719
- title: Downloading or Building Kubernetes
1820
path: /docs/getting-started-guides/binary_release/
1921
- title: Online Training Course

‎_data/support.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ toc:
1414
path: /docs/contribute/stage-documentation-changes/
1515
- title: Using Page Templates
1616
path: /docs/contribute/page-templates/
17+
- title: Documentation Style Guide
18+
path: /docs/contribute/style-guide/
1719

1820
- title: Troubleshooting
1921
section:

‎_data/tasks.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
bigheader: "Tasks"
2+
abstract: "Step-by-step instructions for performing operations with Kuberentes."
23
toc:
34
- title: Tasks
45
path: /docs/tasks/
@@ -14,6 +15,14 @@ toc:
1415
section:
1516
- title: Using Port Forwarding to Access Applications in a Cluster
1617
path: /docs/tasks/access-application-cluster/port-forward-access-application-cluster/
18+
19+
20+
- title: Debugging Applications in a Cluster
21+
section:
22+
- title: Determining the Reason for Pod Failure
23+
path: /docs/tasks/debug-application-cluster/determine-reason-pod-failure/
24+
25+
1726
- title: Accessing the Kubernetes API
1827
section:
1928
- title: Using an HTTP Proxy to Access the Kubernetes API

‎_data/tools.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
bigheader: "Tools"
2+
abstract: "Tools to help you use and enhance Kubernetes."
23
toc:
34
- title: Tools
45
path: /docs/tools/

‎_data/tutorials.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
bigheader: "Tutorials"
2+
abstract: "Detailed walkthroughs of common Kubernetes operations and workflows."
23
toc:
34
- title: Tutorials
45
path: /docs/tutorials/
@@ -50,3 +51,7 @@ toc:
5051
path: /docs/tutorials/stateless-application/expose-external-ip-address-service/
5152
- title: Exposing an External IP Address to Access an Application in a Cluster
5253
path: /docs/tutorials/stateless-application/expose-external-ip-address/
54+
- title: Stateful Applications
55+
section:
56+
- title: Running a Single-Instance Stateful Application
57+
path: /docs/tutorials/stateful-application/run-stateful-application/

‎_includes/footer.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<a href="https://calendar.google.com/calendar/embed?src=nt2tcnbtbied3l6gi2h29slvc0%40group.calendar.google.com" class="calendar"><span>Events Calendar</span></a>
2121
</div>
2222
<div>
23+
<a href="//get.k8s.io" class="button">Download K8s</a>
24+
<a href="https://github.com/kubernetes/kubernetes" class="button">Contribute to the K8s codebase</a>
2325
</div>
2426
</div>
2527
<div id="miceType" class="center">&copy; {{ 'now' | date: "%Y" }} Kubernetes</div>

0 commit comments

Comments
 (0)