Skip to content

[release-4.22] OCPBUGS-85198: Add terminationMessagePolicy to build pod containers #6012

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

Merged
openshift-merge-bot merged 1 commit into from
May 13, 2026
+15 −13
Merged

[release-4.22] OCPBUGS-85198: Add terminationMessagePolicy to build pod containers #6012

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 15 additions & 13 deletions pkg/controller/build/buildrequest/buildrequest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,12 +653,13 @@ func (br buildRequestImpl) toBuildahPod() *corev1.Pod {
InitContainers: []corev1.Container{
{
// This container performs the image build / push process.
Name: "image-build",
Image: br.opts.Images.MachineConfigOperator,
Env: env,
Command: append(command, buildahBuildScript),
ImagePullPolicy: corev1.PullAlways,
SecurityContext: securityContext,
Name: "image-build",
Image: br.opts.Images.MachineConfigOperator,
Env: env,
Command: append(command, buildahBuildScript),
ImagePullPolicy: corev1.PullAlways,
SecurityContext: securityContext,
TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
// Only attach the buildah-cache volume mount to the buildah container.
VolumeMounts: append(volumeMounts, corev1.VolumeMount{
Name: "buildah-cache",
Expand All @@ -673,13 +674,14 @@ func (br buildRequestImpl) toBuildahPod() *corev1.Pod {
// the base OS image (which contains the "oc" binary) to create a
// ConfigMap from the digestfile that Buildah creates, which allows
// us to avoid parsing log files.
Name: "create-digest-configmap",
Command: append(command, digestCMScript),
Image: br.opts.MachineConfig.Spec.OSImageURL,
Env: env,
ImagePullPolicy: corev1.PullAlways,
SecurityContext: securityContext,
VolumeMounts: volumeMounts,
Name: "create-digest-configmap",
Command: append(command, digestCMScript),
Image: br.opts.MachineConfig.Spec.OSImageURL,
Env: env,
ImagePullPolicy: corev1.PullAlways,
SecurityContext: securityContext,
TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
VolumeMounts: volumeMounts,
},
},
ServiceAccountName: "machine-os-builder",
Expand Down