fix: init container failing report

SocialGouv · Jan 18, 2023 · 6d41fb8 · 6d41fb8
1 parent 1d6cf85
commit 6d41fb8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/output/output.go b/pkg/output/output.go
@@ -38,7 +38,7 @@ func (o Output) errorOutputFrom(err error) *errorOutput {
 			Type:    ErrorTypeRollout,
 		}
 
-		if errOut.Code == status.FailureProcessCrashing {
+		if errOut.Code == status.FailureProcessCrashing && re.Namespace != "" && re.Pod != "" && re.Container != "" {
 			logBytes, err := o.wrapper.TrailContainerLogs(re.Namespace, re.Pod, re.Container)
 			if err != nil {
 				return o.errorOutputFrom(err)

diff --git a/pkg/status/pod.go b/pkg/status/pod.go
@@ -13,7 +13,7 @@ func TestPodStatus(pod *v1.Pod, options *config.Options, resourceType ResourceTy
 	for _, initStatus := range pod.Status.InitContainerStatuses {
 		status := TestContainerStatus(&initStatus, options, resourceType)
 		if status.Error != nil {
-			if !status.Continue {
+			if !status.Continue || resourceType == ResourceTypeJob {
 				if re, ok := status.Error.(RolloutError); ok {
 					re.Namespace = pod.Namespace
 					re.Pod = pod.Name
@@ -32,7 +32,7 @@ func TestPodStatus(pod *v1.Pod, options *config.Options, resourceType ResourceTy
 	for _, containerStatus := range pod.Status.ContainerStatuses {
 		status := TestContainerStatus(&containerStatus, options, resourceType)
 		if status.Error != nil {
-			if !status.Continue {
+			if !status.Continue || resourceType == ResourceTypeJob {
 				if re, ok := status.Error.(RolloutError); ok {
 					re.Namespace = pod.Namespace
 					re.Pod = pod.Name