Merge pull request vitessio#3584 from derekperkins/mysql-liveness-probe

helm: update liveness probes
tinyspeck · Jan 27, 2018 · 83866b3 · 83866b3
2 parents 43aaa50 + b434853
commit 83866b3
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/helm/vitess/templates/_vtctld.tpl b/helm/vitess/templates/_vtctld.tpl
@@ -60,9 +60,15 @@ spec:
  containers:
  - name: vtctld
  image: vitess/vtctld:{{$vitessTag}}
+ readinessProbe:
+ httpGet:
+ path: /debug/health
+ port: 15000
+ initialDelaySeconds: 30
+ timeoutSeconds: 5
  livenessProbe:
  httpGet:
- path: /debug/vars
+ path: /debug/status
  port: 15000
  initialDelaySeconds: 30
  timeoutSeconds: 5

diff --git a/helm/vitess/templates/_vtgate.tpl b/helm/vitess/templates/_vtgate.tpl
@@ -73,9 +73,15 @@ spec:
  containers:
  - name: vtgate
  image: vitess/vtgate:{{$vitessTag}}
+ readinessProbe:
+ httpGet:
+ path: /debug/health
+ port: 15001
+ initialDelaySeconds: 30
+ timeoutSeconds: 5
  livenessProbe:
  httpGet:
- path: /debug/vars
+ path: /debug/status
  port: 15001
  initialDelaySeconds: 30
  timeoutSeconds: 5

diff --git a/helm/vitess/templates/_vttablet.tpl b/helm/vitess/templates/_vttablet.tpl
@@ -8,6 +8,8 @@ metadata:
  name: vttablet
  labels:
  app: vitess
+ annotations:
+ service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 spec:
  publishNotReadyAddresses: true
  ports:
@@ -60,6 +62,7 @@ metadata:
 spec:
  serviceName: vttablet
  replicas: {{ .replicas | default $defaultVttablet.replicas }}
+ podManagementPolicy: Parallel
  updateStrategy: 
  type: RollingUpdate
  selector:
@@ -215,9 +218,15 @@ spec:
 
 - name: vttablet
  image: "vitess/vttablet:{{$vitessTag}}"
+ readinessProbe:
+ httpGet:
+ path: /debug/health
+ port: 15002
+ initialDelaySeconds: 60
+ timeoutSeconds: 10
  livenessProbe:
  httpGet:
- path: /debug/vars
+ path: /debug/status
  port: 15002
  initialDelaySeconds: 60
  timeoutSeconds: 10
@@ -306,6 +315,12 @@ spec:
 - name: mysql
  image: {{.mysqlImage | default $defaultVttablet.mysqlImage | quote}}
  imagePullPolicy: Always
+ readinessProbe:
+ exec:
+ command: ["mysqladmin", "ping", "-uroot", "--socket=/vtdataroot/tabletdata/mysql.sock"]
+ initialDelaySeconds: 60
+ timeoutSeconds: 10
+
  volumeMounts:
  - name: vtdataroot
  mountPath: /vtdataroot