Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions docker/k8s/orchestrator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@ FROM debian:stretch-slim

RUN apt-get update && \
apt-get upgrade -qq && \
apt-get install wget -qq --no-install-recommends && \
wget https://github.com/github/orchestrator/releases/download/v3.0.13/orchestrator_3.0.13_amd64.deb && \
dpkg -i orchestrator_3.0.13_amd64.deb && \
rm orchestrator_3.0.13_amd64.deb && \
apt-get install wget ca-certificates jq -qq --no-install-recommends && \
wget https://github.com/github/orchestrator/releases/download/v3.0.14/orchestrator_3.0.14_amd64.deb && \
dpkg -i orchestrator_3.0.14_amd64.deb && \
rm orchestrator_3.0.14_amd64.deb && \
apt-get purge wget -qq && \
apt-get autoremove -qq && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

# Copy certs to allow https calls
COPY --from=k8s /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt

# Copy vtctlclient to be used to notify
# Copy vtctlclient to be used to notify
COPY --from=k8s /vt/bin/vtctlclient /usr/bin/

WORKDIR /usr/local/orchestrator
Expand Down
2 changes: 1 addition & 1 deletion helm/release.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

version_tag=1.0.5
version_tag=1.0.6

docker pull vitess/k8s:latest
docker tag vitess/k8s:latest vitess/k8s:helm-$version_tag
Expand Down
7 changes: 7 additions & 0 deletions helm/vitess/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 1.0.6 - 2019-01-20

### Changes
* Update Orchestrator default to 3.0.14
* Run `pmm-admin repair` on `pmm-client` startup to recover failures on `pmm-server`
* Backups now only run on `replica` (non-master), `rdonly`, or `spare` tablet types

## 1.0.5 - 2019-01-12

### Changes
Expand Down
2 changes: 1 addition & 1 deletion helm/vitess/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: vitess
version: 1.0.5
version: 1.0.6
description: Single-Chart Vitess Cluster
keywords:
- vitess
Expand Down
4 changes: 2 additions & 2 deletions helm/vitess/templates/_orchestrator.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ spec:
value: "15999"

- name: recovery-log
image: vitess/logtail:helm-1.0.5
image: vitess/logtail:helm-1.0.6
imagePullPolicy: IfNotPresent
env:
- name: TAIL_FILEPATH
Expand All @@ -133,7 +133,7 @@ spec:
mountPath: /tmp

- name: audit-log
image: vitess/logtail:helm-1.0.5
image: vitess/logtail:helm-1.0.6
imagePullPolicy: IfNotPresent
env:
- name: TAIL_FILEPATH
Expand Down
3 changes: 2 additions & 1 deletion helm/vitess/templates/_pmm.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ spec:
# and we want to stop/remove running services, in case pod ips have changed
if pmm-admin info; then
pmm-admin stop --all
pmm-admin repair
pmm-admin rm --all
fi

Expand All @@ -218,7 +219,7 @@ spec:
trap : TERM INT; sleep infinity & wait

- name: pmm-client-metrics-log
image: vitess/logtail:helm-1.0.5
image: vitess/logtail:helm-1.0.6
imagePullPolicy: IfNotPresent
env:
- name: TAIL_FILEPATH
Expand Down
8 changes: 4 additions & 4 deletions helm/vitess/templates/_vttablet.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ spec:
{{ define "cont-logrotate" }}

- name: logrotate
image: vitess/logrotate:helm-1.0.5
image: vitess/logrotate:helm-1.0.6
imagePullPolicy: IfNotPresent
volumeMounts:
- name: vtdataroot
Expand All @@ -547,7 +547,7 @@ spec:
{{ define "cont-mysql-errorlog" }}

- name: error-log
image: vitess/logtail:helm-1.0.5
image: vitess/logtail:helm-1.0.6
imagePullPolicy: IfNotPresent

env:
Expand All @@ -565,7 +565,7 @@ spec:
{{ define "cont-mysql-slowlog" }}

- name: slow-log
image: vitess/logtail:helm-1.0.5
image: vitess/logtail:helm-1.0.6
imagePullPolicy: IfNotPresent

env:
Expand All @@ -583,7 +583,7 @@ spec:
{{ define "cont-mysql-generallog" }}

- name: general-log
image: vitess/logtail:helm-1.0.5
image: vitess/logtail:helm-1.0.6
imagePullPolicy: IfNotPresent

env:
Expand Down
12 changes: 6 additions & 6 deletions helm/vitess/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ etcd:
# Default values for vtctld resources defined in 'topology'
vtctld:
serviceType: ClusterIP
vitessTag: helm-1.0.5
vitessTag: helm-1.0.6
resources:
# requests:
# cpu: 100m
Expand All @@ -188,7 +188,7 @@ vtctld:
# Default values for vtgate resources defined in 'topology'
vtgate:
serviceType: ClusterIP
vitessTag: helm-1.0.5
vitessTag: helm-1.0.6
resources:
# requests:
# cpu: 500m
Expand All @@ -207,13 +207,13 @@ vtgate:

# Default values for vtctlclient resources defined in 'topology'
vtctlclient:
vitessTag: helm-1.0.5
vitessTag: helm-1.0.6
extraFlags: {}
secrets: [] # secrets are mounted under /vt/usersecrets/{secretname}

# Default values for vtworker resources defined in 'jobs'
vtworker:
vitessTag: helm-1.0.5
vitessTag: helm-1.0.6
extraFlags: {}
resources:
# requests:
Expand All @@ -224,7 +224,7 @@ vtworker:

# Default values for vttablet resources defined in 'topology'
vttablet:
vitessTag: helm-1.0.5
vitessTag: helm-1.0.6

# valid values are
# - mysql56 (for MySQL 8.0)
Expand Down Expand Up @@ -376,7 +376,7 @@ pmm:
# Default values for orchestrator resources
orchestrator:
enabled: false
image: vitess/orchestrator:3.0.13
image: vitess/orchestrator:3.0.14
replicas: 3
resources:
requests:
Expand Down