Skip to content

add common labels, annotation and security context to pods #243

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
merged 3 commits into from
Sep 27, 2024
Merged

add common labels, annotation and security context to pods #243

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
1b5a9df
add common labels, annotation and security context to pods
ravisingal Sep 27, 2024
54c7824
update gradle lock files
ravisingal Sep 27, 2024
972ceaf
Merge branch 'main' into common-labels-annotations
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: 1 addition & 1 deletion helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ version: 0.1.0
dependencies:
- name: config-bootstrapper
repository: "https://storage.googleapis.com/hypertrace-helm-charts"
version: 0.2.44
version: 0.2.47
14 changes: 9 additions & 5 deletions helm/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ spec:
metadata:
labels:
release: {{ .Release.Name }}
{{- with .Values.podLabels }}
{{- with merge .Values.podLabels .Values.commonPodLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
prometheus.io/scrape: "true"
prometheus.io/port: "{{ .Values.containerHealthProbePort }}"
{{- with .Values.podAnnotations }}
{{- with merge .Values.podAnnotations .Values.commonPodAnnotations }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
Expand Down Expand Up @@ -59,7 +59,7 @@ spec:
topologySpreadConstraints:
{{- toYaml . | nindent 8}}
{{- end }}
{{- with .Values.securityContext }}
{{- with .Values.podSecurityContext }}
securityContext:
{{- toYaml . | nindent 8 }}
{{- end }}
Expand Down Expand Up @@ -115,4 +115,8 @@ spec:
port: {{ .Values.containerHealthProbePort }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.containerSecurityContext }}
securityContext:
{{- toYaml . | nindent 12 }}
{{- end -}}
{{- end }}
22 changes: 14 additions & 8 deletions helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ image:
pullPolicy: IfNotPresent
tagOverride: ""

imagePullSecrets: { }
imagePullSecrets: {}

containerPort: 9012
containerHealthProbePort: 9013
Expand All @@ -21,15 +21,21 @@ service:
type: ClusterIP
port: 9012

nodeLabels: { }
nodeLabels: {}

tolerations: [ ]
tolerations: []

affinity: { }
affinity: {}

topologySpreadConstraints: [ ]
topologySpreadConstraints: []

securityContext: { }
podSecurityContext: {}

containerSecurityContext: {}

commonPodLabels: {}

commonPodAnnotations: {}

javaOpts: "-XX:InitialRAMPercentage=50.0 -XX:MaxRAMPercentage=75.0 -XX:MaxDirectMemorySize=128M -XX:+ExitOnOutOfMemoryError"

Expand All @@ -56,7 +62,7 @@ deploymentLabels:
podLabels:
app: attribute-service

podAnnotations: { }
podAnnotations: {}

deploymentSelectorMatchLabels:
app: attribute-service
Expand Down Expand Up @@ -93,7 +99,7 @@ logConfig:
config-bootstrapper:
job:
prefix: attribute
configurationCommands: { }
configurationCommands: {}

hpa:
enabled: false
Expand Down
Loading