mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 01:06:27 +00:00
Merge pull request #45527 from gyliu513/statefulset
Automatic merge from submit-queue (batch tested with PRs 45304, 45006, 45527) Fixed indent for some statefulset for e2e test. **What this PR does / why we need it**: Make sure the e2e test passed for statefulset. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #45526 **Special notes for your reviewer**: **Release note**: ```release-note ```
This commit is contained in:
commit
6f5337cff7
@ -21,24 +21,24 @@ spec:
|
|||||||
mountPath: "/work-dir"
|
mountPath: "/work-dir"
|
||||||
- name: config
|
- name: config
|
||||||
mountPath: "/etc/mysql"
|
mountPath: "/etc/mysql"
|
||||||
- name: bootstrap
|
- name: bootstrap
|
||||||
image: debian:jessie
|
image: debian:jessie
|
||||||
command:
|
command:
|
||||||
- "/work-dir/peer-finder"
|
- "/work-dir/peer-finder"
|
||||||
args:
|
args:
|
||||||
- -on-start="/work-dir/on-start.sh"
|
- -on-start="/work-dir/on-start.sh"
|
||||||
- "-service=galera"
|
- "-service=galera"
|
||||||
env:
|
env:
|
||||||
- name: POD_NAMESPACE
|
- name: POD_NAMESPACE
|
||||||
valueFrom:
|
valueFrom:
|
||||||
fieldRef:
|
fieldRef:
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: workdir
|
- name: workdir
|
||||||
mountPath: "/work-dir"
|
mountPath: "/work-dir"
|
||||||
- name: config
|
- name: config
|
||||||
mountPath: "/etc/mysql"
|
mountPath: "/etc/mysql"
|
||||||
containers:
|
containers:
|
||||||
- name: mysql
|
- name: mysql
|
||||||
image: gcr.io/google_containers/mysql-galera:e2e
|
image: gcr.io/google_containers/mysql-galera:e2e
|
||||||
|
@ -22,24 +22,24 @@ spec:
|
|||||||
mountPath: "/opt"
|
mountPath: "/opt"
|
||||||
- name: workdir
|
- name: workdir
|
||||||
mountPath: "/work-dir"
|
mountPath: "/work-dir"
|
||||||
- name: bootstrap
|
- name: bootstrap
|
||||||
image: debian:jessie
|
image: debian:jessie
|
||||||
command:
|
command:
|
||||||
- "/work-dir/peer-finder"
|
- "/work-dir/peer-finder"
|
||||||
args:
|
args:
|
||||||
- -on-start="/work-dir/on-start.sh"
|
- -on-start="/work-dir/on-start.sh"
|
||||||
- "-service=redis"
|
- "-service=redis"
|
||||||
env:
|
env:
|
||||||
- name: POD_NAMESPACE
|
- name: POD_NAMESPACE
|
||||||
valueFrom:
|
valueFrom:
|
||||||
fieldRef:
|
fieldRef:
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: opt
|
- name: opt
|
||||||
mountPath: "/opt"
|
mountPath: "/opt"
|
||||||
- name: workdir
|
- name: workdir
|
||||||
mountPath: "/work-dir"
|
mountPath: "/work-dir"
|
||||||
containers:
|
containers:
|
||||||
- name: redis
|
- name: redis
|
||||||
image: debian:jessie
|
image: debian:jessie
|
||||||
|
@ -22,26 +22,26 @@ spec:
|
|||||||
mountPath: "/opt/"
|
mountPath: "/opt/"
|
||||||
- name: workdir
|
- name: workdir
|
||||||
mountPath: "/work-dir"
|
mountPath: "/work-dir"
|
||||||
- name: bootstrap
|
- name: bootstrap
|
||||||
image: java:openjdk-8-jre
|
image: java:openjdk-8-jre
|
||||||
command:
|
command:
|
||||||
- "/work-dir/peer-finder"
|
- "/work-dir/peer-finder"
|
||||||
args:
|
args:
|
||||||
- -on-start="/work-dir/on-start.sh"
|
- -on-start="/work-dir/on-start.sh"
|
||||||
- "-service=zk"
|
- "-service=zk"
|
||||||
env:
|
env:
|
||||||
- name: POD_NAMESPACE
|
- name: POD_NAMESPACE
|
||||||
valueFrom:
|
valueFrom:
|
||||||
fieldRef:
|
fieldRef:
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: opt
|
- name: opt
|
||||||
mountPath: "/opt"
|
mountPath: "/opt"
|
||||||
- name: workdir
|
- name: workdir
|
||||||
mountPath: "/work-dir"
|
mountPath: "/work-dir"
|
||||||
- name: datadir
|
- name: datadir
|
||||||
mountPath: "/tmp/zookeeper"
|
mountPath: "/tmp/zookeeper"
|
||||||
containers:
|
containers:
|
||||||
- name: zk
|
- name: zk
|
||||||
image: java:openjdk-8-jre
|
image: java:openjdk-8-jre
|
||||||
|
Loading…
Reference in New Issue
Block a user