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

feat: Add labels to setup Pods for easy logs collection #3817

Merged
merged 8 commits into from
Aug 7, 2024
Merged

feat: Add labels to setup Pods for easy logs collection #3817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
802a1bf
Add labels to setup Pods for easy logs collection
harshshahsumo Jul 30, 2024
092734a
Addressing comments
harshshahsumo Jul 31, 2024
860bf3f
remove unwanted line
harshshahsumo Jul 31, 2024
23639b1
Addressing reviews and fixing bugs
harshshahsumo Aug 1, 2024
fde5ca3
Fixing name and indent
harshshahsumo Aug 5, 2024
651d413
Fix test
harshshahsumo Aug 6, 2024
a0c1667
Removing the extra space
harshshahsumo Aug 7, 2024
9cdec2d
Changed events to setup
harshshahsumo Aug 7, 2024
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
4 changes: 4 additions & 0 deletions deploy/helm/sumologic/templates/_helpers/_common.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- template "sumologic.labels.app" . }}
{{- end -}}

{{- define "sumologic.labels.app.setup.pods" -}}
sumologic.com/app: setup
{{- end -}}

{{- define "sumologic.labels.app.setup.job" -}}
{{- template "sumologic.labels.app.setup" . }}
{{- end -}}
Expand Down
2 changes: 2 additions & 0 deletions deploy/helm/sumologic/templates/setup/job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ metadata:
labels:
app: {{ template "sumologic.labels.app.setup.job" . }}
{{- include "sumologic.labels.common" . | nindent 4 }}
{{- include "sumologic.labels.app.setup.pods" . | nindent 4 }}
spec:
ttlSecondsAfterFinished: {{ .Values.sumologic.setup.job.ttlSecondsAfterFinished }}
template:
Expand All @@ -27,6 +28,7 @@ spec:
{{ toYaml .Values.sumologic.setup.job.podAnnotations | indent 8 }}
{{- end }}
labels:
{{- include "sumologic.labels.app.setup.pods" . | nindent 8 }}
{{- if .Values.sumologic.podLabels }}
{{ toYaml .Values.sumologic.podLabels | indent 8 }}
{{- end }}
Expand Down
2 changes: 2 additions & 0 deletions tests/helm/testdata/goldenfile/setup/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ metadata:
chart: "sumologic-%CURRENT_CHART_VERSION%"
release: "RELEASE-NAME"
heritage: "Helm"
sumologic.com/app: "setup"
spec:
ttlSecondsAfterFinished: 120
template:
metadata:
annotations:
labels:
sumologic.com/app: "setup"
spec:
restartPolicy: OnFailure
serviceAccountName: RELEASE-NAME-sumologic-setup
Expand Down
2 changes: 2 additions & 0 deletions tests/helm/testdata/goldenfile/setup/monitors_with_email_notifications.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ metadata:
chart: "sumologic-%CURRENT_CHART_VERSION%"
release: "RELEASE-NAME"
heritage: "Helm"
sumologic.com/app: "setup"
spec:
ttlSecondsAfterFinished: 120
template:
metadata:
annotations:
labels:
sumologic.com/app: "setup"
spec:
restartPolicy: OnFailure
serviceAccountName: RELEASE-NAME-sumologic-setup
Expand Down
2 changes: 2 additions & 0 deletions tests/helm/testdata/goldenfile/setup/monitors_with_single_email.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ metadata:
chart: "sumologic-%CURRENT_CHART_VERSION%"
release: "RELEASE-NAME"
heritage: "Helm"
sumologic.com/app: "setup"
spec:
ttlSecondsAfterFinished: 120
template:
metadata:
annotations:
labels:
sumologic.com/app: "setup"
spec:
restartPolicy: OnFailure
serviceAccountName: RELEASE-NAME-sumologic-setup
Expand Down
2 changes: 2 additions & 0 deletions tests/helm/testdata/goldenfile/setup/sumologic-mock-no-secret.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ metadata:
chart: "sumologic-%CURRENT_CHART_VERSION%"
release: "RELEASE-NAME"
heritage: "Helm"
sumologic.com/app: "setup"
spec:
ttlSecondsAfterFinished: 120
template:
metadata:
annotations:
labels:
sumologic.com/app: "setup"
spec:
restartPolicy: OnFailure
serviceAccountName: RELEASE-NAME-sumologic-setup
Expand Down
2 changes: 2 additions & 0 deletions tests/helm/testdata/goldenfile/setup/sumologic-mock.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ metadata:
chart: "sumologic-%CURRENT_CHART_VERSION%"
release: "RELEASE-NAME"
heritage: "Helm"
sumologic.com/app: "setup"
spec:
ttlSecondsAfterFinished: 120
template:
metadata:
annotations:
labels:
sumologic.com/app: "setup"
spec:
restartPolicy: OnFailure
serviceAccountName: RELEASE-NAME-sumologic-setup
Expand Down
Loading