removed .Values.eventReporter.enabled condition

This commit is contained in:
Oleksandr Saulyak 2024-08-15 13:57:16 +03:00 committed by GitHub
parent 8e6ffa5db3
commit 1db4789945
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 6 additions and 20 deletions

View file

@ -14,8 +14,4 @@ metadata:
{{- end }} {{- end }}
data: data:
{{- include "argo-cd.config.cm" . | trim | nindent 2 }} {{- include "argo-cd.config.cm" . | trim | nindent 2 }}
{{- if and .Values.eventReporter.enabled .Values.eventReporter.version }}
codefresh.reporterVersion: {{ .Values.eventReporter.version | quote }}
{{- end }}
{{- end }} {{- end }}

View file

@ -1,4 +1,3 @@
{{- 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
@ -23,4 +22,3 @@ rules:
- '*' - '*'
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }}

View file

@ -1,4 +1,3 @@
{{- 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
@ -16,4 +15,3 @@ subjects:
name: {{ include "argo-cd.eventReporterServiceAccountName" . }} name: {{ include "argo-cd.eventReporterServiceAccountName" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
{{- end }} {{- end }}
{{- end }}

View file

@ -1,4 +1,4 @@
{{- if and .Values.eventReporter.enabled .Values.eventReporter.metrics.enabled }} {{- if and .Values.eventReporter.metrics.enabled }}
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:

View file

@ -1,4 +1,4 @@
{{- if and .Values.eventReporter.enabled .Values.global.networkPolicy.create }} {{- if and .Values.global.networkPolicy.create }}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
kind: NetworkPolicy kind: NetworkPolicy
metadata: metadata:

View file

@ -1,4 +1,4 @@
{{- if and .Values.eventReporter.enabled .Values.eventReporter.pdb.enabled }} {{- if and .Values.eventReporter.pdb.enabled }}
apiVersion: policy/v1 apiVersion: policy/v1
kind: PodDisruptionBudget kind: PodDisruptionBudget
metadata: metadata:

View file

@ -1,4 +1,4 @@
{{- if and .Values.eventReporter.enabled .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.rules.enabled }} {{- if and .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:

View file

@ -1,4 +1,3 @@
{{- if .Values.eventReporter.enabled }}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
@ -41,4 +40,3 @@ rules:
verbs: verbs:
- create - create
- list - list
{{- end }}

View file

@ -1,4 +1,3 @@
{{- if .Values.eventReporter.enabled }}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
@ -14,4 +13,3 @@ subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ template "argo-cd.eventReporterServiceAccountName" . }} name: {{ template "argo-cd.eventReporterServiceAccountName" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
{{- end }}

View file

@ -1,4 +1,4 @@
{{- if and .Values.eventReporter.enabled .Values.eventReporter.serviceAccount.create }} {{- if and .Values.eventReporter.serviceAccount.create }}
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
automountServiceAccountToken: {{ .Values.eventReporter.serviceAccount.automountServiceAccountToken }} automountServiceAccountToken: {{ .Values.eventReporter.serviceAccount.automountServiceAccountToken }}

View file

@ -1,4 +1,4 @@
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.eventReporter.enabled .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.serviceMonitor.enabled }} {{- if and (.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:

View file

@ -1,4 +1,3 @@
{{- if .Values.eventReporter.enabled }}
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
@ -307,4 +306,3 @@ spec:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
dnsPolicy: {{ .Values.eventReporter.dnsPolicy }} dnsPolicy: {{ .Values.eventReporter.dnsPolicy }}
{{- end }}