@@ -54,16 +54,16 @@ func TestEKSConfigReconciler(t *testing.T) {
54
54
reconciler := EKSConfigReconciler {
55
55
Client : testEnv .Client ,
56
56
}
57
- t .Logf (fmt . Sprintf ( "Calling reconcile on cluster '%s' and config '%s' should requeue" , cluster .Name , config .Name ) )
57
+ t .Logf ("Calling reconcile on cluster '%s' and config '%s' should requeue" , cluster .Name , config .Name )
58
58
g .Eventually (func (gomega Gomega ) {
59
59
err := reconciler .joinWorker (ctx , cluster , config , configOwner ("Machine" ))
60
60
gomega .Expect (err ).NotTo (HaveOccurred ())
61
61
}).Should (Succeed ())
62
62
63
- t .Logf (fmt . Sprintf ( "Secret '%s' should exist and be correct" , config .Name ) )
63
+ t .Logf ("Secret '%s' should exist and be correct" , config .Name )
64
64
secretList := & corev1.SecretList {}
65
65
testEnv .Client .List (ctx , secretList )
66
- t .Logf (dump ("secrets" , secretList ))
66
+ t .Log (dump ("secrets" , secretList ))
67
67
secret := & corev1.Secret {}
68
68
g .Eventually (func (gomega Gomega ) {
69
69
gomega .Expect (testEnv .Client .Get (ctx , client.ObjectKey {
@@ -91,10 +91,10 @@ func TestEKSConfigReconciler(t *testing.T) {
91
91
},
92
92
}
93
93
config .Status .DataSecretName = & mp .Name
94
- t .Logf (dump ("amcp" , amcp ))
95
- t .Logf (dump ("config" , config ))
96
- t .Logf (dump ("machinepool" , mp ))
97
- t .Logf (dump ("cluster" , cluster ))
94
+ t .Log (dump ("amcp" , amcp ))
95
+ t .Log (dump ("config" , config ))
96
+ t .Log (dump ("machinepool" , mp ))
97
+ t .Log (dump ("cluster" , cluster ))
98
98
oldUserData , err := newUserData (cluster .Name , map [string ]string {"test-arg" : "test-value" })
99
99
g .Expect (err ).To (BeNil ())
100
100
expectedUserData , err := newUserData (cluster .Name , map [string ]string {"test-arg" : "updated-test-value" })
@@ -103,21 +103,21 @@ func TestEKSConfigReconciler(t *testing.T) {
103
103
104
104
amcpList := & ekscontrolplanev1.AWSManagedControlPlaneList {}
105
105
testEnv .Client .List (ctx , amcpList )
106
- t .Logf (dump ("stored-amcps" , amcpList ))
106
+ t .Log (dump ("stored-amcps" , amcpList ))
107
107
108
108
reconciler := EKSConfigReconciler {
109
109
Client : testEnv .Client ,
110
110
}
111
- t .Logf (fmt . Sprintf ( "Calling reconcile on cluster '%s' and config '%s' should requeue" , cluster .Name , config .Name ) )
111
+ t .Logf ("Calling reconcile on cluster '%s' and config '%s' should requeue" , cluster .Name , config .Name )
112
112
g .Eventually (func (gomega Gomega ) {
113
113
err := reconciler .joinWorker (ctx , cluster , config , configOwner ("MachinePool" ))
114
114
gomega .Expect (err ).NotTo (HaveOccurred ())
115
115
}).Should (Succeed ())
116
116
117
- t .Logf (fmt . Sprintf ( "Secret '%s' should exist and be correct" , config .Name ) )
117
+ t .Logf ("Secret '%s' should exist and be correct" , config .Name )
118
118
secretList := & corev1.SecretList {}
119
119
testEnv .Client .List (ctx , secretList )
120
- t .Logf (dump ("secrets" , secretList ))
120
+ t .Log (dump ("secrets" , secretList ))
121
121
122
122
secret := & corev1.Secret {}
123
123
g .Eventually (func (gomega Gomega ) {
@@ -132,15 +132,15 @@ func TestEKSConfigReconciler(t *testing.T) {
132
132
config .Spec .KubeletExtraArgs = map [string ]string {
133
133
"test-arg" : "updated-test-value" ,
134
134
}
135
- t .Logf (dump ("config" , config ))
135
+ t .Log (dump ("config" , config ))
136
136
g .Eventually (func (gomega Gomega ) {
137
137
err := reconciler .joinWorker (ctx , cluster , config , configOwner ("MachinePool" ))
138
138
gomega .Expect (err ).NotTo (HaveOccurred ())
139
139
}).Should (Succeed ())
140
- t .Logf (fmt . Sprintf ( "Secret '%s' should exist and be up to date" , config .Name ) )
140
+ t .Logf ("Secret '%s' should exist and be up to date" , config .Name )
141
141
142
142
testEnv .Client .List (ctx , secretList )
143
- t .Logf (dump ("secrets" , secretList ))
143
+ t .Log (dump ("secrets" , secretList ))
144
144
g .Eventually (func (gomega Gomega ) {
145
145
gomega .Expect (testEnv .Client .Get (ctx , client.ObjectKey {
146
146
Name : config .Name ,
@@ -156,10 +156,10 @@ func TestEKSConfigReconciler(t *testing.T) {
156
156
cluster := newCluster (amcp .Name )
157
157
machine := newMachine (cluster , "test-machine" )
158
158
config := newEKSConfig (machine )
159
- t .Logf (dump ("amcp" , amcp ))
160
- t .Logf (dump ("config" , config ))
161
- t .Logf (dump ("machine" , machine ))
162
- t .Logf (dump ("cluster" , cluster ))
159
+ t .Log (dump ("amcp" , amcp ))
160
+ t .Log (dump ("config" , config ))
161
+ t .Log (dump ("machine" , machine ))
162
+ t .Log (dump ("cluster" , cluster ))
163
163
expectedUserData , err := newUserData (cluster .Name , map [string ]string {"test-arg" : "test-value" })
164
164
g .Expect (err ).To (BeNil ())
165
165
g .Expect (testEnv .Client .Create (ctx , amcp )).To (Succeed ())
@@ -174,21 +174,21 @@ func TestEKSConfigReconciler(t *testing.T) {
174
174
175
175
amcpList := & ekscontrolplanev1.AWSManagedControlPlaneList {}
176
176
testEnv .Client .List (ctx , amcpList )
177
- t .Logf (dump ("stored-amcps" , amcpList ))
177
+ t .Log (dump ("stored-amcps" , amcpList ))
178
178
179
179
reconciler := EKSConfigReconciler {
180
180
Client : testEnv .Client ,
181
181
}
182
- t .Logf (fmt . Sprintf ( "Calling reconcile on cluster '%s' and config '%s' should requeue" , cluster .Name , config .Name ) )
182
+ t .Logf ("Calling reconcile on cluster '%s' and config '%s' should requeue" , cluster .Name , config .Name )
183
183
g .Eventually (func (gomega Gomega ) {
184
184
err := reconciler .joinWorker (ctx , cluster , config , configOwner ("Machine" ))
185
185
gomega .Expect (err ).NotTo (HaveOccurred ())
186
186
}).Should (Succeed ())
187
187
188
- t .Logf (fmt . Sprintf ( "Secret '%s' should exist and be out of date" , config .Name ) )
188
+ t .Logf ("Secret '%s' should exist and be out of date" , config .Name )
189
189
secretList := & corev1.SecretList {}
190
190
testEnv .Client .List (ctx , secretList )
191
- t .Logf (dump ("secrets" , secretList ))
191
+ t .Log (dump ("secrets" , secretList ))
192
192
193
193
secret = & corev1.Secret {}
194
194
g .Eventually (func (gomega Gomega ) {
@@ -226,11 +226,11 @@ func TestEKSConfigReconciler(t *testing.T) {
226
226
"secretKey" : []byte (secretContent ),
227
227
},
228
228
}
229
- t .Logf (dump ("amcp" , amcp ))
230
- t .Logf (dump ("config" , config ))
231
- t .Logf (dump ("machine" , machine ))
232
- t .Logf (dump ("cluster" , cluster ))
233
- t .Logf (dump ("secret" , secret ))
229
+ t .Log (dump ("amcp" , amcp ))
230
+ t .Log (dump ("config" , config ))
231
+ t .Log (dump ("machine" , machine ))
232
+ t .Log (dump ("cluster" , cluster ))
233
+ t .Log (dump ("secret" , secret ))
234
234
g .Expect (testEnv .Client .Create (ctx , secret )).To (Succeed ())
235
235
g .Expect (testEnv .Client .Create (ctx , amcp )).To (Succeed ())
236
236
@@ -252,15 +252,15 @@ func TestEKSConfigReconciler(t *testing.T) {
252
252
reconciler := EKSConfigReconciler {
253
253
Client : testEnv .Client ,
254
254
}
255
- t .Logf (fmt . Sprintf ( "Calling reconcile on cluster '%s' and config '%s' should requeue" , cluster .Name , config .Name ) )
255
+ t .Logf ("Calling reconcile on cluster '%s' and config '%s' should requeue" , cluster .Name , config .Name )
256
256
g .Eventually (func (gomega Gomega ) {
257
257
err := reconciler .joinWorker (ctx , cluster , config , configOwner ("Machine" ))
258
258
gomega .Expect (err ).NotTo (HaveOccurred ())
259
259
}).Should (Succeed ())
260
260
261
261
secretList := & corev1.SecretList {}
262
262
testEnv .Client .List (ctx , secretList )
263
- t .Logf (dump ("secrets" , secretList ))
263
+ t .Log (dump ("secrets" , secretList ))
264
264
gotSecret := & corev1.Secret {}
265
265
g .Eventually (func (gomega Gomega ) {
266
266
gomega .Expect (testEnv .Client .Get (ctx , client.ObjectKey {
0 commit comments