Skip to content

Commit 554d98e

Browse files
author
Kubernetes Submit Queue
authored
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 ```
2 parents b236b20 + f4b2f00 commit 554d98e

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

cockroachdb/cockroachdb-statefulset.yaml

+10-16
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,16 @@ spec:
9393
image: cockroachdb/cockroach-k8s-init:0.1
9494
imagePullPolicy: IfNotPresent
9595
args:
96-
- "-on-start=/on-start.sh"
97-
- "-service=cockroachdb"
96+
- "-on-start=/on-start.sh"
97+
- "-service=cockroachdb"
9898
env:
99-
- name: POD_NAMESPACE
100-
valueFrom:
101-
fieldRef:
102-
apiVersion: v1
103-
fieldPath: metadata.namespace
104-
volumeMounts:
105-
- name: datadir
106-
mountPath: "/cockroach/cockroach-data"
99+
- name: POD_NAMESPACE
100+
valueFrom:
101+
fieldRef:
102+
fieldPath: metadata.namespace
103+
volumeMounts:
104+
- name: datadir
105+
mountPath: "/cockroach/cockroach-data"
107106
affinity:
108107
podAntiAffinity:
109108
preferredDuringSchedulingIgnoredDuringExecution:
@@ -118,12 +117,7 @@ spec:
118117
topologyKey: kubernetes.io/hostname
119118
containers:
120119
- name: cockroachdb
121-
# Runs the master branch. Not recommended for production, but since
122-
# CockroachDB is in Beta, you don't want to run it in production
123-
# anyway. See
124-
# https://hub.docker.com/r/cockroachdb/cockroach/tags/
125-
# if you prefer to run a beta release.
126-
image: cockroachdb/cockroach
120+
image: cockroachdb/cockroach:v1.0
127121
imagePullPolicy: IfNotPresent
128122
ports:
129123
- containerPort: 26257

0 commit comments

Comments
 (0)