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 ```

Merge pull request #45527 from gyliu513/statefulset
6f5337cf · Kubernetes Submit Queue · GitHub · caf47282 · 363d97df · 6f5337cf
Commit 6f5337cf authored May 09, 2017 by Kubernetes Submit Queue Committed by GitHub May 09, 2017
3 changed files
--- a/test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml
@@ -21,24 +21,24 @@ spec:
          mountPath: "/work-dir"
        - name: config
          mountPath: "/etc/mysql"
-     - name: bootstrap
-       image: debian:jessie
-       command:
-       - "/work-dir/peer-finder"
-       args:
-       - -on-start="/work-dir/on-start.sh"
-       - "-service=galera"
-       env:
-       - name: POD_NAMESPACE
-         valueFrom:
-           fieldRef:
-             apiVersion: v1
-             fieldPath: metadata.namespace
-       volumeMounts:
-       - name: workdir
-         mountPath: "/work-dir"
-       - name: config
-         mountPath: "/etc/mysql"
+      - name: bootstrap
+        image: debian:jessie
+        command:
+        - "/work-dir/peer-finder"
+        args:
+        - -on-start="/work-dir/on-start.sh"
+        - "-service=galera"
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        volumeMounts:
+        - name: workdir
+          mountPath: "/work-dir"
+        - name: config
+          mountPath: "/etc/mysql"
      containers:
      - name: mysql
        image: gcr.io/google_containers/mysql-galera:e2e

--- a/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml
@@ -22,24 +22,24 @@ spec:
          mountPath: "/opt"
        - name: workdir
          mountPath: "/work-dir"
-     - name: bootstrap
-       image: debian:jessie
-       command:
-       - "/work-dir/peer-finder"
-       args:
-       - -on-start="/work-dir/on-start.sh"
-       - "-service=redis"
-       env:
-       - name: POD_NAMESPACE
-         valueFrom:
-           fieldRef:
-             apiVersion: v1
-             fieldPath: metadata.namespace
-       volumeMounts:
-       - name: opt
-         mountPath: "/opt"
-       - name: workdir
-         mountPath: "/work-dir"
+      - name: bootstrap
+        image: debian:jessie
+        command:
+        - "/work-dir/peer-finder"
+        args:
+        - -on-start="/work-dir/on-start.sh"
+        - "-service=redis"
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        volumeMounts:
+        - name: opt
+          mountPath: "/opt"
+        - name: workdir
+          mountPath: "/work-dir"
      containers:
      - name: redis
        image: debian:jessie

--- a/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml
@@ -22,26 +22,26 @@ spec:
          mountPath: "/opt/"
        - name: workdir
          mountPath: "/work-dir"
-     - name: bootstrap
-       image: java:openjdk-8-jre
-       command:
-       - "/work-dir/peer-finder"
-       args:
-       - -on-start="/work-dir/on-start.sh"
-       - "-service=zk"
-       env:
-       - name: POD_NAMESPACE
-         valueFrom:
-           fieldRef:
-             apiVersion: v1
-             fieldPath: metadata.namespace
-      volumeMounts:
-      - name: opt
-        mountPath: "/opt"
-      - name: workdir
-        mountPath: "/work-dir"
-      - name: datadir
-        mountPath: "/tmp/zookeeper"
+      - name: bootstrap
+        image: java:openjdk-8-jre
+        command:
+        - "/work-dir/peer-finder"
+        args:
+        - -on-start="/work-dir/on-start.sh"
+        - "-service=zk"
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        volumeMounts:
+        - name: opt
+          mountPath: "/opt"
+        - name: workdir
+          mountPath: "/work-dir"
+        - name: datadir
+          mountPath: "/tmp/zookeeper"
      containers:
      - name: zk
        image: java:openjdk-8-jre