diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index 092f25aa..efd907e4 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.51.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 0.72.1 +version: 0.73.1 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/templates/allinone-sa.yaml b/charts/jaeger/templates/allinone-sa.yaml index 599c4767..6e2a536a 100644 --- a/charts/jaeger/templates/allinone-sa.yaml +++ b/charts/jaeger/templates/allinone-sa.yaml @@ -6,4 +6,8 @@ metadata: labels: {{- include "jaeger.labels" . | nindent 4 }} app.kubernetes.io/component: all-in-one + {{- with .Values.allInOne.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} {{- end -}} diff --git a/charts/jaeger/templates/es-index-cleaner-sa.yaml b/charts/jaeger/templates/es-index-cleaner-sa.yaml index 02e2f22c..68b918f3 100644 --- a/charts/jaeger/templates/es-index-cleaner-sa.yaml +++ b/charts/jaeger/templates/es-index-cleaner-sa.yaml @@ -6,5 +6,9 @@ metadata: labels: {{- include "jaeger.labels" . | nindent 4 }} app.kubernetes.io/component: es-index-cleaner + {{- with .Values.esIndexCleaner.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} automountServiceAccountToken: {{ .Values.esIndexCleaner.serviceAccount.automountServiceAccountToken }} {{- end -}} diff --git a/charts/jaeger/templates/es-lookback-sa.yaml b/charts/jaeger/templates/es-lookback-sa.yaml index 1c5140dd..89c4b745 100644 --- a/charts/jaeger/templates/es-lookback-sa.yaml +++ b/charts/jaeger/templates/es-lookback-sa.yaml @@ -6,5 +6,9 @@ metadata: labels: {{- include "jaeger.labels" . | nindent 4 }} app.kubernetes.io/component: es-lookback + {{- with .Values.esLookback.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} automountServiceAccountToken: {{ .Values.esLookback.serviceAccount.automountServiceAccountToken }} {{- end -}} diff --git a/charts/jaeger/templates/hotrod-sa.yaml b/charts/jaeger/templates/hotrod-sa.yaml index 414b25fd..6026edbe 100644 --- a/charts/jaeger/templates/hotrod-sa.yaml +++ b/charts/jaeger/templates/hotrod-sa.yaml @@ -6,5 +6,9 @@ metadata: labels: {{- include "jaeger.labels" . | nindent 4 }} app.kubernetes.io/component: hotrod + {{- with .Values.hotrod.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} automountServiceAccountToken: {{ .Values.hotrod.serviceAccount.automountServiceAccountToken }} {{- end -}} diff --git a/charts/jaeger/templates/ingester-sa.yaml b/charts/jaeger/templates/ingester-sa.yaml index d642ef3e..900e2dd5 100644 --- a/charts/jaeger/templates/ingester-sa.yaml +++ b/charts/jaeger/templates/ingester-sa.yaml @@ -6,5 +6,9 @@ metadata: labels: {{- include "jaeger.labels" . | nindent 4 }} app.kubernetes.io/component: ingester + {{- with .Values.ingester.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} automountServiceAccountToken: {{ .Values.ingester.serviceAccount.automountServiceAccountToken }} {{- end -}} diff --git a/charts/jaeger/templates/spark-sa.yaml b/charts/jaeger/templates/spark-sa.yaml index c694d685..d35eaebc 100644 --- a/charts/jaeger/templates/spark-sa.yaml +++ b/charts/jaeger/templates/spark-sa.yaml @@ -6,5 +6,9 @@ metadata: labels: {{- include "jaeger.labels" . | nindent 4 }} app.kubernetes.io/component: spark + {{- with .Values.spark.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} automountServiceAccountToken: {{ .Values.spark.serviceAccount.automountServiceAccountToken }} {{- end -}} diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml index be4fb4c8..59aba8a0 100644 --- a/charts/jaeger/values.yaml +++ b/charts/jaeger/values.yaml @@ -40,6 +40,8 @@ allInOne: # "param": 1 # } # } + serviceAccount: + annotations: {} service: headless: true collector: @@ -261,6 +263,7 @@ ingester: create: true # Explicitly mounts the API credentials for the Service Account automountServiceAccountToken: false + annotations: {} name: nodeSelector: {} tolerations: [] @@ -702,6 +705,7 @@ spark: # memory: 128Mi serviceAccount: create: true + annotations: {} # Explicitly mounts the API credentials for the Service Account automountServiceAccountToken: false name: @@ -746,6 +750,7 @@ esIndexCleaner: numberOfDays: 7 serviceAccount: create: true + annotations: {} # Explicitly mounts the API credentials for the Service Account automountServiceAccountToken: false name: @@ -841,6 +846,7 @@ esLookback: # memory: 128Mi serviceAccount: create: true + annotations: {} # Explicitly mounts the API credentials for the Service Account automountServiceAccountToken: false name: @@ -917,6 +923,7 @@ hotrod: create: true # Explicitly mounts the API credentials for the Service Account automountServiceAccountToken: false + annotations: {} name: nodeSelector: {} tolerations: []