Skip to content

Commit c88fd60

Browse files
Merge pull request openshift#2020 from openshift-cherrypick-robot/cherry-pick-2003-to-release-4.19
[release-4.19] OCPBUGS-56203: Adding sos.conf file for default sos config into the tools image
2 parents e468aa6 + 8c8e461 commit c88fd60

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

images/tools/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ RUN make build --warn-undefined-variables
55

66
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
77
COPY --from=builder /go/src/github.com/openshift/oc/oc /usr/bin/
8+
COPY --from=builder /go/src/github.com/openshift/oc/images/tools/sos.conf /etc/sos/
89
RUN for i in kubectl openshift-deploy openshift-docker-build openshift-sti-build openshift-git-clone openshift-manage-dockerfile openshift-extract-image-content openshift-recycle; do ln -sf /usr/bin/oc /usr/bin/$i; done
910
RUN INSTALL_PKGS="\
1011
bash-completion \

images/tools/sos.conf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[report]
2+
enable-plugins=openshift,openshift_ovn,openvswitch,podman,crio,auditd
3+
all-logs=true
4+
plugin-timeout=600
5+
6+
[plugin_options]
7+
crio.all=on
8+
crio.logs=on
9+
podman.all=on
10+
podman.logs=on

0 commit comments

Comments
 (0)