From 31dc4eeac24b0ecfdaa9ab48aae92f8ca575da27 Mon Sep 17 00:00:00 2001 From: Matthew Dalton Date: Tue, 19 Nov 2019 10:14:37 -0600 Subject: [PATCH 1/7] update setup for annotation customization and reorganize values associated --- .../templates/setup/setup-clusterrole.yaml | 10 ++-- .../setup/setup-clusterrolebinding.yaml | 10 ++-- .../templates/setup/setup-configmap.yaml | 8 +-- .../sumologic/templates/setup/setup-job.yaml | 22 ++++---- .../templates/setup/setup-serviceaccount.yaml | 10 ++-- deploy/helm/sumologic/values.yaml | 53 +++++++++++++------ 6 files changed, 67 insertions(+), 46 deletions(-) diff --git a/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml b/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml index a72f8fad20..deca8e7c8f 100644 --- a/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml @@ -1,12 +1,12 @@ -{{- if .Values.sumologic.setupEnabled }} +{{- if .Values.sumologic.setup }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: {{ template "sumologic.fullname" . }}-setup + {{- if .Values.sumologic.setup.clusterRole.annotations }} 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 }} + {{- end }} labels: app: {{ template "sumologic.labels.app" . }} {{- include "sumologic.labels.common" . | nindent 4 }} @@ -17,4 +17,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..e6f825a5d1 100644 --- a/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml @@ -1,12 +1,12 @@ -{{- if .Values.sumologic.setupEnabled }} +{{- if .Values.sumologic.setup }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: {{ template "sumologic.fullname" . }}-setup + {{- if .Values.sumologic.setup.clusterRoleBinding.annotations }} 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 }} + {{- end }} labels: app: {{ template "sumologic.labels.app" . }} {{- include "sumologic.labels.common" . | nindent 4 }} @@ -19,4 +19,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..072c52cb46 100644 --- a/deploy/helm/sumologic/templates/setup/setup-configmap.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-configmap.yaml @@ -1,12 +1,12 @@ -{{- if .Values.sumologic.setupEnabled }} +{{- if .Values.sumologic.setup }} apiVersion: v1 kind: ConfigMap metadata: name: {{ template "sumologic.fullname" . }}-setup + {{- if .Values.sumologic.setup.configMap.annotations }} 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 }} + {{- end }} 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..29fc4f12ad 100644 --- a/deploy/helm/sumologic/templates/setup/setup-job.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-job.yaml @@ -1,13 +1,13 @@ -{{- if .Values.sumologic.setupEnabled }} +{{- if .Values.sumologic.setup }} apiVersion: batch/v1 kind: Job metadata: name: {{ template "sumologic.fullname" . }}-setup namespace: {{ .Release.Namespace }} + {{- if .Values.sumologic.setup.job.annotations }} 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 }} + {{- end }} labels: app: {{ template "sumologic.labels.app" . }} {{- include "sumologic.labels.common" . | nindent 4 }} @@ -29,17 +29,17 @@ spec: volumeMounts: - name: setup mountPath: /etc/terraform - {{- if .Values.sumologic.envFromSecret }} + {{- if .Values.sumologic.setup.job.envFromSecret }} envFrom: - secretRef: - name: {{ .Values.sumologic.envFromSecret }} + name: {{ .Values.sumologic.setup.job.envFromSecret }} {{ else }} env: - name: SUMOLOGIC_ACCESSID - value: {{ required "A valid .Values.sumologic.accessId entry required!" .Values.sumologic.accessId }} + value: {{ required "A valid .Values.sumologic.accessId entry required!" .Values.sumologic.setup.job.accessId }} - name: SUMOLOGIC_ACCESSKEY - value: {{ required "A valid .Values.sumologic.accessKey entry required!" .Values.sumologic.accessKey }} + value: {{ required "A valid .Values.sumologic.accessKey entry required!" .Values.sumologic.setup.job.accessKey }} - name: SUMOLOGIC_BASE_URL - value: {{ .Values.sumologic.endpoint }} - {{ end }} -{{- end }} + value: {{ .Values.sumologic.setup.job.endpoint }} + {{- end }} +{{- end}} diff --git a/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml b/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml index 20d71ec4d0..9ab6c4ae2e 100644 --- a/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml @@ -1,13 +1,13 @@ -{{- if .Values.sumologic.setupEnabled }} +{{- if .Values.sumologic.setup }} apiVersion: v1 kind: ServiceAccount metadata: name: {{ template "sumologic.fullname" . }}-setup + {{- if .Values.sumologic.setup.serviceAccount.annotations }} 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 }} + {{- end }} 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..34ed829063 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -30,22 +30,43 @@ eventsDeployment: sumologic: ## Setup - - # If enabled, a pre-install hook will create Collector and Sources in Sumo Logic - setupEnabled: true - - # If enabled, accessId and accessKey will be sourced from Secret Name given - # envFromSecret: accessCredentials - - # Sumo access ID - #accessId: "" - - # Sumo access key - #accessKey: "" - - # Sumo API endpoint - # 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: + #envFromSecret: sumo-api-secret + + # Sumo access ID + #accessId: "" + + # Sumo access key + #accessKey: "" + + # Sumo API endpoint + # ref: https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security + #endpoint: "" + 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: "" From e4fe59b1dffb366a9baa66dc89160316be7cdcac Mon Sep 17 00:00:00 2001 From: Matthew Dalton Date: Tue, 19 Nov 2019 10:17:03 -0600 Subject: [PATCH 2/7] syntax fixes --- deploy/helm/sumologic/templates/setup/setup-job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/sumologic/templates/setup/setup-job.yaml b/deploy/helm/sumologic/templates/setup/setup-job.yaml index 29fc4f12ad..d8a53addc8 100644 --- a/deploy/helm/sumologic/templates/setup/setup-job.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-job.yaml @@ -41,5 +41,5 @@ spec: value: {{ required "A valid .Values.sumologic.accessKey entry required!" .Values.sumologic.setup.job.accessKey }} - name: SUMOLOGIC_BASE_URL value: {{ .Values.sumologic.setup.job.endpoint }} - {{- end }} + {{ end }} {{- end}} From e13a932350470a84c028aa47b1db95eb7bb39023 Mon Sep 17 00:00:00 2001 From: Matthew Dalton Date: Tue, 19 Nov 2019 10:17:45 -0600 Subject: [PATCH 3/7] syntax fixes --- deploy/helm/sumologic/templates/setup/setup-job.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/sumologic/templates/setup/setup-job.yaml b/deploy/helm/sumologic/templates/setup/setup-job.yaml index d8a53addc8..4afc05dca8 100644 --- a/deploy/helm/sumologic/templates/setup/setup-job.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-job.yaml @@ -42,4 +42,4 @@ spec: - name: SUMOLOGIC_BASE_URL value: {{ .Values.sumologic.setup.job.endpoint }} {{ end }} -{{- end}} +{{- end }} From 29b53cc48c663d9f275a86bb9b61db9ab217613e Mon Sep 17 00:00:00 2001 From: Matthew Dalton Date: Tue, 19 Nov 2019 15:59:57 -0600 Subject: [PATCH 4/7] revisions to values --- .../templates/setup/setup-clusterrole.yaml | 2 +- .../setup/setup-clusterrolebinding.yaml | 2 +- .../templates/setup/setup-configmap.yaml | 2 +- .../sumologic/templates/setup/setup-job.yaml | 12 +++++----- .../templates/setup/setup-serviceaccount.yaml | 2 +- deploy/helm/sumologic/values.yaml | 23 ++++++++++--------- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml b/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml index deca8e7c8f..8bd8dc3ace 100644 --- a/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml @@ -1,4 +1,4 @@ -{{- if .Values.sumologic.setup }} +{{- if .Values.sumologic.setupEnabled }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml b/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml index e6f825a5d1..945963a8fe 100644 --- a/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml @@ -1,4 +1,4 @@ -{{- if .Values.sumologic.setup }} +{{- if .Values.sumologic.setupEnabled }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: diff --git a/deploy/helm/sumologic/templates/setup/setup-configmap.yaml b/deploy/helm/sumologic/templates/setup/setup-configmap.yaml index 072c52cb46..4a1827d60d 100644 --- a/deploy/helm/sumologic/templates/setup/setup-configmap.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-configmap.yaml @@ -1,4 +1,4 @@ -{{- if .Values.sumologic.setup }} +{{- if .Values.sumologic.setupEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/deploy/helm/sumologic/templates/setup/setup-job.yaml b/deploy/helm/sumologic/templates/setup/setup-job.yaml index 4afc05dca8..692c081097 100644 --- a/deploy/helm/sumologic/templates/setup/setup-job.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-job.yaml @@ -1,4 +1,4 @@ -{{- if .Values.sumologic.setup }} +{{- if .Values.sumologic.setupEnabled }} apiVersion: batch/v1 kind: Job metadata: @@ -29,17 +29,17 @@ spec: volumeMounts: - name: setup mountPath: /etc/terraform - {{- if .Values.sumologic.setup.job.envFromSecret }} + {{- if .Values.sumologic.envFromSecret }} envFrom: - secretRef: - name: {{ .Values.sumologic.setup.job.envFromSecret }} + name: {{ .Values.sumologic.envFromSecret }} {{ else }} env: - name: SUMOLOGIC_ACCESSID - value: {{ required "A valid .Values.sumologic.accessId entry required!" .Values.sumologic.setup.job.accessId }} + value: {{ required "A valid .Values.sumologic.accessId entry required!" .Values.sumologic.accessId }} - name: SUMOLOGIC_ACCESSKEY - value: {{ required "A valid .Values.sumologic.accessKey entry required!" .Values.sumologic.setup.job.accessKey }} + value: {{ required "A valid .Values.sumologic.accessKey entry required!" .Values.sumologic.accessKey }} - name: SUMOLOGIC_BASE_URL - value: {{ .Values.sumologic.setup.job.endpoint }} + value: {{ .Values.sumologic.endpoint }} {{ end }} {{- end }} diff --git a/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml b/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml index 9ab6c4ae2e..145eefbdb3 100644 --- a/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml @@ -1,4 +1,4 @@ -{{- if .Values.sumologic.setup }} +{{- if .Values.sumologic.setupEnabled }} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 34ed829063..b31f459f51 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -30,6 +30,18 @@ eventsDeployment: sumologic: ## Setup + #envFromSecret: sumo-api-secret + + # Sumo access ID + #accessId: "" + + # Sumo access key + #accessKey: "" + + # Sumo API endpoint + # ref: https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security + #endpoint: "" + setupEnabled: setup: clusterRole: annotations: @@ -47,17 +59,6 @@ sumologic: helm.sh/hook-weight: 2 helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded job: - #envFromSecret: sumo-api-secret - - # Sumo access ID - #accessId: "" - - # Sumo access key - #accessKey: "" - - # Sumo API endpoint - # ref: https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security - #endpoint: "" annotations: helm.sh/hook: pre-install helm.sh/hook-weight: 3 From 73ee75296d45c84663d23aed1ef028ad2a8f8c42 Mon Sep 17 00:00:00 2001 From: Matthew Dalton Date: Tue, 19 Nov 2019 16:03:53 -0600 Subject: [PATCH 5/7] reorg --- deploy/helm/sumologic/values.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index b31f459f51..a75b64757a 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -30,18 +30,20 @@ eventsDeployment: sumologic: ## Setup - #envFromSecret: sumo-api-secret + + # If enabled, a pre-install hook will create Collector and Sources in Sumo Logic + setupEnabled: true + + # If enabled, accessId and accessKey will be sourced from Secret Name given + # envFromSecret: sumo-api-secret # Sumo access ID #accessId: "" - # Sumo access key - #accessKey: "" - # Sumo API endpoint # ref: https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security #endpoint: "" - setupEnabled: + setup: clusterRole: annotations: From d8c4427a7d4dfa554699db7da9c7bd80b946afca Mon Sep 17 00:00:00 2001 From: Matthew Dalton Date: Tue, 19 Nov 2019 16:04:52 -0600 Subject: [PATCH 6/7] missed one --- deploy/helm/sumologic/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index a75b64757a..f125592900 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -40,6 +40,9 @@ sumologic: # Sumo access ID #accessId: "" + # Sumo access key + #accessKey: "" + # Sumo API endpoint # ref: https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security #endpoint: "" From 918a3ab233a1644aae80668cee86df63c775714d Mon Sep 17 00:00:00 2001 From: Matthew Dalton Date: Tue, 19 Nov 2019 19:17:28 -0600 Subject: [PATCH 7/7] update templating --- deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml | 2 -- .../sumologic/templates/setup/setup-clusterrolebinding.yaml | 2 -- deploy/helm/sumologic/templates/setup/setup-configmap.yaml | 2 -- deploy/helm/sumologic/templates/setup/setup-job.yaml | 2 -- deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml | 2 -- deploy/helm/sumologic/values.yaml | 2 +- 6 files changed, 1 insertion(+), 11 deletions(-) diff --git a/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml b/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml index 8bd8dc3ace..26fc3246ad 100644 --- a/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml @@ -3,10 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: {{ template "sumologic.fullname" . }}-setup - {{- if .Values.sumologic.setup.clusterRole.annotations }} annotations: {{ toYaml .Values.sumologic.setup.clusterRole.annotations | indent 4 }} - {{- end }} labels: app: {{ template "sumologic.labels.app" . }} {{- include "sumologic.labels.common" . | nindent 4 }} diff --git a/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml b/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml index 945963a8fe..f88574176f 100644 --- a/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml @@ -3,10 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: {{ template "sumologic.fullname" . }}-setup - {{- if .Values.sumologic.setup.clusterRoleBinding.annotations }} annotations: {{ toYaml .Values.sumologic.setup.clusterRoleBinding.annotations | indent 4 }} - {{- end }} labels: app: {{ template "sumologic.labels.app" . }} {{- include "sumologic.labels.common" . | nindent 4 }} diff --git a/deploy/helm/sumologic/templates/setup/setup-configmap.yaml b/deploy/helm/sumologic/templates/setup/setup-configmap.yaml index 4a1827d60d..f7019468e1 100644 --- a/deploy/helm/sumologic/templates/setup/setup-configmap.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-configmap.yaml @@ -3,10 +3,8 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ template "sumologic.fullname" . }}-setup - {{- if .Values.sumologic.setup.configMap.annotations }} annotations: {{ toYaml .Values.sumologic.setup.configMap.annotations | indent 4 }} - {{- end }} 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 692c081097..55997ff8f4 100644 --- a/deploy/helm/sumologic/templates/setup/setup-job.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-job.yaml @@ -4,10 +4,8 @@ kind: Job metadata: name: {{ template "sumologic.fullname" . }}-setup namespace: {{ .Release.Namespace }} - {{- if .Values.sumologic.setup.job.annotations }} annotations: {{ toYaml .Values.sumologic.setup.job.annotations | indent 4 }} - {{- end }} 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 145eefbdb3..1c7b39aebf 100644 --- a/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml @@ -3,10 +3,8 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ template "sumologic.fullname" . }}-setup - {{- if .Values.sumologic.setup.serviceAccount.annotations }} annotations: {{ toYaml .Values.sumologic.setup.serviceAccount.annotations | indent 4 }} - {{- end }} labels: app: {{ template "sumologic.labels.app" . }} {{- include "sumologic.labels.common" . | nindent 4 }} diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index f125592900..cc38bd0389 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -68,7 +68,7 @@ sumologic: helm.sh/hook: pre-install helm.sh/hook-weight: 3 helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded - serviceaccount: + serviceAccount: annotations: helm.sh/hook: pre-install helm.sh/hook-weight: 0