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

Jump to bottom

add shieldGuard changes #1287

Merged
merged 2 commits into from
Jul 10, 2024
Merged

add shieldGuard changes #1287

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
d77dfc7
add shieldGuard changes
Jul 9, 2024
f1165ca
update trivyignore
Jul 9, 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
1 change: 1 addition & 0 deletions .trivyignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ CVE-2024-24783
CVE-2024-24784
CVE-2024-24785
CVE-2024-24790
CVE-2024-24791

# go high
CVE-2024-24789
6 changes: 6 additions & 0 deletions charts/azuremonitor-containers/templates/ama-logs-daemonset-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ spec:
imagePullPolicy: IfNotPresent
resources:
{{ toYaml .Values.amalogs.resources.daemonsetwindows | indent 9 }}
securityContext:
capabilities:
drop:
- ALL
add:
- DAC_OVERRIDE
env:
- name: FBIT_SERVICE_FLUSH_INTERVAL
value: "15"
Expand Down
10 changes: 10 additions & 0 deletions charts/azuremonitor-containers/templates/ama-logs-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,11 @@ spec:
fieldPath: spec.nodeName
securityContext:
privileged: true
capabilities:
drop:
- ALL
add:
- DAC_OVERRIDE
ports:
- containerPort: 25225
protocol: TCP
Expand Down Expand Up @@ -244,6 +249,11 @@ spec:
fieldPath: spec.nodeName
securityContext:
privileged: true
capabilities:
drop:
- ALL
add:
- DAC_OVERRIDE
volumeMounts:
{{- if .Values.amalogs.enableServiceAccountTimeBoundToken }}
- name: kube-api-access
Expand Down
5 changes: 5 additions & 0 deletions charts/azuremonitor-containers/templates/ama-logs-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ spec:
fieldPath: spec.nodeName
securityContext:
privileged: true
capabilities:
drop:
- ALL
add:
- DAC_OVERRIDE
ports:
- containerPort: 25225
protocol: TCP
Expand Down
21 changes: 21 additions & 0 deletions kubernetes/ama-logs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,11 @@ spec:
value: "28331"
securityContext:
privileged: true
capabilities:
drop:
- ALL
add:
- DAC_OVERRIDE
ports:
- containerPort: 25225
protocol: TCP
Expand Down Expand Up @@ -565,6 +570,11 @@ spec:
# value: "true"
securityContext:
privileged: true
capabilities:
drop:
- ALL
add:
- DAC_OVERRIDE
volumeMounts:
- name: kube-api-access
mountPath: /var/run/secrets/kubernetes.io/serviceaccount
Expand Down Expand Up @@ -843,6 +853,11 @@ spec:
value: "28331"
securityContext:
privileged: true
capabilities:
drop:
- ALL
add:
- DAC_OVERRIDE
ports:
- containerPort: 25225
protocol: TCP
Expand Down Expand Up @@ -1038,6 +1053,12 @@ spec:
limits:
cpu: 2
memory: 2Gi
securityContext:
capabilities:
drop:
- ALL
add:
- DAC_OVERRIDE
env:
- name: CONTAINER_MEMORY_LIMIT_IN_BYTES
valueFrom:
Expand Down
Loading