Skip to content

Commit 3dd62b5

Browse files
devin-donnellydevin-donnelly
authored
Merge pull request #1192 from devin-donnelly/release-1.4
Merging latest changes from Master into Release 1.4 branch. Includes configuration information for staging via Netlify.
2 parents 7a730e6 + 502c2fe commit 3dd62b5

40 files changed

+220
-91
lines changed

‎404.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,4 @@ $( document ).ready(function() {
6565
});
6666
</script>
6767

68-
Sorry, this page was not found. :(
69-
70-
You can let us know by filling out the "I wish this page" text field at
71-
the bottom of this page. Maybe try: "I wish this page _existed_."
68+
Sorry, this page was not found. :(

‎Gemfile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
source "https://rubygems.org"
2+
3+
gem "jekyll", "3.2.1"
4+
gem "jekyll-sass-converter", "1.3.0"
5+
gem "minima", "1.1.0"
6+
gem "kramdown", "1.11.1"
7+
gem "liquid", "3.0.6"
8+
gem "rouge", "1.11.1"
9+
gem "jemoji", "0.7.0"
10+
gem "jekyll-mentions", "1.2.0"
11+
gem "jekyll-redirect-from", "0.11.0"
12+
gem "jekyll-sitemap", "0.10.0"
13+
gem "jekyll-feed", "0.5.1"
14+
gem "jekyll-gist", "1.4.0"
15+
gem "jekyll-paginate", "1.1.0"
16+
gem "jekyll-coffeescript", "1.0.1"
17+
gem "jekyll-seo-tag", "2.0.0"
18+
gem "jekyll-github-metadata", "2.0.2"
19+
gem "listen", "3.0.6"
20+
gem "activesupport", "4.2.7"

‎Gemfile.lock

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
activesupport (4.2.7)
5+
i18n (~> 0.7)
6+
json (~> 1.7, >= 1.7.7)
7+
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
9+
tzinfo (~> 1.1)
10+
addressable (2.4.0)
11+
coffee-script (2.4.1)
12+
coffee-script-source
13+
execjs
14+
coffee-script-source (1.10.0)
15+
colorator (1.1.0)
16+
execjs (2.7.0)
17+
faraday (0.9.2)
18+
multipart-post (>= 1.2, < 3)
19+
ffi (1.9.14)
20+
forwardable-extended (2.6.0)
21+
gemoji (2.1.0)
22+
html-pipeline (2.4.2)
23+
activesupport (>= 2)
24+
nokogiri (>= 1.4)
25+
i18n (0.7.0)
26+
jekyll (3.2.1)
27+
colorator (~> 1.0)
28+
jekyll-sass-converter (~> 1.0)
29+
jekyll-watch (~> 1.1)
30+
kramdown (~> 1.3)
31+
liquid (~> 3.0)
32+
mercenary (~> 0.3.3)
33+
pathutil (~> 0.9)
34+
rouge (~> 1.7)
35+
safe_yaml (~> 1.0)
36+
jekyll-coffeescript (1.0.1)
37+
coffee-script (~> 2.2)
38+
jekyll-feed (0.5.1)
39+
jekyll-gist (1.4.0)
40+
octokit (~> 4.2)
41+
jekyll-github-metadata (2.0.2)
42+
jekyll (~> 3.1)
43+
octokit (~> 4.0)
44+
jekyll-mentions (1.2.0)
45+
activesupport (~> 4.0)
46+
html-pipeline (~> 2.3)
47+
jekyll (~> 3.0)
48+
jekyll-paginate (1.1.0)
49+
jekyll-redirect-from (0.11.0)
50+
jekyll (>= 2.0)
51+
jekyll-sass-converter (1.3.0)
52+
sass (~> 3.2)
53+
jekyll-seo-tag (2.0.0)
54+
jekyll (~> 3.1)
55+
jekyll-sitemap (0.10.0)
56+
jekyll-watch (1.5.0)
57+
listen (~> 3.0, < 3.1)
58+
jemoji (0.7.0)
59+
activesupport (~> 4.0)
60+
gemoji (~> 2.0)
61+
html-pipeline (~> 2.2)
62+
jekyll (>= 3.0)
63+
json (1.8.3)
64+
kramdown (1.11.1)
65+
liquid (3.0.6)
66+
listen (3.0.6)
67+
rb-fsevent (>= 0.9.3)
68+
rb-inotify (>= 0.9.7)
69+
mercenary (0.3.6)
70+
mini_portile2 (2.1.0)
71+
minima (1.1.0)
72+
minitest (5.9.0)
73+
multipart-post (2.0.0)
74+
nokogiri (1.6.8)
75+
mini_portile2 (~> 2.1.0)
76+
pkg-config (~> 1.1.7)
77+
octokit (4.3.0)
78+
sawyer (~> 0.7.0, >= 0.5.3)
79+
pathutil (0.14.0)
80+
forwardable-extended (~> 2.6)
81+
pkg-config (1.1.7)
82+
rb-fsevent (0.9.7)
83+
rb-inotify (0.9.7)
84+
ffi (>= 0.5.0)
85+
rouge (1.11.1)
86+
safe_yaml (1.0.4)
87+
sass (3.4.22)
88+
sawyer (0.7.0)
89+
addressable (>= 2.3.5, < 2.5)
90+
faraday (~> 0.8, < 0.10)
91+
thread_safe (0.3.5)
92+
tzinfo (1.2.2)
93+
thread_safe (~> 0.1)
94+
95+
PLATFORMS
96+
ruby
97+
98+
DEPENDENCIES
99+
activesupport (= 4.2.7)
100+
jekyll (= 3.2.1)
101+
jekyll-coffeescript (= 1.0.1)
102+
jekyll-feed (= 0.5.1)
103+
jekyll-gist (= 1.4.0)
104+
jekyll-github-metadata (= 2.0.2)
105+
jekyll-mentions (= 1.2.0)
106+
jekyll-paginate (= 1.1.0)
107+
jekyll-redirect-from (= 0.11.0)
108+
jekyll-sass-converter (= 1.3.0)
109+
jekyll-seo-tag (= 2.0.0)
110+
jekyll-sitemap (= 0.10.0)
111+
jemoji (= 0.7.0)
112+
kramdown (= 1.11.1)
113+
liquid (= 3.0.6)
114+
listen (= 3.0.6)
115+
minima (= 1.1.0)
116+
rouge (= 1.11.1)
117+
118+
BUNDLED WITH
119+
1.11.2

‎Makefile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
.PONY: all build build-preview help serve
2+
3+
help: ## Show this help.
4+
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
5+
6+
all: build ## Build site with production settings and put deliverables in _site.
7+
8+
build: ## Build site with production settings and put deliverables in _site.
9+
jekyll build
10+
11+
build-preview: ## Build site with drafts and future posts enabled.
12+
jekyll build --drafts --future
13+
14+
serve: ## Boot the development server.
15+
jekyll serve

‎_includes/footer.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
<a href="https://calendar.google.com/calendar/embed?src=nt2tcnbtbied3l6gi2h29slvc0%40group.calendar.google.com" class="calendar"><span>Events Calendar</span></a>
1919
</div>
2020
<div>
21-
<span>I wish this page</span>
22-
<input type="text" id="wishField" name="wishField" placeholder="enter your wish">
2321
</div>
2422
</div>
2523
<div id="miceType" class="center">&copy; {{ 'now' | date: "%Y" }} Kubernetes</div>

‎_layouts/docwithnav.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ <h5>{{ site.data[foundTOC].abstract }}</h5>
4343
"permalink" : "http://kubernetes.github.io{{page.url}}"
4444
};
4545
(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'));
46-
</script>{% endif %}
46+
</script>
47+
<a href="" onclick="window.open('https://github.com/kubernetes/kubernetes.github.io/issues/new?title=Issue%20with%20' +
48+
window.location.pathname + '&body=Issue%20with%20' +
49+
window.location.pathname)" class="button issue">Create Issue</a>
50+
{% endif %}
4751
</div>
4852
</section>
4953

‎_sass/_base.sass

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -874,6 +874,12 @@ dd
874874
img
875875
max-width: 100%
876876

877+
a.button
878+
border-radius: 2px
879+
880+
a.issue
881+
margin-left: 20px
882+
877883
.fixed footer
878884
position: fixed
879885
bottom: 0

‎docs/admin/networking.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Lars Kellogg-Stedman.
160160

161161
### Weave Net from Weaveworks
162162

163-
[Weave Net](https://www.weave.works/documentation/net-1-6-0-introducing-weave/) is a
163+
[Weave Net](https://www.weave.works/products/weave-net/) is a
164164
resilient and simple to use network for Kubernetes and its hosted applications.
165165
Weave Net runs as a [CNI plug-in](https://www.weave.works/docs/net/latest/cni-plugin/)
166166
or stand-alone. In either version, it doesn’t require any configuration or extra code

‎docs/admin/node-problem.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ it to [support other log format](/docs/admin/node-problem/#support-other-log-for
3636

3737
## Enable/Disable in GCE cluster
3838

39-
Node problem detector is [running as a cluster
40-
addon](/docs/admin/cluster-large/#addon-resources) enabled by default in the
39+
Node problem detector is [running as a cluster addon](cluster-large.md/#Addon-Resources) enabled by default in the
4140
gce cluster.
4241

4342
You can enable/disable it by setting the environment variable

‎docs/admin/static-pods.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ For example, this is how to start a simple web server as a static pod:
4848
EOF
4949
```
5050
51-
2. Configure your kubelet daemon on the node to use this directory by running it with `--config=/etc/kubelet.d/` argument. On Fedora Fedora 21 with Kubernetes 0.17 edit `/etc/kubernetes/kubelet` to include this line:
51+
2. Configure your kubelet daemon on the node to use this directory by running it with `--config=/etc/kubelet.d/` argument. On Fedora edit `/etc/kubernetes/kubelet` to include this line:
5252
5353
```conf
5454
KUBELET_ARGS="--cluster-dns=10.254.0.10 --cluster-domain=kube.local --config=/etc/kubelet.d/"
5555
```
5656
5757
Instructions for other distributions or Kubernetes installations may vary.
5858
59-
3. Restart kubelet. On Fedora 21, this is:
59+
3. Restart kubelet. On Fedora, this is:
6060
6161
```shell
6262
[root@my-node1 ~] $ systemctl restart kubelet

‎docs/getting-started-guides/azure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ assignees:
1313

1414
The recommended approach for deploying a Kubernetes 1.4 cluster on Azure is the
1515
[`kubernetes-anywhere`](https://github.com/kubernetes/kubernetes-anywhere) project. You will want to take a look at the
16-
[Azure Getting Started Guide](https://github.com/kubernetes/kubernetes-anywhere/blob/master/phase1/azure/README.md).
16+
[Azure Getting Started Guide](https://github.com/kubernetes/kubernetes-anywhere/blob/master/phase1/azure/README.md).

‎docs/getting-started-guides/clc.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@ kubectl cluster-info
251251

252252
### Accessing the cluster programmatically
253253

254-
It's possible to use the locally-stored client certificates to access the api server. For example, you may want to use any of the [Kubernetes API client libraries](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/client-libraries.md) to program against your Kubernetes cluster in the programming language of your choice.
254+
It's possible to use the locally stored client certificates to access the api server. For example, you may want to use any of the [Kubernetes API client libraries](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/client-libraries.md) to program against your Kubernetes cluster in the programming language of your choice.
255255

256-
To demostrate how to use these locally stored certificates, we provide the folowing example of using ```curl``` to communicate to the master api server via https:
256+
To demonstrate how to use these locally stored certificates, we provide the following example of using ```curl``` to communicate to the master api server via https:
257257

258258
```shell
259259
curl \
@@ -267,7 +267,7 @@ distributed with OSX.
267267

268268
### Accessing the cluster with a browser
269269

270-
We install two UIs on Kubernetes. The orginal KubeUI and [the newer kube
270+
We install two UIs on Kubernetes. The original KubeUI and [the newer kube
271271
dashboard](/docs/user-guide/ui/). When you create a cluster, the script should output URLs for these
272272
interfaces like this:
273273

‎docs/getting-started-guides/coreos/bare_metal_calico.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Download the stable CoreOS bootable ISO from the [CoreOS website](https://coreos
3939

4040
1. Once you've downloaded the ISO image, burn the ISO to a CD/DVD/USB key and boot from it (if using a virtual machine you can boot directly from the ISO). Once booted, you should be automatically logged in as the `core` user at the terminal. At this point CoreOS is running from the ISO and it hasn't been installed yet.
4141

42-
2. *On another machine*, download the the [master cloud-config template](https://raw.githubusercontent.com/projectcalico/calico-cni/k8s-1.1-docs/samples/kubernetes/cloud-config/master-config-template.yaml) and save it as `master-config.yaml`.
42+
2. *On another machine*, download the [master cloud-config template](https://raw.githubusercontent.com/projectcalico/calico-cni/k8s-1.1-docs/samples/kubernetes/cloud-config/master-config-template.yaml) and save it as `master-config.yaml`.
4343

4444
3. Replace the following variables in the `master-config.yaml` file.
4545

‎docs/getting-started-guides/coreos/bare_metal_offline.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Deploy a CoreOS running Kubernetes environment. This particular guide is made to
2323
* /tftpboot/pxelinux.0/(MAC) -> linked to Linux image config file
2424
2. Update per install the link for pxelinux
2525
3. Update the DHCP config to reflect the host needing deployment
26-
4. Setup nodes to deploy CoreOS creating a etcd cluster.
26+
4. Setup nodes to deploy CoreOS creating an etcd cluster.
2727
5. Have no access to the public [etcd discovery tool](https://discovery.etcd.io/).
2828
6. Installing the CoreOS slaves to become Kubernetes nodes.
2929

@@ -98,7 +98,7 @@ Now you should have a working PXELINUX setup to image CoreOS nodes. You can veri
9898

9999
This section describes how to setup the CoreOS images to live alongside a pre-existing PXELINUX environment.
100100

101-
1. Find or create the TFTP root directory that everything will be based off of.
101+
1. Find or create the TFTP root directory that everything will be based on.
102102
* For this document we will assume `/tftpboot/` is our root directory.
103103
2. Once we know and have our tftp root directory we will create a new directory structure for our CoreOS images.
104104
3. Download the CoreOS PXE files provided by the CoreOS team.

‎docs/getting-started-guides/logging-elasticsearch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ asks you to configure your view of the ingested logs. Select the option for
9393
timeseries values and select `@timestamp`. On the following page select the
9494
`Discover` tab and then you should be able to see the ingested logs.
9595
You can set the refresh interval to 5 seconds to have the logs
96-
regulary refreshed.
96+
regularly refreshed.
9797

9898
Here is a typical view of ingested logs from the Kibana viewer:
9999

‎docs/getting-started-guides/meanstack.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ RUN npm install
6464
CMD ["node", "app.js"]
6565
```
6666

67-
A `Dockerfile` is pretty self explanatory, and this one is dead simple.
67+
A `Dockerfile` is pretty self-explanatory, and this one is dead simple.
6868

6969
First, it uses the official Node.js LTS image as the base image.
7070

‎docs/getting-started-guides/openstack-heat.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ If you do not have your environment variables set, or do not want them consumed,
8686
- **[config-default.sh](http://releases.k8s.io/{{page.githubbranch}}/cluster/openstack-heat/config-default.sh)** Sets all parameters needed for heat template.
8787
- **[config-image.sh](http://releases.k8s.io/{{page.githubbranch}}/cluster/openstack-heat/config-image.sh)** Sets parameters needed to download and create new OpenStack image via glance.
8888
- **[openrc-default.sh](http://releases.k8s.io/{{page.githubbranch}}/cluster/openstack-heat/openrc-default.sh)** Sets environment variables for communicating to OpenStack. These are consumed by the cli tools (heat, glance, swift, nova).
89-
- **[openrc-swift.sh](http://releases.k8s.io/{{page.githubbranch}}/cluster/openstack-heat/openrc-swift.sh)** Some OpenStack setups require the use of seperate swift credentials. Put those credentials in this file.
89+
- **[openrc-swift.sh](http://releases.k8s.io/{{page.githubbranch}}/cluster/openstack-heat/openrc-swift.sh)** Some OpenStack setups require the use of separate swift credentials. Put those credentials in this file.
9090

9191
Please see the contents of these files for documentation regarding each variable's function.
9292

‎docs/getting-started-guides/ubuntu.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ $ export ETCD_VERSION=2.2.0
5959
For users who want to bring up a cluster with k8s version v1.1.1, `controller manager` may fail to start
6060
due to [a known issue](https://github.com/kubernetes/kubernetes/issues/17109). You could raise it
6161
up manually by using following command on the remote master server. Note that
62-
you should do this only after `api-server` is up. Moreover this issue is fixed in v1.1.2 and later.
62+
you should do this only after `api-server` is up. Moreover, this issue is fixed in v1.1.2 and later.
6363

6464
```shell
6565
$ sudo service kube-controller-manager start

‎docs/user-guide/compute-resources.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,11 @@ runner (Docker or rkt).
122122
When using Docker:
123123
124124
- The `spec.container[].resources.requests.cpu` is converted to its core value (potentially fractional),
125-
and multipled by 1024, and used as the value of the [`--cpu-shares`](
125+
and multiplied by 1024, and used as the value of the [`--cpu-shares`](
126126
https://docs.docker.com/reference/run/#runtime-constraints-on-resources) flag to the `docker run`
127127
command.
128128
- The `spec.container[].resources.limits.cpu` is converted to its millicore value,
129-
multipled by 100000, and then divided by 1000, and used as the value of the [`--cpu-quota`](
129+
multiplied by 100000, and then divided by 1000, and used as the value of the [`--cpu-quota`](
130130
https://docs.docker.com/reference/run/#runtime-constraints-on-resources) flag to the `docker run`
131131
command. The [`--cpu-period`] flag is set to 100000 which represents the default 100ms period
132132
for measuring quota usage. The kubelet enforces cpu limits if it was started with the

‎docs/user-guide/configuring-containers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ assignees:
1010

1111
## Configuration in Kubernetes
1212

13-
In addition to the imperative-style commands, such as `kubectl run` and `kubectl expose`, described [elsewhere](/docs/user-guide/quick-start), Kubernetes supports declarative configuration. Often times, configuration files are preferable to imperative commands, since they can be checked into version control and changes to the files can be code reviewed, which is especially important for more complex configurations, producing a more robust, reliable and archival system.
13+
In addition to the imperative-style commands, such as `kubectl run` and `kubectl expose`, described [elsewhere](/docs/user-guide/quick-start), Kubernetes supports declarative configuration. Oftentimes, configuration files are preferable to imperative commands, since they can be checked into version control and changes to the files can be code reviewed, which is especially important for more complex configurations, producing a more robust, reliable and archival system.
1414

1515
In the declarative style, all configuration is stored in YAML or JSON configuration files using Kubernetes's API resource schemas as the configuration schemas. `kubectl` can create, update, delete, and get API resources. The `apiVersion` (currently 'v1'?), resource `kind`, and resource `name` are used by `kubectl` to construct the appropriate API path to invoke for the specified operation.
1616

‎docs/user-guide/deployments.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ nginx-deployment-2035384211-qqcnn 1/1 Running 0 18s app
7878

7979
The created Replica Set will ensure that there are three nginx Pods at all times.
8080

81-
**Note:** You must specify appropriate selector and pod template labels of a Deployment (in this case, `app = nginx`), i.e. don't overlap with other controllers (including Deployments, Replica Sets, Replication Controllers, etc.) Kubernetes won't stop you from doing that, and if you end up with multiple controllers that have overlapping selectors, those controllers will fight with each others and won't behave correctly.
81+
**Note:** You must specify appropriate selector and pod template labels of a Deployment (in this case, `app = nginx`), i.e. don't overlap with other controllers (including Deployments, Replica Sets, Replication Controllers, etc.) Kubernetes won't stop you from doing that, and if you end up with multiple controllers that have overlapping selectors, those controllers will fight with each other's and won't behave correctly.
8282

8383
## The Status of a Deployment
8484

@@ -503,7 +503,7 @@ number of Pods are less than the desired number.
503503

504504
Note that you should not create other pods whose labels match this selector, either directly, via another Deployment or via another controller such as Replica Sets or Replication Controllers. Otherwise, the Deployment will think that those pods were created by it. Kubernetes will not stop you from doing this.
505505

506-
If you have multiple controllers that have overlapping selectors, the controllers will fight with each others and won't behave correctly.
506+
If you have multiple controllers that have overlapping selectors, the controllers will fight with each other's and won't behave correctly.
507507

508508
### Strategy
509509

0 commit comments

Comments
 (0)