github
/
vitess-gh
зеркало из https://github.com/github/vitess-gh.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #4443 from trevex/fix-minor-bugs 

Helm: Fix minor bugs
This commit is contained in:
Derek Perkins 2018-12-16 11:24:17 -07:00 коммит произвёл GitHub
Родитель 877f11cbaa 400da158c4
Коммит 7e1145f108
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 18 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
helm/vitess/templates/_cron-jobs.tpl
Просмотреть файл

@ -74,6 +74,8 @@ spec:
requests: requests:
cpu: 10m cpu: 10m
memory: 20Mi memory: 20Mi
volumes:
{{ include "user-secret-volumes" $defaultVtctlclient.secrets | indent 12 }}
{{ end }} {{ end }}

6
helm/vitess/templates/_orchestrator.tpl
Просмотреть файл

@ -89,7 +89,7 @@ spec:
containers: containers:
- name: orchestrator - name: orchestrator
image: {{ $orc.image | quote }} image: {{ $orc.image | quote }}
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 3000 - containerPort: 3000
name: web name: web
@ -124,7 +124,7 @@ spec:
- name: recovery-log - name: recovery-log
image: vitess/logtail:latest image: vitess/logtail:latest
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: TAIL_FILEPATH - name: TAIL_FILEPATH
value: /tmp/recovery.log value: /tmp/recovery.log
@ -134,7 +134,7 @@ spec:
- name: audit-log - name: audit-log
image: vitess/logtail:latest image: vitess/logtail:latest
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: TAIL_FILEPATH - name: TAIL_FILEPATH
value: /tmp/orchestrator-audit.log value: /tmp/orchestrator-audit.log

4
helm/vitess/templates/_pmm.tpl
Просмотреть файл

@ -138,7 +138,7 @@ spec:
- name: "pmm-client" - name: "pmm-client"
image: "vitess/pmm-client:{{ $pmm.pmmTag }}" image: "vitess/pmm-client:{{ $pmm.pmmTag }}"
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
volumeMounts: volumeMounts:
- name: vtdataroot - name: vtdataroot
mountPath: "/vtdataroot" mountPath: "/vtdataroot"
@ -219,7 +219,7 @@ spec:
- name: pmm-client-metrics-log - name: pmm-client-metrics-log
image: vitess/logtail:latest image: vitess/logtail:latest
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: TAIL_FILEPATH - name: TAIL_FILEPATH
value: /vtdataroot/pmm/pmm-mysql-metrics-42002.log value: /vtdataroot/pmm/pmm-mysql-metrics-42002.log

2
helm/vitess/templates/_vtctld.tpl
Просмотреть файл

@ -60,7 +60,7 @@ spec:
containers: containers:
- name: vtctld - name: vtctld
image: vitess/vtctld:{{$vitessTag}} image: vitess/vtctld:{{$vitessTag}}
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /debug/health path: /debug/health

4
helm/vitess/templates/_vtgate.tpl
Просмотреть файл

@ -75,7 +75,7 @@ spec:
containers: containers:
- name: vtgate - name: vtgate
image: vitess/vtgate:{{$vitessTag}} image: vitess/vtgate:{{$vitessTag}}
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /debug/health path: /debug/health
@ -224,7 +224,7 @@ affinity:
- name: init-mysql-creds - name: init-mysql-creds
image: "vitess/vtgate:{{$vitessTag}}" image: "vitess/vtgate:{{$vitessTag}}"
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
volumeMounts: volumeMounts:
- name: creds - name: creds
mountPath: "/mysqlcreds" mountPath: "/mysqlcreds"

16
helm/vitess/templates/_vttablet.tpl
Просмотреть файл

@ -167,7 +167,7 @@ spec:
- name: "init-mysql" - name: "init-mysql"
image: "vitess/mysqlctld:{{$vitessTag}}" image: "vitess/mysqlctld:{{$vitessTag}}"
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
volumeMounts: volumeMounts:
- name: vtdataroot - name: vtdataroot
mountPath: "/vtdataroot" mountPath: "/vtdataroot"
@ -211,7 +211,7 @@ spec:
- name: init-vttablet - name: init-vttablet
image: "vitess/vtctl:{{$vitessTag}}" image: "vitess/vtctl:{{$vitessTag}}"
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
volumeMounts: volumeMounts:
- name: vtdataroot - name: vtdataroot
mountPath: "/vtdataroot" mountPath: "/vtdataroot"
@ -276,7 +276,7 @@ spec:
- name: vttablet - name: vttablet
image: "vitess/vttablet:{{$vitessTag}}" image: "vitess/vttablet:{{$vitessTag}}"
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /debug/health path: /debug/health
@ -436,7 +436,7 @@ spec:
- name: mysql - name: mysql
image: {{.mysqlImage | default $defaultVttablet.mysqlImage | quote}} image: {{.mysqlImage | default $defaultVttablet.mysqlImage | quote}}
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
readinessProbe: readinessProbe:
exec: exec:
command: ["mysqladmin", "ping", "-uroot", "--socket=/vtdataroot/tabletdata/mysql.sock"] command: ["mysqladmin", "ping", "-uroot", "--socket=/vtdataroot/tabletdata/mysql.sock"]
@ -514,7 +514,7 @@ spec:
- name: logrotate - name: logrotate
image: vitess/logrotate:latest image: vitess/logrotate:latest
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
volumeMounts: volumeMounts:
- name: vtdataroot - name: vtdataroot
mountPath: /vtdataroot mountPath: /vtdataroot
@ -528,7 +528,7 @@ spec:
- name: error-log - name: error-log
image: vitess/logtail:latest image: vitess/logtail:latest
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: TAIL_FILEPATH - name: TAIL_FILEPATH
@ -546,7 +546,7 @@ spec:
- name: slow-log - name: slow-log
image: vitess/logtail:latest image: vitess/logtail:latest
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: TAIL_FILEPATH - name: TAIL_FILEPATH
@ -564,7 +564,7 @@ spec:
- name: general-log - name: general-log
image: vitess/logtail:latest image: vitess/logtail:latest
ImagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
env: env:
- name: TAIL_FILEPATH - name: TAIL_FILEPATH