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.

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

[jaeger] Add security context to deployment charts in jaeger #37

Merged
merged 2 commits into from
Jan 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 charts/jaeger/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
appVersion: 1.16.0
description: A Jaeger Helm chart for Kubernetes
name: jaeger
version: 0.19.0
version: 0.19.1
keywords:
- jaeger
- opentracing
Expand Down
2 changes: 2 additions & 0 deletions charts/jaeger/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ The following table lists the configurable parameters of the Jaeger chart and th
| `<component>.nodeSelector` | Node selector | {} |
| `<component>.tolerations` | Node tolerations | [] |
| `<component.affinity` | Affinity | {} |
| `<component>.podSecurityContext` | Pod security context | {} |
| `<component>.securityContext` | Container security context | {} |
| `agent.annotations` | Annotations for Agent | `nil` |
| `agent.cmdlineParams` |Additional command line parameters| `nil` |
| `agent.dnsPolicy` | Configure DNS policy for agents | `ClusterFirst` |
Expand Down
4 changes: 4 additions & 0 deletions charts/jaeger/templates/agent-ds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,17 @@ spec:
{{ toYaml .Values.agent.podLabels | indent 8 }}
{{- end }}
spec:
securityContext:
{{ toYaml .Values.agent.podSecurityContext | indent 8 }}
{{- if .Values.agent.useHostNetwork }}
hostNetwork: true
{{- end }}
dnsPolicy: {{ .Values.agent.dnsPolicy }}
serviceAccountName: {{ template "jaeger.agent.serviceAccountName" . }}
containers:
- name: {{ template "jaeger.agent.name" . }}
securityContext:
{{ toYaml .Values.agent.securityContext | indent 10 }}
image: {{ .Values.agent.image }}:{{ .Values.tag }}
imagePullPolicy: {{ .Values.agent.pullPolicy }}
env:
Expand Down
4 changes: 4 additions & 0 deletions charts/jaeger/templates/collector-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,13 @@ spec:
{{ toYaml .Values.collector.podLabels | indent 8 }}
{{- end }}
spec:
securityContext:
{{ toYaml .Values.collector.podSecurityContext | indent 8 }}
serviceAccountName: {{ template "jaeger.collector.serviceAccountName" . }}
containers:
- name: {{ template "jaeger.collector.name" . }}
securityContext:
{{ toYaml .Values.collector.securityContext | indent 10 }}
image: {{ .Values.collector.image }}:{{ .Values.tag }}
imagePullPolicy: {{ .Values.collector.pullPolicy }}
env:
Expand Down
4 changes: 4 additions & 0 deletions charts/jaeger/templates/hotrod-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@ spec:
{{- include "jaeger.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: hotrod
spec:
securityContext:
{{ toYaml .Values.hotrod.podSecurityContext | indent 8 }}
serviceAccountName: {{ template "jaeger.hotrod.serviceAccountName" . }}
containers:
- name: {{ include "jaeger.fullname" . }}-hotrod
securityContext:
{{ toYaml .Values.hotrod.securityContext | indent 12 }}
image: {{ .Values.hotrod.image.repository }}:{{ .Values.tag }}
imagePullPolicy: {{ .Values.hotrod.image.pullPolicy }}
env:
Expand Down
4 changes: 4 additions & 0 deletions charts/jaeger/templates/ingester-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ spec:
{{ toYaml .Values.ingester.podLabels | indent 8 }}
{{- end }}
spec:
securityContext:
{{ toYaml .Values.ingester.podSecurityContext | indent 8 }}
nodeSelector:
{{ toYaml .Values.ingester.nodeSelector | indent 8 }}
{{- if .Values.ingester.tolerations }}
Expand All @@ -41,6 +43,8 @@ spec:
{{- end }}
containers:
- name: {{ include "jaeger.fullname" . }}-ingester
securityContext:
{{ toYaml .Values.ingester.securityContext | indent 10 }}
image: {{ .Values.ingester.image }}:{{ .Values.tag }}
imagePullPolicy: {{ .Values.ingester.pullPolicy }}
env:
Expand Down
6 changes: 6 additions & 0 deletions charts/jaeger/templates/query-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,13 @@ spec:
{{ toYaml .Values.query.podLabels | indent 8 }}
{{- end }}
spec:
securityContext:
{{ toYaml .Values.query.podSecurityContext | indent 8 }}
serviceAccountName: {{ template "jaeger.query.serviceAccountName" . }}
containers:
- name: {{ template "jaeger.query.name" . }}
securityContext:
{{ toYaml .Values.query.securityContext | indent 10 }}
image: {{ .Values.query.image }}:{{ .Values.tag }}
imagePullPolicy: {{ .Values.query.pullPolicy }}
env:
Expand Down Expand Up @@ -134,6 +138,8 @@ spec:
port: admin
{{- if .Values.query.agentSidecar.enabled }}
- name: {{ template "jaeger.agent.name" . }}-sidecar
securityContext:
{{ toYaml .Values.query.securityContext | indent 10 }}
image: {{ .Values.agent.image }}:{{ .Values.tag }}
imagePullPolicy: {{ .Values.agent.pullPolicy }}
env:
Expand Down
10 changes: 10 additions & 0 deletions charts/jaeger/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ elasticsearch: {}

ingester:
enabled: false
podSecurityContext: {}
securityContext: {}
annotations: {}
image: jaegertracing/jaeger-ingester
pullPolicy: IfNotPresent
Expand Down Expand Up @@ -138,6 +140,8 @@ ingester:
extraConfigmapMounts: []

agent:
podSecurityContext: {}
securityContext: {}
enabled: true
annotations: {}
image: jaegertracing/jaeger-agent
Expand Down Expand Up @@ -191,6 +195,8 @@ agent:
dnsPolicy: ClusterFirst

collector:
podSecurityContext: {}
securityContext: {}
enabled: true
annotations: {}
image: jaegertracing/jaeger-collector
Expand Down Expand Up @@ -279,6 +285,8 @@ collector:

query:
enabled: true
podSecurityContext: {}
securityContext: {}
agentSidecar:
enabled: true
annotations: {}
Expand Down Expand Up @@ -360,6 +368,8 @@ spark:

hotrod:
enabled: false
podSecurityContext: {}
securityContext: {}
replicaCount: 1
image:
repository: jaegertracing/example-hotrod
Expand Down