Skip to content

Commit a88fd8e

Browse files
jaredbhattijaredbhatti
authored
Merge branch 'master' into patch-1
2 parents 337c6c0 + 3797f70 commit a88fd8e

Some content is hidden

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

44 files changed

+1242
-121
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/guides.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ toc:
1515
section:
1616
- title: Using Port Forwarding to Access Applications in a Cluster
1717
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+
1826
- title: Accessing the Kubernetes API
1927
section:
2028
- title: Using an HTTP Proxy to Access the Kubernetes API

‎_data/tutorials.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,7 @@ toc:
5151
path: /docs/tutorials/stateless-application/expose-external-ip-address-service/
5252
- title: Exposing an External IP Address to Access an Application in a Cluster
5353
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>

‎_includes/partner-script.js

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,20 @@
175175
link: 'https://aporeto.com/trireme',
176176
blurb: 'Aporeto makes cloud-native applications secure by default without impacting developer velocity and works at any scale, on any cloud.'
177177
},
178+
{
179+
type: 0,
180+
name: 'Giant Swarm',
181+
logo: 'giant_swarm',
182+
link: 'https://giantswarm.io',
183+
blurb: 'Giant Swarm provides fully-managed Kubernetes Clusters in your location of choice, so you can focus on your product.'
184+
},
185+
{
186+
type: 0,
187+
name: 'Mirantis',
188+
logo: 'mirantis',
189+
link: 'https://content.mirantis.com/Containerizing-OpenStack-on-Kubernetes-Video-Landing-Page.html',
190+
blurb: 'Mirantis builds and manages private clouds with open source software such as OpenStack, deployed as containers orchestrated by Kubernetes.'
191+
},
178192
{
179193
type: 1,
180194
name: 'Apprenda',
@@ -237,7 +251,14 @@
237251
logo: 'skippbox',
238252
link: 'http://www.skippbox.com/services/',
239253
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.'
240-
}
254+
},
255+
{
256+
type: 1,
257+
name: 'Endocode',
258+
logo: 'endocode',
259+
link: 'https://endocode.com/kubernetes/',
260+
blurb: 'Endocode practices and teaches the open source way. Kernel to cluster - Dev to Ops. We offer Kubernetes trainings, services and support.'
261+
}
241262
]
242263

243264
var isvContainer = document.getElementById('isvContainer')

‎_layouts/docwithnav.html

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ <h5>{{ site.data[foundTOC].abstract }}</h5>
5252
(function(d,c,j){if(!document.getElementById(j)){var pd=d.createElement(c),s;pd.id=j;pd.src=('https:'==document.location.protocol)?'https://polldaddy.com/js/rating/rating.js':'http://i0.poll.fm/js/rating/rating.js';s=document.getElementsByTagName(c)[0];s.parentNode.insertBefore(pd,s);}}(document,'script','pd-rating-js'));
5353
</script>
5454
<a href="" onclick="window.open('https://github.com/kubernetes/kubernetes.github.io/issues/new?title=Issue%20with%20' +
55-
window.location.pathname)" class="button issue">Create Issue</a>
56-
<a href="/editdocs#{{ page.path }}" class="button issue">Edit This Page</a>
55+
window.location.pathname)" class="button issue">Create an Issue</a>
56+
<a href="/editdocs#{{ page.path }}" class="button issue">Edit this Page</a>
5757
{% endif %}
5858
</div>
5959
</section>
@@ -80,6 +80,34 @@ <h5>{{ site.data[foundTOC].abstract }}</h5>
8080
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
8181
ga('create', 'UA-36037335-10', 'auto');
8282
ga('send', 'pageview');
83+
84+
// hide docs nav area if no nav is present, or if nav only contains a link to the current page
85+
(function () {
86+
window.addEventListener('DOMContentLoaded', init)
87+
88+
// play nice with our neighbors
89+
function init() {
90+
window.removeEventListener('DOMContentLoaded', init)
91+
hideNav()
92+
}
93+
94+
function hideNav(toc){
95+
if (!toc) toc = document.querySelector('#docsToc')
96+
var container = toc.querySelector('.container')
97+
98+
// container is built dynamically, so it may not be present on the first runloop
99+
if (container) {
100+
if (container.childElementCount === 0 || toc.querySelectorAll('a.item').length === 1) {
101+
toc.style.display = 'none'
102+
document.getElementById('docsContent').style.width = '100%'
103+
}
104+
} else {
105+
requestAnimationFrame(function () {
106+
hideNav(toc)
107+
})
108+
}
109+
}
110+
})();
83111
</script>
84112
<!-- Commenting out AnswerDash for now; we need to work on our list of questions/answers/design first
85113
<!-- Start of AnswerDash script <script>var AnswerDash;!function(e,t,n,s,a){if(!t.getElementById(s)){var i,r=t.createElement(n),c=t.getElementsByTagName(n)[0];e[a]||(i=e[a]=function(){i.__oninit.push(arguments)},i.__oninit=[]),r.type="text/javascript",r.async=!0,r.src="https://p1.answerdash.com/answerdash.min.js?siteid=756",r.setAttribute("id",s),c.parentNode.insertBefore(r,c)}}(window,document,"script","answerdash-script","AnswerDash");</script> <!-- End of AnswerDash script -->

‎_sass/_base.sass

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,14 @@ footer
389389
display: block
390390
height: 0
391391
overflow: hidden
392+
393+
&.button
394+
background-image: none
395+
width: auto
396+
height: auto
397+
398+
&:hover
399+
color: $blue
392400

393401
a.twitter
394402
background-position: 0 0
@@ -874,8 +882,19 @@ dd
874882
img
875883
max-width: 100%
876884

885+
a
886+
//font-weight: 700
887+
text-decoration: underline
888+
889+
a:visited
890+
color: blueviolet
891+
877892
a.button
878893
border-radius: 2px
894+
text-decoration: none
895+
896+
&:visited
897+
color: white
879898

880899
a.issue
881900
margin-left: 20px

‎_sass/_reset.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ul, li
1515
ul
1616
margin: 0
1717
padding: 0
18-
18+
1919
a
2020
text-decoration: none
2121

0 commit comments

Comments
 (0)