diff --git a/docker/k8s/orchestrator/Dockerfile b/docker/k8s/orchestrator/Dockerfile index 02c4e1e3851..b41d38d82b6 100644 --- a/docker/k8s/orchestrator/Dockerfile +++ b/docker/k8s/orchestrator/Dockerfile @@ -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 diff --git a/helm/release.sh b/helm/release.sh index 890a1d76182..7c8bb639b6a 100755 --- a/helm/release.sh +++ b/helm/release.sh @@ -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 diff --git a/helm/vitess/CHANGELOG.md b/helm/vitess/CHANGELOG.md index 2e30bf4fea2..77c035acdfe 100644 --- a/helm/vitess/CHANGELOG.md +++ b/helm/vitess/CHANGELOG.md @@ -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 diff --git a/helm/vitess/Chart.yaml b/helm/vitess/Chart.yaml index b10a00bb2b4..c070e4b07c9 100644 --- a/helm/vitess/Chart.yaml +++ b/helm/vitess/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: vitess -version: 1.0.5 +version: 1.0.6 description: Single-Chart Vitess Cluster keywords: - vitess diff --git a/helm/vitess/templates/_orchestrator.tpl b/helm/vitess/templates/_orchestrator.tpl index 9f061154454..45b3f65f1a8 100644 --- a/helm/vitess/templates/_orchestrator.tpl +++ b/helm/vitess/templates/_orchestrator.tpl @@ -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 @@ -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 diff --git a/helm/vitess/templates/_pmm.tpl b/helm/vitess/templates/_pmm.tpl index afc9a57e31d..b6b4bdf22ef 100644 --- a/helm/vitess/templates/_pmm.tpl +++ b/helm/vitess/templates/_pmm.tpl @@ -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 @@ -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 diff --git a/helm/vitess/templates/_vttablet.tpl b/helm/vitess/templates/_vttablet.tpl index 7523b796b49..a480acaf33e 100644 --- a/helm/vitess/templates/_vttablet.tpl +++ b/helm/vitess/templates/_vttablet.tpl @@ -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 @@ -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: @@ -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: @@ -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: diff --git a/helm/vitess/values.yaml b/helm/vitess/values.yaml index 3b85d6c2d54..c4e5563a464 100644 --- a/helm/vitess/values.yaml +++ b/helm/vitess/values.yaml @@ -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 @@ -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 @@ -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: @@ -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) @@ -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: