diff --git a/stable/influxdb/Chart.yaml b/stable/influxdb/Chart.yaml index ccfe7f44a0f19844b34a083ba18b70dcceb48b57..c61e3a9ea3a89f164173f74d55325e77deb18bfe 100755 --- a/stable/influxdb/Chart.yaml +++ b/stable/influxdb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: influxdb -version: 4.0.1 +version: 4.1.0 appVersion: 1.7.6 description: Scalable datastore for metrics, events, and real-time analytics. keywords: @@ -15,4 +15,6 @@ maintainers: email: jack@influxdb.com - name: aisuko email: urakiny@gmail.com +- name: naseemkullah + email: naseem@transit.app engine: gotpl diff --git a/stable/influxdb/OWNERS b/stable/influxdb/OWNERS index 4e5989f509b1c50ad150b6aedcee15fcbf10e50c..cb26731a33f436787998c31f9c07010dc8f5b1a5 100644 --- a/stable/influxdb/OWNERS +++ b/stable/influxdb/OWNERS @@ -1,6 +1,8 @@ approvers: - jackzampolin - aisuko +- naseemkullah reviewers: - jackzampolin - aisuko +- naseemkullah diff --git a/stable/influxdb/templates/backup-cronjob.yaml b/stable/influxdb/templates/backup-cronjob.yaml index 10f49e1f6c149766d595c416d15ab01fce808576..9d7aee9dc63d6b7f4311c6de0dc3f9c076ae0c6c 100644 --- a/stable/influxdb/templates/backup-cronjob.yaml +++ b/stable/influxdb/templates/backup-cronjob.yaml @@ -22,11 +22,13 @@ spec: volumes: - name: backups emptyDir: {} - {{- if and .Values.backup.gcs }} + {{- if .Values.backup.gcs }} + {{- if .Values.backup.gcs.serviceAccountSecret }} - name: google-cloud-key secret: secretName: {{ .Values.backup.gcs.serviceAccountSecret | quote }} {{- end }} + {{- end }} serviceAccountName: {{ include "influxdb.serviceAccountName" . }} initContainers: - name: influxdb-backup @@ -41,7 +43,7 @@ spec: - | influxd backup -host {{ template "influxdb.fullname" . }}.{{ .Release.Namespace }}.svc:{{ .Values.config.rpc.bind_address }} -portable /backups/backup_$(date +%Y%m%d_%H%M%S) containers: - {{- if .Values.backup.gcs}} + {{- if .Values.backup.gcs }} - name: gsutil-cp image: google/cloud-sdk:alpine command: @@ -49,20 +51,26 @@ spec: args: - '-c' - | - gcloud auth activate-service-account --key-file $KEY_FILE + if [ -n "$KEY_FILE" ]; then + gcloud auth activate-service-account --key-file $KEY_FILE + fi gsutil -m cp -r "$SRC_URL" "$DST_URL" volumeMounts: - name: backups mountPath: /backups + {{- if .Values.backup.gcs.serviceAccountSecretKey}} - name: google-cloud-key mountPath: /var/secrets/google/ + {{- end }} env: - name: SRC_URL value: /backups - name: DST_URL value: {{ .Values.backup.gcs.destination}} + {{- if .Values.backup.gcs.serviceAccountSecretKey}} - name: KEY_FILE value: /var/secrets/google/{{ .Values.backup.gcs.serviceAccountSecretKey }} + {{- end }} {{- end }} {{- if .Values.backup.azure }} - name: azure-cli