diff --git a/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml b/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml index a72f8fad20..26fc3246ad 100644 --- a/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml @@ -4,9 +4,7 @@ kind: ClusterRole metadata: name: {{ template "sumologic.fullname" . }}-setup annotations: - "helm.sh/hook": pre-install - "helm.sh/hook-weight": "1" - "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded +{{ toYaml .Values.sumologic.setup.clusterRole.annotations | indent 4 }} labels: app: {{ template "sumologic.labels.app" . }} {{- include "sumologic.labels.common" . | nindent 4 }} @@ -17,4 +15,4 @@ rules: - secrets - namespaces verbs: ["get", "create", "describe", "patch"] -{{- end }} \ No newline at end of file +{{- end }} diff --git a/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml b/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml index 58b093a865..f88574176f 100644 --- a/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml @@ -4,9 +4,7 @@ kind: ClusterRoleBinding metadata: name: {{ template "sumologic.fullname" . }}-setup annotations: - "helm.sh/hook": pre-install - "helm.sh/hook-weight": "2" - "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded +{{ toYaml .Values.sumologic.setup.clusterRoleBinding.annotations | indent 4 }} labels: app: {{ template "sumologic.labels.app" . }} {{- include "sumologic.labels.common" . | nindent 4 }} @@ -19,4 +17,4 @@ subjects: name: {{ template "sumologic.fullname" . }}-setup namespace: {{ .Release.Namespace }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/deploy/helm/sumologic/templates/setup/setup-configmap.yaml b/deploy/helm/sumologic/templates/setup/setup-configmap.yaml index 7048f6c320..f7019468e1 100644 --- a/deploy/helm/sumologic/templates/setup/setup-configmap.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-configmap.yaml @@ -4,9 +4,7 @@ kind: ConfigMap metadata: name: {{ template "sumologic.fullname" . }}-setup annotations: - "helm.sh/hook": pre-install - "helm.sh/hook-weight": "2" - "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded +{{ toYaml .Values.sumologic.setup.configMap.annotations | indent 4 }} labels: app: {{ template "sumologic.labels.app" . }} {{- include "sumologic.labels.common" . | nindent 4 }} diff --git a/deploy/helm/sumologic/templates/setup/setup-job.yaml b/deploy/helm/sumologic/templates/setup/setup-job.yaml index 053c8ff111..55997ff8f4 100644 --- a/deploy/helm/sumologic/templates/setup/setup-job.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-job.yaml @@ -5,9 +5,7 @@ metadata: name: {{ template "sumologic.fullname" . }}-setup namespace: {{ .Release.Namespace }} annotations: - "helm.sh/hook": pre-install - "helm.sh/hook-weight": "3" - "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded +{{ toYaml .Values.sumologic.setup.job.annotations | indent 4 }} labels: app: {{ template "sumologic.labels.app" . }} {{- include "sumologic.labels.common" . | nindent 4 }} diff --git a/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml b/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml index 20d71ec4d0..1c7b39aebf 100644 --- a/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml @@ -4,10 +4,8 @@ kind: ServiceAccount metadata: name: {{ template "sumologic.fullname" . }}-setup annotations: - "helm.sh/hook": pre-install - "helm.sh/hook-weight": "0" - "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded +{{ toYaml .Values.sumologic.setup.serviceAccount.annotations | indent 4 }} labels: app: {{ template "sumologic.labels.app" . }} {{- include "sumologic.labels.common" . | nindent 4 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 916cc634c6..cc38bd0389 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -35,7 +35,7 @@ sumologic: setupEnabled: true # If enabled, accessId and accessKey will be sourced from Secret Name given - # envFromSecret: accessCredentials + # envFromSecret: sumo-api-secret # Sumo access ID #accessId: "" @@ -47,6 +47,33 @@ sumologic: # ref: https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security #endpoint: "" + setup: + clusterRole: + annotations: + helm.sh/hook: pre-install + helm.sh/hook-weight: 1 + helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded + clusterRoleBinding: + annotations: + helm.sh/hook: pre-install + helm.sh/hook-weight: 2 + helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded + configMap: + annotations: + helm.sh/hook: pre-install + helm.sh/hook-weight: 2 + helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded + job: + annotations: + helm.sh/hook: pre-install + helm.sh/hook-weight: 3 + helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded + serviceAccount: + annotations: + helm.sh/hook: pre-install + helm.sh/hook-weight: 0 + helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded + # Collector name #collectorName: ""