github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #46719 from a-robinson/peer

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 46782, 46719, 46339, 46609, 46494)

Support custom domains in the cockroachdb example's init container

This switches from using v0.1 of the peer-finder image to a version that
includes https://github.com/kubernetes/contrib/pull/2013

While I'm here, switch the version of cockroachdb from 1.0 to 1.0.1

```release-note
NONE
```

@tschottdorf
This commit is contained in:
Kubernetes Submit Queue 2017-06-03 12:32:37 -07:00 committed by GitHub
commit ea5e6bcee7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/cockroachdb/cockroachdb-statefulset.yaml
View File

@ -88,9 +88,12 @@ spec:
# has to decide what command-line flags to use when starting CockroachDB. # has to decide what command-line flags to use when starting CockroachDB.
# This only matters when a pod's persistent volume is empty - if it has # This only matters when a pod's persistent volume is empty - if it has
# data from a previous execution, that data will always be used. # data from a previous execution, that data will always be used.
#
# If your Kubernetes cluster uses a custom DNS domain, you will have
# to add an additional arg to this pod: "-domain=<your-custom-domain>"
initContainers: initContainers:
- name: bootstrap - name: bootstrap
image: cockroachdb/cockroach-k8s-init:0.1 image: cockroachdb/cockroach-k8s-init:0.2
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- "-on-start=/on-start.sh" - "-on-start=/on-start.sh"
@ -117,7 +120,7 @@ spec:
topologyKey: kubernetes.io/hostname topologyKey: kubernetes.io/hostname
containers: containers:
- name: cockroachdb - name: cockroachdb
image: cockroachdb/cockroach:v1.0 image: cockroachdb/cockroach:v1.0.1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 26257 - containerPort: 26257