Merge pull request #45678 from a-robinson/1.0

Automatic merge from submit-queue (batch tested with PRs 45990, 45544, 45745, 45742, 45678) Add explicit image tag to cockroachdb example and test @gyliu513 ```release-note NONE ```
kubernetes · May 18, 2017 · 747b706 · 747b706
2 parents 4f56e8b + 09516cf
commit 747b706
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/examples/cockroachdb/cockroachdb-statefulset.yaml b/examples/cockroachdb/cockroachdb-statefulset.yaml
@@ -93,17 +93,16 @@ spec:
         image: cockroachdb/cockroach-k8s-init:0.1
         imagePullPolicy: IfNotPresent
         args:
-          - "-on-start=/on-start.sh"
-          - "-service=cockroachdb"
+        - "-on-start=/on-start.sh"
+        - "-service=cockroachdb"
         env:
-          - name: POD_NAMESPACE
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.namespace
-       volumeMounts:
-       - name: datadir
-         mountPath: "/cockroach/cockroach-data"
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        volumeMounts:
+        - name: datadir
+          mountPath: "/cockroach/cockroach-data"
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -118,12 +117,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        # Runs the master branch. Not recommended for production, but since
-        # CockroachDB is in Beta, you don't want to run it in production
-        # anyway. See
-        # https://hub.docker.com/r/cockroachdb/cockroach/tags/
-        # if you prefer to run a beta release.
-        image: cockroachdb/cockroach
+        image: cockroachdb/cockroach:v1.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 26257

diff --git a/test/e2e/testing-manifests/statefulset/cockroachdb/statefulset.yaml b/test/e2e/testing-manifests/statefulset/cockroachdb/statefulset.yaml
@@ -23,26 +23,33 @@ spec:
       initContainers:
       - name: bootstrap
         image: cockroachdb/cockroach-k8s-init:0.1
+        imagePullPolicy: IfNotPresent
         args:
         - "-on-start=/on-start.sh"
         - "-service=cockroachdb"
         env:
         - name: POD_NAMESPACE
           valueFrom:
             fieldRef:
-              apiVersion: v1
               fieldPath: metadata.namespace
         volumeMounts:
         - name: datadir
           mountPath: "/cockroach/cockroach-data"
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - cockroachdb
+              topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        # Runs the master branch. Not recommended for production, but since
-        # CockroachDB is in Beta, you don't want to run it in production
-        # anyway. See
-        # https://hub.docker.com/r/cockroachdb/cockroach/tags/
-        # if you prefer to run a beta release.
-        image: cockroachdb/cockroach
+        image: cockroachdb/cockroach:v1.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 26257