Skip to content

Commit a15d1ca

Browse files
committed
muliti-arch-builders/splunk: only build the splunk sidecar container
The repo we are using to build the ITPAAS splunkforwarder container on the RHCOS multi-arch builders is out of date and references a splunkforwarder rpm that no longer exists in the internal repos. By omitting the build step for this container, we can pull in the already built image from ITPAAS that includes a more recent RPM. We'll still use `--arch=x86_64` for the sidecar container to ensure proper logging on non x86_64 builders. See: coreos#1044
1 parent ef8b888 commit a15d1ca

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

multi-arch-builders/builder-splunk.bu

+5-6
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,13 @@ storage:
102102
Type=oneshot
103103
RemainAfterExit=yes
104104
ExecStartPre=nm-online --timeout=30
105-
# use `--arch=x86_64` because the RPM doesnt exist for aarch64.
106-
# ppc64le and s390x RPMs are not compatible with journald input as mentioned
107-
# in the splunk journald documentation for version 8.2.6
108-
# https://docs.splunk.com/Documentation/Splunk/8.2.6/Data/CollecteventsfromJournalD
105+
# use `--arch=x86_64` because ppc64le and s390x RPMs
106+
# are not compatible with journald input as mentioned
107+
# in the splunk journald documentation for version 9.3.1 (latest)
108+
# https://docs.splunk.com/Documentation/Splunk/9.3.1/Data/CollecteventsfromJournalD
109109
# The --arch=x86_64 works here because we have `qemu-user-static-x86`
110110
# installed on non-x86_64 FCOS streams.
111-
ExecStart=-podman build --pull-always --cache-ttl=480h --arch=x86_64 -t localhost/splunkforwarder:latest ${ITPAAS_SPLUNK_REPO}
112-
ExecStart=-podman build --build-arg project=rhcos-multiarch-builders --cache-ttl=480h --from localhost/splunkforwarder:latest -t localhost/splunkforwarder-rhcos ${SPLUNK_SIDECAR_REPO}
111+
ExecStart=-podman build --build-arg project=rhcos-multiarch-builders --cache-ttl=480h --arch=x86_64 -t localhost/splunkforwarder-rhcos ${SPLUNK_SIDECAR_REPO}
113112
ExecStartPost=-podman image prune --force --filter until=720h
114113
[Install]
115114
WantedBy=default.target

0 commit comments

Comments
 (0)