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

fix(busybox): do not use latest tag img #2893

Merged
merged 4 commits into from
Feb 23, 2023
Merged

fix(busybox): do not use latest tag img #2893

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eebf9b3
feat(logs): use specific version of busybox img
mat-rumian Feb 22, 2023
410448e
feat(tests): update, use exact version of busybox img
mat-rumian Feb 22, 2023
6abf4dd
chore(changlog): add
mat-rumian Feb 22, 2023
a837d57
Update .changelog/2893.fixed.txt
mat-rumian Feb 23, 2023
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
4 changes: 3 additions & 1 deletion deploy/helm/sumologic/templates/logs/collector/otelcol/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,9 @@ spec:
protocol: TCP
initContainers: # ensure the host path is owned by the otel user group
- name: changeowner
image: public.ecr.aws/docker/library/busybox:latest
# yamllint disable-line rule:line-length
image: {{ $.Values.otellogs.daemonset.initContainers.changeowner.image.repository }}:{{ $.Values.otellogs.daemonset.initContainers.changeowner.image.tag }}
imagePullPolicy: {{ $.Values.otellogs.daemonset.initContainers.changeowner.image.pullPolicy }}
securityContext:
{{- toYaml $.Values.otellogs.daemonset.initContainers.changeowner.securityContext | nindent 10 }}
command:
Expand Down
8 changes: 6 additions & 2 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4306,9 +4306,13 @@ otellogs:
drop:
- ALL

## Set securityContext for initContainers running in pods in log collector daemonset
## Set securityContext and image for initContainers running in pods in log collector daemonset
initContainers:
changeowner:
image:
repository: "public.ecr.aws/docker/library/busybox"
tag: "1.36.0"
pullPolicy: IfNotPresent
securityContext:
capabilities:
drop:
Expand Down Expand Up @@ -4411,7 +4415,7 @@ falco:
initContainers:
## Add initContainer to wait until kernel-devel is installed on host
- name: init-falco
image: public.ecr.aws/docker/library/busybox:latest
image: public.ecr.aws/docker/library/busybox:1.36.0
command:
- "sh"
- "-c"
Expand Down
6 changes: 4 additions & 2 deletions tests/helm/logs_otc_daemonset/static/additional.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ spec:
protocol: TCP
initContainers: # ensure the host path is owned by the otel user group
- name: changeowner
image: public.ecr.aws/docker/library/busybox:latest
image: public.ecr.aws/docker/library/busybox:1.36.0
imagePullPolicy: IfNotPresent
securityContext:
capabilities:
drop:
Expand Down Expand Up @@ -228,7 +229,8 @@ spec:
protocol: TCP
initContainers: # ensure the host path is owned by the otel user group
- name: changeowner
image: public.ecr.aws/docker/library/busybox:latest
image: public.ecr.aws/docker/library/busybox:1.36.0
imagePullPolicy: IfNotPresent
securityContext:
capabilities:
drop:
Expand Down
3 changes: 2 additions & 1 deletion tests/helm/logs_otc_daemonset/static/basic.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ spec:
protocol: TCP
initContainers: # ensure the host path is owned by the otel user group
- name: changeowner
image: public.ecr.aws/docker/library/busybox:latest
image: public.ecr.aws/docker/library/busybox:1.36.0
imagePullPolicy: IfNotPresent
securityContext:
capabilities:
drop:
Expand Down
3 changes: 2 additions & 1 deletion tests/helm/logs_otc_daemonset/static/complex.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ spec:
protocol: TCP
initContainers: # ensure the host path is owned by the otel user group
- name: changeowner
image: public.ecr.aws/docker/library/busybox:latest
image: public.ecr.aws/docker/library/busybox:1.36.0
imagePullPolicy: IfNotPresent
securityContext:
capabilities:
drop:
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/yamls/multiline-logs-generator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ metadata:
spec:
containers:
- name: example-container-multiline-logs-long-lines
image: public.ecr.aws/docker/library/busybox:latest
image: public.ecr.aws/docker/library/busybox:1.36.0
args:
- /bin/sh
- /multiline-logs-generator/multiline-generator.sh
Expand Down