Fix OADP-5183: Ensure containers are all using FallbackToLogsOnError …

…in terminationMessagePolicy
openshift · Nov 14, 2024 · d55863c · d55863c
1 parent bead97f
commit d55863c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/bundle/manifests/oadp-operator.clusterserviceversion.yaml b/bundle/manifests/oadp-operator.clusterserviceversion.yaml
@@ -972,6 +972,7 @@ spec:
                     path: /healthz
                     port: 8081
                   periodSeconds: 10
+                terminationMessagePolicy: FallbackToLogsOnError
                 volumeMounts:
                 - mountPath: /var/run/secrets/openshift/serviceaccount
                   name: bound-sa-token

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -67,6 +67,7 @@ spec:
         image: controller:latest
         imagePullPolicy: Always
         name: manager
+        terminationMessagePolicy: FallbackToLogsOnError
         securityContext:
           allowPrivilegeEscalation: false
         startupProbe:

diff --git a/controllers/common.go b/controllers/common.go
@@ -14,7 +14,7 @@ func setContainerDefaults(container *corev1.Container) {
 		container.TerminationMessagePath = "/dev/termination-log"
 	}
 	if container.TerminationMessagePolicy == "" {
-		container.TerminationMessagePolicy = corev1.TerminationMessageReadFile
+		container.TerminationMessagePolicy = corev1.TerminationMessageFallbackToLogsOnError
 	}
 	for i := range container.Ports {
 		if container.Ports[i].Protocol == "" {

diff --git a/controllers/nodeagent_test.go b/controllers/nodeagent_test.go
@@ -294,7 +294,7 @@ func createTestBuiltNodeAgentDaemonSet(options TestBuiltNodeAgentDaemonSetOption
 							Image:                    common.VeleroImage,
 							ImagePullPolicy:          corev1.PullAlways,
 							TerminationMessagePath:   "/dev/termination-log",
-							TerminationMessagePolicy: corev1.TerminationMessageReadFile,
+							TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
 							SecurityContext:          &corev1.SecurityContext{Privileged: ptr.To(true)},
 							Ports: []corev1.ContainerPort{
 								{

diff --git a/controllers/nonadmin_controller.go b/controllers/nonadmin_controller.go
@@ -176,6 +176,7 @@ func ensureRequiredSpecs(deploymentObject *appsv1.Deployment, image string, imag
 				nonAdminContainer.Image = image
 				nonAdminContainer.ImagePullPolicy = imagePullPolicy
 				nonAdminContainer.Env = []corev1.EnvVar{namespaceEnvVar}
+				nonAdminContainer.TerminationMessagePolicy = corev1.TerminationMessageFallbackToLogsOnError
 				nonAdminContainerFound = true
 				break
 			}

diff --git a/controllers/velero.go b/controllers/velero.go
@@ -425,7 +425,7 @@ func (r *DPAReconciler) appendPluginSpecificSpecs(veleroDeployment *appsv1.Deplo
 					ImagePullPolicy:          imagePullPolicy,
 					Resources:                init_container_resources,
 					TerminationMessagePath:   "/dev/termination-log",
-					TerminationMessagePolicy: "File",
+					TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
 					VolumeMounts: []corev1.VolumeMount{
 						{
 							MountPath: "/target",
@@ -494,7 +494,7 @@ func (r *DPAReconciler) appendPluginSpecificSpecs(veleroDeployment *appsv1.Deplo
 					ImagePullPolicy:          imagePullPolicy,
 					Resources:                init_container_resources,
 					TerminationMessagePath:   "/dev/termination-log",
-					TerminationMessagePolicy: "File",
+					TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
 					VolumeMounts: []corev1.VolumeMount{
 						{
 							MountPath: "/target",

diff --git a/controllers/velero_test.go b/controllers/velero_test.go
@@ -124,7 +124,7 @@ var (
 			},
 		},
 		TerminationMessagePath:   "/dev/termination-log",
-		TerminationMessagePolicy: "File",
+		TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
 		VolumeMounts: []corev1.VolumeMount{
 			{MountPath: "/target", Name: "plugins"},
 		},
@@ -385,7 +385,7 @@ func createTestBuiltVeleroDeployment(options TestBuiltVeleroDeploymentOptions) *
 							Image:                    common.VeleroImage,
 							ImagePullPolicy:          corev1.PullAlways,
 							TerminationMessagePath:   "/dev/termination-log",
-							TerminationMessagePolicy: corev1.TerminationMessageReadFile,
+							TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
 							Ports: []corev1.ContainerPort{{
 								Name:          "metrics",
 								ContainerPort: 8085,