Commit 12ae9f17 authored by Naseem's avatar Naseem Committed by GitHub

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

* influxdb-fix-labels Signed-off-by: 's avatarNaseem <naseem@transit.app> * Fix labels Signed-off-by: 's avatarNaseem <naseem@transit.app>
parent b1b0fd0c
apiVersion: v1 apiVersion: v1
name: influxdb name: influxdb
version: 4.0.0 version: 4.0.1
appVersion: 1.7.6 appVersion: 1.7.6
description: Scalable datastore for metrics, events, and real-time analytics. description: Scalable datastore for metrics, events, and real-time analytics.
keywords: keywords:
......
...@@ -16,8 +16,7 @@ spec: ...@@ -16,8 +16,7 @@ spec:
template: template:
metadata: metadata:
labels: labels:
app: {{ template "influxdb.fullname" . }} {{- include "influxdb.selectorLabels" . | nindent 12 }}
release: "{{ .Release.Name }}"
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
volumes: volumes:
......
...@@ -29,6 +29,7 @@ spec: ...@@ -29,6 +29,7 @@ spec:
- name: {{ . }} - name: {{ . }}
{{- end}} {{- end}}
{{- end }} {{- end }}
serviceAccountName: {{ include "influxdb.serviceAccountName" . }}
containers: containers:
- name: "{{ include "influxdb.fullname" . }}-meta" - name: "{{ include "influxdb.fullname" . }}-meta"
image: "{{ .Values.image.repository }}:{{ .Values.enterprise.meta.image.tag }}" image: "{{ .Values.image.repository }}:{{ .Values.enterprise.meta.image.tag }}"
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: {{ include "caca.fullname" . }}-set-auth name: {{ include "influxdb.fullname" . }}-set-auth
labels: labels:
{{- include "caca.labels" . | nindent 4 }} {{- include "influxdb.labels" . | nindent 4 }}
annotations: annotations:
"helm.sh/hook": post-install "helm.sh/hook": post-install
"helm.sh/hook-delete-policy": hook-succeeded "helm.sh/hook-delete-policy": hook-succeeded
...@@ -13,8 +13,7 @@ spec: ...@@ -13,8 +13,7 @@ spec:
template: template:
metadata: metadata:
labels: labels:
app: {{ template "influxdb.fullname" . }} {{- include "influxdb.selectorLabels" . | nindent 8 }}
release: "{{ .Release.Name }}"
spec: spec:
containers: containers:
- name: {{ template "influxdb.fullname" . }}-set-auth - name: {{ template "influxdb.fullname" . }}-set-auth
......
...@@ -47,5 +47,4 @@ spec: ...@@ -47,5 +47,4 @@ spec:
targetPort: {{ .Values.config.rpc.bind_address }} targetPort: {{ .Values.config.rpc.bind_address }}
{{- end }} {{- end }}
selector: selector:
app: {{ template "influxdb.fullname" . }} {{- include "influxdb.selectorLabels" . | nindent 4 }}
release: "{{ .Release.Name }}"
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: {{ include "influxdb.serviceAccountName" . }}
labels:
{{- include "influxdb.labels" . | nindent 4 }}
{{- with .Values.serviceAccount.annotations }} {{- with .Values.serviceAccount.annotations }}
annotations: annotations:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
name: {{ template "influxdb.serviceAccountName" . }}
labels:
{{ include "influxdb.labels" . | indent 4 }}
{{- end -}} {{- end -}}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment