[stable/influxdb] fix: labels (#20776)

* influxdb-fix-labels

Signed-off-by: Naseem <naseem@transit.app>

* Fix labels

Signed-off-by: Naseem <naseem@transit.app>
This commit is contained in:
Naseem
2020-02-14 22:27:27 -08:00
committed by GitHub
parent 422fdc4a1c
commit af4e3b1324
6 changed files with 10 additions and 12 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: influxdb
version: 4.0.0
version: 4.0.1
appVersion: 1.7.6
description: Scalable datastore for metrics, events, and real-time analytics.
keywords:
@@ -16,8 +16,7 @@ spec:
template:
metadata:
labels:
app: {{ template "influxdb.fullname" . }}
release: "{{ .Release.Name }}"
{{- include "influxdb.selectorLabels" . | nindent 12 }}
spec:
restartPolicy: OnFailure
volumes:
@@ -29,6 +29,7 @@ spec:
- name: {{ . }}
{{- end}}
{{- end }}
serviceAccountName: {{ include "influxdb.serviceAccountName" . }}
containers:
- name: "{{ include "influxdb.fullname" . }}-meta"
image: "{{ .Values.image.repository }}:{{ .Values.enterprise.meta.image.tag }}"
@@ -2,9 +2,9 @@
apiVersion: batch/v1
kind: Job
metadata:
name: {{ include "caca.fullname" . }}-set-auth
name: {{ include "influxdb.fullname" . }}-set-auth
labels:
{{- include "caca.labels" . | nindent 4 }}
{{- include "influxdb.labels" . | nindent 4 }}
annotations:
"helm.sh/hook": post-install
"helm.sh/hook-delete-policy": hook-succeeded
@@ -13,8 +13,7 @@ spec:
template:
metadata:
labels:
app: {{ template "influxdb.fullname" . }}
release: "{{ .Release.Name }}"
{{- include "influxdb.selectorLabels" . | nindent 8 }}
spec:
containers:
- name: {{ template "influxdb.fullname" . }}-set-auth
+1 -2
View File
@@ -47,5 +47,4 @@ spec:
targetPort: {{ .Values.config.rpc.bind_address }}
{{- end }}
selector:
app: {{ template "influxdb.fullname" . }}
release: "{{ .Release.Name }}"
{{- include "influxdb.selectorLabels" . | nindent 4 }}
@@ -2,11 +2,11 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "influxdb.serviceAccountName" . }}
labels:
{{- include "influxdb.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
name: {{ template "influxdb.serviceAccountName" . }}
labels:
{{ include "influxdb.labels" . | indent 4 }}
{{- end -}}