Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.8
* 'master' of https://github.com/kubernetes/kubernetes.github.io: ZTE-SH-CN-debug-pod-replication-controller-2017-09-14-14 ZTE-SH-CN-define-command-argument-container (#5381) Update index.md Update Kompose docs Improve host aliases page (#5443) Add link to AlwaysPullImages admission controller Revert "create homepage for user journeys" create homepage for user journeys fix the command output ZTE-SH-CN-run-application-run-single-instance-stateful-application-pr-2017-… (#5363) Add a note to static pod manifest scanning revert WordPress and MySQL PV doc changes to use apps/v1beta2 APIs (#5461) Fix pod probes yaml file Redirect v1 docs. (#5460) Fix error link (#5459) Fix typo in deployment documentation # Conflicts: # docs/tutorials/stateful-application/basic-stateful-set.md
This commit is contained in:
+1
-5
@@ -25,17 +25,13 @@ spec:
|
||||
requests:
|
||||
storage: 20Gi
|
||||
---
|
||||
apiVersion: apps/v1beta2
|
||||
apiVersion: extensions/v1beta1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: wordpress-mysql
|
||||
labels:
|
||||
app: wordpress
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
app: wordpress
|
||||
tier: mysql
|
||||
strategy:
|
||||
type: Recreate
|
||||
template:
|
||||
|
||||
+1
-5
@@ -25,17 +25,13 @@ spec:
|
||||
requests:
|
||||
storage: 20Gi
|
||||
---
|
||||
apiVersion: apps/v1beta2
|
||||
apiVersion: extensions/v1beta1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: wordpress
|
||||
labels:
|
||||
app: wordpress
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
app: wordpress
|
||||
tier: frontend
|
||||
strategy:
|
||||
type: Recreate
|
||||
template:
|
||||
|
||||
Reference in New Issue
Block a user