From 1dca63981ebfdfc452fe7015d9d06cf38c7d4e41 Mon Sep 17 00:00:00 2001 From: Reddysekhar Gaduputi Date: Wed, 26 Jun 2024 15:15:29 +0530 Subject: [PATCH] [jaeger] add new options, improvements into allInOne (#586) * [jaeger] allInOne add option automountServiceAccountToken for serviceaccount Signed-off-by: Reddysekhar Gaduputi * [jaeger] allInOne add affinity support Signed-off-by: Reddysekhar Gaduputi * [jaeger] allInOne add topologySpreadConstraints support Signed-off-by: Reddysekhar Gaduputi * [jaeger] allInOne add podSecurityContext and containerSecurityContext support Signed-off-by: Reddysekhar Gaduputi --------- Signed-off-by: Reddysekhar Gaduputi --- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/templates/allinone-deploy.yaml | 14 +++++++++++--- charts/jaeger/templates/allinone-sa.yaml | 1 + charts/jaeger/values.yaml | 8 ++++++++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index d26d4fe6..89e14260 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.0.10 +version: 3.1.0 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/templates/allinone-deploy.yaml b/charts/jaeger/templates/allinone-deploy.yaml index 87788207..71bc2ffd 100644 --- a/charts/jaeger/templates/allinone-deploy.yaml +++ b/charts/jaeger/templates/allinone-deploy.yaml @@ -52,6 +52,8 @@ spec: {{- with .Values.allInOne.envFrom }} envFrom: {{- toYaml . | nindent 12 }} {{- end }} + securityContext: + {{- toYaml .Values.allInOne.securityContext | nindent 12 }} image: {{ include "allInOne.image" . }} imagePullPolicy: {{ .Values.allInOne.image.pullPolicy }} name: jaeger @@ -118,9 +120,7 @@ spec: readOnly: {{ .readOnly }} {{- end }} securityContext: - runAsUser: 10001 - runAsGroup: 10001 - fsGroup: 10001 + {{- toYaml .Values.allInOne.podSecurityContext | nindent 8 }} serviceAccountName: {{ template "jaeger.fullname" . }} volumes: {{- if not .Values.storage.badger.ephemeral }} @@ -138,6 +138,14 @@ spec: secret: secretName: {{ .secretName }} {{- end }} + {{- with .Values.allInOne.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.allInOne.topologySpreadConstraints }} + topologySpreadConstraints: + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.allInOne.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/jaeger/templates/allinone-sa.yaml b/charts/jaeger/templates/allinone-sa.yaml index 6e2a536a..a0fbb5a0 100644 --- a/charts/jaeger/templates/allinone-sa.yaml +++ b/charts/jaeger/templates/allinone-sa.yaml @@ -10,4 +10,5 @@ metadata: annotations: {{- toYaml . | nindent 4 }} {{- end }} +automountServiceAccountToken: {{ .Values.allInOne.serviceAccount.automountServiceAccountToken }} {{- end -}} diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml index 778ba1dd..627df4b6 100644 --- a/charts/jaeger/values.yaml +++ b/charts/jaeger/values.yaml @@ -49,6 +49,7 @@ allInOne: # } serviceAccount: annotations: {} + automountServiceAccountToken: true service: headless: true collector: @@ -86,6 +87,13 @@ allInOne: # cpu: 256m # memory: 128Mi nodeSelector: {} + affinity: {} + topologySpreadContraints: [] + podSecurityContext: + runAsUser: 10001 + runAsGroup: 10001 + fsGroup: 10001 + securityContext: {} storage: # allowed values (cassandra, elasticsearch, grpc-plugin, badger, memory)