Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always create custom setup configmap #1032

Merged
merged 2 commits into from
Oct 22, 2020
Merged

Always create custom setup configmap #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f6c249
Always create custom setup configmap
Oct 22, 2020
8573985
Generate new 'setup-sumologic.yaml.tmpl'
Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/helm/sumologic/templates/setup/setup-custom-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{{- if .Values.sumologic.setup.additionalFiles }}
apiVersion: v1
kind: ConfigMap
metadata:
Expand All @@ -9,6 +8,7 @@ metadata:
app: {{ template "sumologic.labels.app.setup.configmap-custom" . }}
{{- include "sumologic.labels.common" . | nindent 4 }}
data:
{{- if .Values.sumologic.setup.additionalFiles }}
{{- range $directory, $files := .Values.sumologic.setup.additionalFiles }}
{{- range $filename, $file := $files }}
{{ printf "%s_%s: |-" $directory $filename }}
Expand Down
19 changes: 15 additions & 4 deletions deploy/kubernetes/setup-sumologic.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,21 @@ data:
}


---
# Source: sumologic/templates/setup/setup-custom-configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: collection-sumologic-setup-custom
annotations:
helm.sh/hook: pre-install,pre-upgrade
helm.sh/hook-weight: "2"
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels:
app: collection-sumologic

data:

---
# Source: sumologic/templates/setup/setup-serviceaccount.yaml

Expand Down Expand Up @@ -344,10 +359,6 @@ spec:
securityContext:
runAsUser: 999

---
# Source: sumologic/templates/setup/setup-custom-configmap.yaml


---
# Source: sumologic/templates/setup/setup-scc.yaml

Expand Down
Empty file added tests/terraform_custom/static/empty.input.yaml
View file
Open in desktop
Empty file.
16 changes: 16 additions & 0 deletions tests/terraform_custom/static/empty.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
# Source: sumologic/templates/setup/setup-custom-configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: RELEASE-NAME-sumologic-setup-custom
annotations:
helm.sh/hook: pre-install,pre-upgrade
helm.sh/hook-weight: "2"
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels:
app: RELEASE-NAME-sumologic
chart: "sumologic-%CURRENT_CHART_VERSION%"
release: "RELEASE-NAME"
heritage: "Helm"
data: