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.

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

Inject Pod and Container Security Context #137

Merged
merged 2 commits into from
Sep 24, 2024
Merged

Inject Pod and Container Security Context #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d68531e
Inject Pod and Container Security Context
abeytom07 Sep 23, 2024
54ad868
remove kafka-topic-creator sub chart
ravisingal Sep 24, 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
6 changes: 0 additions & 6 deletions helm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,3 @@ version: 0.1.0
# This is the appVersion which will correspond to build version tag. The "helm package" command will take care of setting
# this.
appVersion: 0.1.0

dependencies:
- name: kafka-topic-creator
condition: kafka-topic-creator.enabled
repository: "https://storage.googleapis.com/hypertrace-helm-charts"
version: 0.2.x
2 changes: 1 addition & 1 deletion helm/templates/hypertrace-collector/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ spec:
port: 13133
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.securityContext }}
{{- with .Values.containerSecurityContext }}
securityContext:
{{- toYaml . | nindent 12 }}
{{- end }}
2 changes: 1 addition & 1 deletion helm/templates/hypertrace-metrics-collector/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ spec:
port: 13133
resources:
{{- toYaml .Values.metrics.resources | nindent 12 }}
{{- with .Values.metrics.securityContext }}
{{- with .Values.containerSecurityContext }}
securityContext:
{{- toYaml . | nindent 12 }}
{{- end }}
Expand Down
42 changes: 5 additions & 37 deletions helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,18 @@ podAnnotations: {}
podSecurityContext:
runAsUser: 65532
fsGroup: 65532
runAsNonRoot: true
fsGroupChangePolicy: "OnRootMismatch"
seccompProfile:
type: RuntimeDefault

securityContext:
containerSecurityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
add:
- NET_BIND_SERVICE
runAsNonRoot: true
seccompProfile:
type: RuntimeDefault

affinity: {}

Expand Down Expand Up @@ -211,21 +212,6 @@ metrics:

podAnnotations: {}

podSecurityContext:
runAsUser: 65532
fsGroup: 65532

securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
add:
- NET_BIND_SERVICE
runAsNonRoot: true
seccompProfile:
type: RuntimeDefault

affinity: {}

hostNetwork: false
Expand Down Expand Up @@ -383,21 +369,3 @@ configMap:
receivers: [otlp]
processors: [filter/metrics, hypertrace_metrics_remover, batch, hypertrace_metrics_resource_attrs_to_attrs]
exporters: [prometheus]

kafka-topic-creator:
enabled: true
jobName: jaeger-spans-kafka-topic-creator
helmHook: pre-install,pre-upgrade
kafka:
topics:
jaeger-spans:
replicationFactor: 1
partitions: 8
configs:
retention.bytes: 4294967296
retention.ms: 86400000
zookeeper:
address: zookeeper:2181
imagePullSecrets: []
podAnnotations:
sidecar.istio.io/inject: "false"
Loading