Skip to content

chore: add common labels and annotations to pods #51

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

Merged
ravisingal merged 3 commits into from
Sep 27, 2024
Merged

chore: add common labels and annotations to pods #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a16093
chore: add common labels and annotations to pods
ravisingal Sep 26, 2024
3423d45
update prometheusrule and servicemonitor
ravisingal Sep 26, 2024
9099120
update trivy ignore file
ravisingal Sep 27, 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
2 changes: 2 additions & 0 deletions .trivyignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# com.google.protobuf:protobuf-java
CVE-2024-7254 exp:2024-10-31
4 changes: 3 additions & 1 deletion helm/templates/prometheusrules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.prometheusrule.enabled ) }}
{{- if .Values.prometheusrule.enabled }}
{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" }}
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
Expand Down Expand Up @@ -92,3 +93,4 @@ spec:
summary: "One or more Kafka containers restarted too often"
message: "One or more Kafka containers were restarted too often within the last 5 minutes"
{{- end }}
{{- end }}
6 changes: 5 additions & 1 deletion helm/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.servicemonitor.enabled ) ( .Values.prometheus.jmx.enabled ) }}
{{- if .Values.servicemonitor.enabled }}
{{- if .Values.prometheus.jmx.enabled }}
{{- if .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" }}
---
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
Expand Down Expand Up @@ -32,3 +34,5 @@ spec:
matchNames:
- {{ .Release.Namespace }}
{{- end }}
{{- end }}
{{- end }}
8 changes: 4 additions & 4 deletions helm/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ spec:
labels:
app: {{ include "kafka.name" . }}
release: {{ .Release.Name }}
{{- with .Values.podLabels }}
{{- with merge .Values.podLabels .Values.commonPodLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.podAnnotations }}
{{- end }}
{{- with merge .Values.podAnnotations .Values.commonPodAnnotations }}
annotations:
{{- toYaml .Values.podAnnotations | nindent 8 }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
serviceAccountName: {{ template "kafka.serviceAccountName" . }}
Expand Down
4 changes: 4 additions & 0 deletions helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ podLabels: {}

podAnnotations: {}

commonPodLabels: {}

commonPodAnnotations: {}

serviceAccount:
create: true
name: ""
Expand Down