Revert "removed .Values.eventReporter.enabled condition"
This reverts commit 1db4789945
.
This commit is contained in:
parent
4f5622b011
commit
867d938599
12 changed files with 17 additions and 6 deletions
|
@ -1,3 +1,4 @@
|
||||||
|
{{- if .Values.eventReporter.enabled }}
|
||||||
{{- $config := .Values.eventReporter.clusterAdminAccess | default dict -}}
|
{{- $config := .Values.eventReporter.clusterAdminAccess | default dict -}}
|
||||||
{{- if hasKey $config "enabled" | ternary $config.enabled .Values.createClusterRoles }}
|
{{- if hasKey $config "enabled" | ternary $config.enabled .Values.createClusterRoles }}
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
@ -22,3 +23,4 @@ rules:
|
||||||
- '*'
|
- '*'
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
{{- if .Values.eventReporter.enabled }}
|
||||||
{{- $config := .Values.eventReporter.clusterAdminAccess | default dict -}}
|
{{- $config := .Values.eventReporter.clusterAdminAccess | default dict -}}
|
||||||
{{- if hasKey $config "enabled" | ternary $config.enabled .Values.createClusterRoles }}
|
{{- if hasKey $config "enabled" | ternary $config.enabled .Values.createClusterRoles }}
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
@ -15,3 +16,4 @@ subjects:
|
||||||
name: {{ include "argo-cd.eventReporterServiceAccountName" . }}
|
name: {{ include "argo-cd.eventReporterServiceAccountName" . }}
|
||||||
namespace: {{ .Release.Namespace }}
|
namespace: {{ .Release.Namespace }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{{- if .Values.eventReporter.metrics.enabled }}
|
{{- if and .Values.eventReporter.enabled .Values.eventReporter.metrics.enabled }}
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{{- if .Values.global.networkPolicy.create }}
|
{{- if and .Values.eventReporter.enabled .Values.global.networkPolicy.create }}
|
||||||
apiVersion: networking.k8s.io/v1
|
apiVersion: networking.k8s.io/v1
|
||||||
kind: NetworkPolicy
|
kind: NetworkPolicy
|
||||||
metadata:
|
metadata:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{{- if .Values.eventReporter.pdb.enabled }}
|
{{- if and .Values.eventReporter.enabled .Values.eventReporter.pdb.enabled }}
|
||||||
apiVersion: policy/v1
|
apiVersion: policy/v1
|
||||||
kind: PodDisruptionBudget
|
kind: PodDisruptionBudget
|
||||||
metadata:
|
metadata:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{{- if and .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.rules.enabled }}
|
{{- if and .Values.eventReporter.enabled .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.rules.enabled }}
|
||||||
apiVersion: monitoring.coreos.com/v1
|
apiVersion: monitoring.coreos.com/v1
|
||||||
kind: PrometheusRule
|
kind: PrometheusRule
|
||||||
metadata:
|
metadata:
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
{{- if .Values.eventReporter.enabled }}
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: Role
|
kind: Role
|
||||||
metadata:
|
metadata:
|
||||||
|
@ -40,3 +41,4 @@ rules:
|
||||||
verbs:
|
verbs:
|
||||||
- create
|
- create
|
||||||
- list
|
- list
|
||||||
|
{{- end }}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
{{- if .Values.eventReporter.enabled }}
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: RoleBinding
|
kind: RoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
|
@ -13,3 +14,4 @@ subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: {{ template "argo-cd.eventReporterServiceAccountName" . }}
|
name: {{ template "argo-cd.eventReporterServiceAccountName" . }}
|
||||||
namespace: {{ .Release.Namespace }}
|
namespace: {{ .Release.Namespace }}
|
||||||
|
{{- end }}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{{- if .Values.eventReporter.serviceAccount.create }}
|
{{- if and .Values.eventReporter.enabled .Values.eventReporter.serviceAccount.create }}
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
automountServiceAccountToken: {{ .Values.eventReporter.serviceAccount.automountServiceAccountToken }}
|
automountServiceAccountToken: {{ .Values.eventReporter.serviceAccount.automountServiceAccountToken }}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.serviceMonitor.enabled }}
|
{{- if and .Values.eventReporter.enabled (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.serviceMonitor.enabled }}
|
||||||
apiVersion: monitoring.coreos.com/v1
|
apiVersion: monitoring.coreos.com/v1
|
||||||
kind: ServiceMonitor
|
kind: ServiceMonitor
|
||||||
metadata:
|
metadata:
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
{{- if .Values.eventReporter.enabled }}
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: StatefulSet
|
kind: StatefulSet
|
||||||
metadata:
|
metadata:
|
||||||
|
@ -322,3 +323,4 @@ spec:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
dnsPolicy: {{ .Values.eventReporter.dnsPolicy }}
|
dnsPolicy: {{ .Values.eventReporter.dnsPolicy }}
|
||||||
|
{{- end }}
|
||||||
|
|
|
@ -3755,6 +3755,7 @@ notifications:
|
||||||
|
|
||||||
eventReporter:
|
eventReporter:
|
||||||
name: event-reporter
|
name: event-reporter
|
||||||
|
enabled: true
|
||||||
## Amount of replicas for event reporting sharding
|
## Amount of replicas for event reporting sharding
|
||||||
replicas: 3
|
replicas: 3
|
||||||
## Event reporter Pod Disruption Budget
|
## Event reporter Pod Disruption Budget
|
||||||
|
|
Loading…
Reference in a new issue