Merge pull request openshift#344 from JoelSpeed/check-termination-policy

openshift-merge-bot[bot] · web-flow · commit e21fac6dce98 · 2024-05-13T16:47:59.000Z
NO-JIRA: Ensure termination message policy in tests
diff --git a/pkg/cloud/cloud_test.go b/pkg/cloud/cloud_test.go
@@ -395,6 +395,7 @@ func checkResourceRunsBeforeCNI(t *testing.T, platformName string, podSpec corev
 	checkPorts(t, podSpec)
 	checkVolumes(t, platformName, podSpec)
 	checkContainerCommand(t, podSpec)
+	checkContainerTerminationMessagePolicy(t, podSpec)
 }
 
 func checkResourceTolerations(t *testing.T, podSpec corev1.PodSpec) {
@@ -531,6 +532,12 @@ exec `
 	}
 }
 
+func checkContainerTerminationMessagePolicy(t *testing.T, podSpec corev1.PodSpec) {
+	for _, container := range append(podSpec.Containers, podSpec.InitContainers...) {
+		assert.Equal(t, container.TerminationMessagePolicy, corev1.TerminationMessageFallbackToLogsOnError, "Container TerminationMessagePolicy should be set to %q", corev1.TerminationMessageFallbackToLogsOnError)
+	}
+}
+
 func checkLeaderElection(t *testing.T, podSpec corev1.PodSpec) {
 	const (
 		leaderElect                  = "--leader-elect=true"

Original file line number	Diff line number	Diff line change
`@@ -395,6 +395,7 @@ func checkResourceRunsBeforeCNI(t *testing.T, platformName string, podSpec corev`
`395`	`395`	`checkPorts(t, podSpec)`
`396`	`396`	`checkVolumes(t, platformName, podSpec)`
`397`	`397`	`checkContainerCommand(t, podSpec)`
	`398`	`+ checkContainerTerminationMessagePolicy(t, podSpec)`
`398`	`399`	`}`
`399`	`400`
`400`	`401`	`func checkResourceTolerations(t *testing.T, podSpec corev1.PodSpec) {`
@@ -531,6 +532,12 @@ exec `
`531`	`532`	`}`
`532`	`533`	`}`
`533`	`534`
	`535`	`+func checkContainerTerminationMessagePolicy(t *testing.T, podSpec corev1.PodSpec) {`
	`536`	`+ for _, container := range append(podSpec.Containers, podSpec.InitContainers...) {`
	`537`	`+ assert.Equal(t, container.TerminationMessagePolicy, corev1.TerminationMessageFallbackToLogsOnError, "Container TerminationMessagePolicy should be set to %q", corev1.TerminationMessageFallbackToLogsOnError)`
	`538`	`+ }`
	`539`	`+}`
	`540`	`+`
`534`	`541`	`func checkLeaderElection(t *testing.T, podSpec corev1.PodSpec) {`
`535`	`542`	`const (`
`536`	`543`	`leaderElect = "--leader-elect=true"`