Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.8

* 'master' of https://github.com/kubernetes/kubernetes.github.io: Update photon-controller.md (#5279) add back Zach and Steve to PR assignment fix the command output Update troubleshooting.md Update guaranteed-scheduling-critical-addon-pods.md Include filename fix (#5139) k8s-tutorials-stateful-application (#5112) Update gce.md (#5163) Update stage-documentation-changes.md (#5213) fix the command output Fix token-authentication-file internal link
2017-09-05 14:05:06 -07:00
parent 7b692cdb29 3164b8a979
commit fc7c06c1e5
25 changed files with 4022 additions and 28 deletions
@@ -26,7 +26,7 @@ controller. As this feature matures, you should ensure tokens are bound to a Rol
 While any authentication strategy can be used for the kubelet's initial bootstrap credentials, the following two authenticators are recommended for ease of provisioning.

 1. [Bootstrap Tokens](/docs/admin/bootstrap-tokens/) - __alpha__
-2. [Token authentication file](###token-authentication-file)
+2. [Token authentication file](#token-authentication-file)

 Using bootstrap tokens is currently __alpha__ and will simplify the management of bootstrap token management especially in a HA scenario. 

@@ -221,11 +221,26 @@ Name:           nginx-deployment
 Namespace:      default
 CreationTimestamp:  Tue, 15 Mar 2016 12:01:06 -0700
 Labels:         app=nginx
+Annotations:    deployment.kubernetes.io/revision=2
 Selector:       app=nginx
-Replicas:       3 updated | 3 total | 3 available | 0 unavailable
+Replicas:       3 desired | 3 updated | 3 total | 3 available | 0 unavailable
 StrategyType:       RollingUpdate
 MinReadySeconds:    0
 RollingUpdateStrategy:  1 max unavailable, 1 max surge
+Pod Template:
+  Labels:       app=nginx
+  Containers:
+   nginx:
+    Image:              nginx:1.9.1
+    Port:               80/TCP
+    Environment:        <none>
+    Mounts:             <none>
+  Volumes:              <none>
+Conditions:
+  Type          Status  Reason
+  ----          ------  ------
+  Available     True    MinimumReplicasAvailable
+  Progressing   True    NewReplicaSetAvailable
 OldReplicaSets:     <none>
 NewReplicaSet:      nginx-deployment-1564180365 (3/3 replicas created)
 Events:
@@ -27,7 +27,7 @@ If you want to use custom binaries or pure open source Kubernetes, please contin
 1. Make sure you have credentials for GCloud by running `gcloud auth login`.
 1. (Optional)  In order to make API calls against GCE, you must also run `gcloud auth application-default login`.
 1. Make sure you can start up a GCE VM from the command line.  At least make sure you can do the [Create an instance](https://cloud.google.com/compute/docs/instances/#startinstancegcloud) part of the GCE Quickstart.
-1. Make sure you can ssh into the VM without interactive prompts.  See the [Log in to the instance](https://cloud.google.com/compute/docs/instances/#sshing) part of the GCE Quickstart.
+1. Make sure you can SSH into the VM without interactive prompts.  See the [Log in to the instance](https://cloud.google.com/compute/docs/instances/#sshing) part of the GCE Quickstart.

 ### Starting a cluster

@@ -78,7 +78,7 @@ manager.  It lets you inspect your cluster resources, create, delete, and update
 components, and much more. You will use it to look at your new cluster and bring
 up example apps.

-You can use` gcloud` to install the `kubectl` command-line tool on your workstation:
+You can use `gcloud` to install the `kubectl` command-line tool on your workstation:

    gcloud components install kubectl

@@ -22,17 +22,13 @@ setup: the actual creation of the cluster can be done by anyone.)
 needs to be installed on the machine on which you'll be running kube-up. If you
 have go installed, this can be easily installed with:

-```shell
-go get github.com/vmware/photon-controller-cli/photon
-```
+        go get github.com/vmware/photon-controller-cli/photon

 3. `mkisofs` needs to be installed. The installation process creates a
 CD-ROM ISO image to bootstrap the VMs with cloud-init. If you are on a
 Mac, you can install this with [brew](http://brew.sh/):

-```shell
-brew install cdrtools
-```
+        brew install cdrtools

 4. Several common tools need to be installed: `ssh`, `scp`, `openssl`

@@ -105,6 +105,7 @@ charm unit data, etc. Additional application-specific information may be
 included as well.

 ## Common Problems
+
 ### Load Balancer interfering with Helm

 This section assumes you have a working deployment of Kubernetes via Juju using a Load Balancer for the API, and that you are using Helm to deploy charts. 
@@ -74,13 +74,8 @@ web server:

 1. View your staged content at `http://localhost:4000`.

-<i>NOTE: If you do not want Jekyll to interfere with your other globally installed gems, you can use `bundler`:</i> 
- 
- 	gem install bundler
- 	bundle install
- 	bundler exec jekyll serve
-
-<i> Regardless of whether you use `bundler` or not, your copy of the site will then be viewable at: http://localhost:4000</i>
+**Note:** "If you do not want Jekyll to interfere with your other globally installed gems, you can use `bundler`: <br /> <br /> ```gem install bundler``` <br /> ```bundle install``` <br /> ```bundler exec jekyll serve``` <br /> <br /> Regardless of whether you use `bundler` or not, your copy of the site will then be viewable at: http://localhost:4000
+{: .note}

 {% endcapture %}

@@ -82,16 +82,19 @@ kubectl describe services example-service
 which should produce output like this:

 ```bash
-    Name:  example-service
-    Selector:   app=example
-    Type:     LoadBalancer
-    IP:     10.67.252.103
-    LoadBalancer Ingress: 123.45.678.9
-    Port:     <unnamed> 80/TCP
-    NodePort:   <unnamed> 32445/TCP
-    Endpoints:    10.64.0.4:80,10.64.1.5:80,10.64.2.4:80
-    Session Affinity: None
-    No events.
+    Name:                   example-service
+    Namespace:              default
+    Labels:                 <none>
+    Annotations:            <none>
+    Selector:               app=example
+    Type:                   LoadBalancer
+    IP:                     10.67.252.103
+    LoadBalancer Ingress:   123.45.678.9
+    Port:                   <unnamed> 80/TCP
+    NodePort:               <unnamed> 32445/TCP
+    Endpoints:              10.64.0.4:80,10.64.1.5:80,10.64.2.4:80
+    Session Affinity:       None
+    Events:                 <none>
 ```

 The IP address is listed next to `LoadBalancer Ingress`.
@@ -49,6 +49,7 @@ It doesn't have any user facing configuration (component config) or API and can
 ### Marking add-on as critical

 To be critical an add-on has to run in `kube-system` namespace (configurable via flag) and
+
 * have the `scheduler.alpha.kubernetes.io/critical-pod` annotation set to empty string, and
 * have the PodSpec's `tolerations` field set to `[{"key":"CriticalAddonsOnly", "operator":"Exists"}]`

@@ -121,7 +121,7 @@ The following manifest describes a single-instance MySQL Deployment. The MySQL c

 The following manifest describes a single-instance WordPress Deployment and Service. It uses many of the same features like a PVC for persistent storage and a Secret for the password. But it also uses a different setting: `type: NodePort`. This setting exposes WordPress to traffic from outside of the cluster.

-{% include code.html language="yaml" file="mysql-wordpress-persistent-volume/mysql-deployment.yaml" ghlink="/docs/tutorials/stateful-application/mysql-wordpress-persistent-volume/wordpress-deployment.yaml" %}
+{% include code.html language="yaml" file="mysql-wordpress-persistent-volume/wordpress-deployment.yaml" ghlink="/docs/tutorials/stateful-application/mysql-wordpress-persistent-volume/wordpress-deployment.yaml" %}

 1. Create a WordPress Service and Deployment from the `wordpress-deployment.yaml` file: