@@ -25,6 +25,7 @@ import (
25
25
26
26
const (
27
27
artifactName = "operator-controller-upgrade-e2e"
28
+ container = "manager"
28
29
)
29
30
30
31
func TestClusterCatalogUnpacking (t * testing.T ) {
@@ -59,7 +60,7 @@ func TestClusterCatalogUnpacking(t *testing.T) {
59
60
leaderCtx , leaderCancel := context .WithTimeout (ctx , 3 * time .Minute )
60
61
defer leaderCancel ()
61
62
leaderSubstrings := []string {"successfully acquired lease" }
62
- leaderElected , err := watchPodLogsForSubstring (leaderCtx , & managerPod , "manager" , leaderSubstrings ... )
63
+ leaderElected , err := watchPodLogsForSubstring (leaderCtx , & managerPod , leaderSubstrings ... )
63
64
require .NoError (t , err )
64
65
require .True (t , leaderElected )
65
66
@@ -70,7 +71,7 @@ func TestClusterCatalogUnpacking(t *testing.T) {
70
71
"reconcile ending" ,
71
72
fmt .Sprintf (`ClusterCatalog=%q` , testClusterCatalogName ),
72
73
}
73
- found , err := watchPodLogsForSubstring (logCtx , & managerPod , "manager" , substrings ... )
74
+ found , err := watchPodLogsForSubstring (logCtx , & managerPod , substrings ... )
74
75
require .NoError (t , err )
75
76
require .True (t , found )
76
77
@@ -116,7 +117,7 @@ func TestClusterExtensionAfterOLMUpgrade(t *testing.T) {
116
117
defer leaderCancel ()
117
118
118
119
leaderSubstrings := []string {"successfully acquired lease" }
119
- leaderElected , err := watchPodLogsForSubstring (leaderCtx , managerPod , "manager" , leaderSubstrings ... )
120
+ leaderElected , err := watchPodLogsForSubstring (leaderCtx , managerPod , leaderSubstrings ... )
120
121
require .NoError (t , err )
121
122
require .True (t , leaderElected )
122
123
@@ -128,7 +129,7 @@ func TestClusterExtensionAfterOLMUpgrade(t *testing.T) {
128
129
"reconcile ending" ,
129
130
fmt .Sprintf (`ClusterExtension=%q` , testClusterExtensionName ),
130
131
}
131
- found , err := watchPodLogsForSubstring (logCtx , managerPod , "manager" , substrings ... )
132
+ found , err := watchPodLogsForSubstring (logCtx , managerPod , substrings ... )
132
133
require .NoError (t , err )
133
134
require .True (t , found )
134
135
@@ -222,7 +223,7 @@ func waitForDeployment(t *testing.T, ctx context.Context, controlPlaneLabel stri
222
223
return & managerPods .Items [0 ]
223
224
}
224
225
225
- func watchPodLogsForSubstring (ctx context.Context , pod * corev1.Pod , container string , substrings ... string ) (bool , error ) {
226
+ func watchPodLogsForSubstring (ctx context.Context , pod * corev1.Pod , substrings ... string ) (bool , error ) {
226
227
podLogOpts := corev1.PodLogOptions {
227
228
Follow : true ,
228
229
Container : container ,
0 commit comments