mirror of https://github.com/k3s-io/k3s
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 ```pull/6/head
commit
747b706c4b
|
@ -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
|
||||
|
|
|
@ -23,6 +23,7 @@ spec:
|
|||
initContainers:
|
||||
- name: bootstrap
|
||||
image: cockroachdb/cockroach-k8s-init:0.1
|
||||
imagePullPolicy: IfNotPresent
|
||||
args:
|
||||
- "-on-start=/on-start.sh"
|
||||
- "-service=cockroachdb"
|
||||
|
@ -30,19 +31,25 @@ spec:
|
|||
- 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
|
||||
|
|
Loading…
Reference in New Issue