* '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
This commit is contained in:
Andrew Chen
2017-09-05 14:05:06 -07:00
25 changed files with 4022 additions and 28 deletions
@@ -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: