Skip to content

Commit 0c62f75

Browse files
johnSchnakejohnSchnake
committed
Move auth and network tests to use framework/log
This is part of the transition to using framework/log instead of the Logf inside the framework package. This will help with import size/cycles when importing the framework or subpackages.
1 parent a6e5cb2 commit 0c62f75

21 files changed

+211
-190
lines changed

‎test/e2e/auth/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ go_library(
5555
"//test/e2e/framework:go_default_library",
5656
"//test/e2e/framework/auth:go_default_library",
5757
"//test/e2e/framework/job:go_default_library",
58+
"//test/e2e/framework/log:go_default_library",
5859
"//test/utils:go_default_library",
5960
"//test/utils/image:go_default_library",
6061
"//vendor/github.com/evanphx/json-patch:go_default_library",

‎test/e2e/auth/audit.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import (
3636
restclient "k8s.io/client-go/rest"
3737
"k8s.io/kubernetes/test/e2e/framework"
3838
"k8s.io/kubernetes/test/e2e/framework/auth"
39+
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3940
"k8s.io/kubernetes/test/utils"
4041
imageutils "k8s.io/kubernetes/test/utils/image"
4142

@@ -738,9 +739,9 @@ func expectEvents(f *framework.Framework, expectedEvents []utils.AuditEvent) {
738739
defer stream.Close()
739740
missingReport, err := utils.CheckAuditLines(stream, expectedEvents, auditv1.SchemeGroupVersion)
740741
if err != nil {
741-
framework.Logf("Failed to observe audit events: %v", err)
742+
e2elog.Logf("Failed to observe audit events: %v", err)
742743
} else if len(missingReport.MissingEvents) > 0 {
743-
framework.Logf(missingReport.String())
744+
e2elog.Logf(missingReport.String())
744745
}
745746
return len(missingReport.MissingEvents) == 0, nil
746747
})

‎test/e2e/auth/audit_dynamic.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import (
3636
restclient "k8s.io/client-go/rest"
3737
"k8s.io/kubernetes/test/e2e/framework"
3838
"k8s.io/kubernetes/test/e2e/framework/auth"
39+
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3940
"k8s.io/kubernetes/test/utils"
4041
imageutils "k8s.io/kubernetes/test/utils/image"
4142
)
@@ -113,14 +114,14 @@ var _ = SIGDescribe("[Feature:DynamicAudit]", func() {
113114
err = wait.Poll(100*time.Millisecond, 10*time.Second, func() (done bool, err error) {
114115
p, err := f.ClientSet.CoreV1().Pods(namespace).Get("audit-proxy", metav1.GetOptions{})
115116
if errors.IsNotFound(err) {
116-
framework.Logf("waiting for audit-proxy pod to be present")
117+
e2elog.Logf("waiting for audit-proxy pod to be present")
117118
return false, nil
118119
} else if err != nil {
119120
return false, err
120121
}
121122
podIP = p.Status.PodIP
122123
if podIP == "" {
123-
framework.Logf("waiting for audit-proxy pod IP to be ready")
124+
e2elog.Logf("waiting for audit-proxy pod IP to be ready")
124125
return false, nil
125126
}
126127
return true, nil
@@ -153,17 +154,17 @@ var _ = SIGDescribe("[Feature:DynamicAudit]", func() {
153154

154155
_, err = f.ClientSet.AuditregistrationV1alpha1().AuditSinks().Create(&sink)
155156
framework.ExpectNoError(err, "failed to create audit sink")
156-
framework.Logf("created audit sink")
157+
e2elog.Logf("created audit sink")
157158

158159
// check that we are receiving logs in the proxy
159160
err = wait.Poll(100*time.Millisecond, 10*time.Second, func() (done bool, err error) {
160161
logs, err := framework.GetPodLogs(f.ClientSet, namespace, "audit-proxy", "proxy")
161162
if err != nil {
162-
framework.Logf("waiting for audit-proxy pod logs to be available")
163+
e2elog.Logf("waiting for audit-proxy pod logs to be available")
163164
return false, nil
164165
}
165166
if logs == "" {
166-
framework.Logf("waiting for audit-proxy pod logs to be non-empty")
167+
e2elog.Logf("waiting for audit-proxy pod logs to be non-empty")
167168
return false, nil
168169
}
169170
return true, nil
@@ -369,9 +370,9 @@ var _ = SIGDescribe("[Feature:DynamicAudit]", func() {
369370
reader := strings.NewReader(logs)
370371
missingReport, err := utils.CheckAuditLines(reader, expectedEvents, auditv1.SchemeGroupVersion)
371372
if err != nil {
372-
framework.Logf("Failed to observe audit events: %v", err)
373+
e2elog.Logf("Failed to observe audit events: %v", err)
373374
} else if len(missingReport.MissingEvents) > 0 {
374-
framework.Logf(missingReport.String())
375+
e2elog.Logf(missingReport.String())
375376
}
376377
return len(missingReport.MissingEvents) == 0, nil
377378
})

‎test/e2e/auth/certificates.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
v1beta1client "k8s.io/client-go/kubernetes/typed/certificates/v1beta1"
2929
"k8s.io/client-go/util/cert"
3030
"k8s.io/kubernetes/test/e2e/framework"
31+
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3132
"k8s.io/kubernetes/test/utils"
3233

3334
. "github.com/onsi/ginkgo"
@@ -66,13 +67,13 @@ var _ = SIGDescribe("Certificates API", func() {
6667
}
6768
csrs := f.ClientSet.CertificatesV1beta1().CertificateSigningRequests()
6869

69-
framework.Logf("creating CSR")
70+
e2elog.Logf("creating CSR")
7071
csr, err = csrs.Create(csr)
7172
framework.ExpectNoError(err)
7273

7374
csrName := csr.Name
7475

75-
framework.Logf("approving CSR")
76+
e2elog.Logf("approving CSR")
7677
framework.ExpectNoError(wait.Poll(5*time.Second, time.Minute, func() (bool, error) {
7778
csr.Status.Conditions = []v1beta1.CertificateSigningRequestCondition{
7879
{
@@ -84,27 +85,27 @@ var _ = SIGDescribe("Certificates API", func() {
8485
csr, err = csrs.UpdateApproval(csr)
8586
if err != nil {
8687
csr, _ = csrs.Get(csrName, metav1.GetOptions{})
87-
framework.Logf("err updating approval: %v", err)
88+
e2elog.Logf("err updating approval: %v", err)
8889
return false, nil
8990
}
9091
return true, nil
9192
}))
9293

93-
framework.Logf("waiting for CSR to be signed")
94+
e2elog.Logf("waiting for CSR to be signed")
9495
framework.ExpectNoError(wait.Poll(5*time.Second, time.Minute, func() (bool, error) {
9596
csr, err = csrs.Get(csrName, metav1.GetOptions{})
9697
if err != nil {
97-
framework.Logf("error getting csr: %v", err)
98+
e2elog.Logf("error getting csr: %v", err)
9899
return false, nil
99100
}
100101
if len(csr.Status.Certificate) == 0 {
101-
framework.Logf("csr not signed yet")
102+
e2elog.Logf("csr not signed yet")
102103
return false, nil
103104
}
104105
return true, nil
105106
}))
106107

107-
framework.Logf("testing the client")
108+
e2elog.Logf("testing the client")
108109
rcfg, err := framework.LoadConfig()
109110
framework.ExpectNoError(err)
110111

‎test/e2e/auth/node_authz.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ import (
2020
"fmt"
2121
"time"
2222

23-
"k8s.io/api/core/v1"
23+
v1 "k8s.io/api/core/v1"
2424
apierrors "k8s.io/apimachinery/pkg/api/errors"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/util/wait"
2727
clientset "k8s.io/client-go/kubernetes"
2828
restclient "k8s.io/client-go/rest"
2929
"k8s.io/kubernetes/test/e2e/framework"
30+
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3031
imageutils "k8s.io/kubernetes/test/utils/image"
3132

3233
. "github.com/onsi/ginkgo"
@@ -156,7 +157,7 @@ var _ = SIGDescribe("[Feature:NodeAuthorizer]", func() {
156157
err = wait.Poll(itv, dur, func() (bool, error) {
157158
_, err = c.CoreV1().Secrets(ns).Get(secret.Name, metav1.GetOptions{})
158159
if err != nil {
159-
framework.Logf("Failed to get secret %v, err: %v", secret.Name, err)
160+
e2elog.Logf("Failed to get secret %v, err: %v", secret.Name, err)
160161
return false, nil
161162
}
162163
return true, nil

‎test/e2e/auth/service_accounts.go‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ import (
2222
"time"
2323

2424
authenticationv1 "k8s.io/api/authentication/v1"
25-
"k8s.io/api/core/v1"
25+
v1 "k8s.io/api/core/v1"
2626
apierrors "k8s.io/apimachinery/pkg/api/errors"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/util/sets"
2929
"k8s.io/apimachinery/pkg/util/uuid"
3030
"k8s.io/apimachinery/pkg/util/wait"
3131
"k8s.io/kubernetes/plugin/pkg/admission/serviceaccount"
3232
"k8s.io/kubernetes/test/e2e/framework"
33+
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3334
imageutils "k8s.io/kubernetes/test/utils/image"
3435

3536
. "github.com/onsi/ginkgo"
@@ -48,19 +49,19 @@ var _ = SIGDescribe("ServiceAccounts", func() {
4849
By("waiting for a single token reference")
4950
sa, err := f.ClientSet.CoreV1().ServiceAccounts(f.Namespace.Name).Get("default", metav1.GetOptions{})
5051
if apierrors.IsNotFound(err) {
51-
framework.Logf("default service account was not found")
52+
e2elog.Logf("default service account was not found")
5253
return false, nil
5354
}
5455
if err != nil {
55-
framework.Logf("error getting default service account: %v", err)
56+
e2elog.Logf("error getting default service account: %v", err)
5657
return false, err
5758
}
5859
switch len(sa.Secrets) {
5960
case 0:
60-
framework.Logf("default service account has no secret references")
61+
e2elog.Logf("default service account has no secret references")
6162
return false, nil
6263
case 1:
63-
framework.Logf("default service account has a single secret reference")
64+
e2elog.Logf("default service account has a single secret reference")
6465
secrets = sa.Secrets
6566
return true, nil
6667
default:
@@ -86,19 +87,19 @@ var _ = SIGDescribe("ServiceAccounts", func() {
8687
By("waiting for a new token reference")
8788
sa, err := f.ClientSet.CoreV1().ServiceAccounts(f.Namespace.Name).Get("default", metav1.GetOptions{})
8889
if err != nil {
89-
framework.Logf("error getting default service account: %v", err)
90+
e2elog.Logf("error getting default service account: %v", err)
9091
return false, err
9192
}
9293
switch len(sa.Secrets) {
9394
case 0:
94-
framework.Logf("default service account has no secret references")
95+
e2elog.Logf("default service account has no secret references")
9596
return false, nil
9697
case 1:
9798
if sa.Secrets[0] == secrets[0] {
98-
framework.Logf("default service account still has the deleted secret reference")
99+
e2elog.Logf("default service account still has the deleted secret reference")
99100
return false, nil
100101
}
101-
framework.Logf("default service account has a new single secret reference")
102+
e2elog.Logf("default service account has a new single secret reference")
102103
secrets = sa.Secrets
103104
return true, nil
104105
default:
@@ -130,15 +131,15 @@ var _ = SIGDescribe("ServiceAccounts", func() {
130131
By("waiting for a new token to be created and added")
131132
sa, err := f.ClientSet.CoreV1().ServiceAccounts(f.Namespace.Name).Get("default", metav1.GetOptions{})
132133
if err != nil {
133-
framework.Logf("error getting default service account: %v", err)
134+
e2elog.Logf("error getting default service account: %v", err)
134135
return false, err
135136
}
136137
switch len(sa.Secrets) {
137138
case 0:
138-
framework.Logf("default service account has no secret references")
139+
e2elog.Logf("default service account has no secret references")
139140
return false, nil
140141
case 1:
141-
framework.Logf("default service account has a new single secret reference")
142+
e2elog.Logf("default service account has a new single secret reference")
142143
secrets = sa.Secrets
143144
return true, nil
144145
default:
@@ -176,21 +177,21 @@ var _ = SIGDescribe("ServiceAccounts", func() {
176177
By("getting the auto-created API token")
177178
sa, err := f.ClientSet.CoreV1().ServiceAccounts(f.Namespace.Name).Get("mount-test", metav1.GetOptions{})
178179
if apierrors.IsNotFound(err) {
179-
framework.Logf("mount-test service account was not found")
180+
e2elog.Logf("mount-test service account was not found")
180181
return false, nil
181182
}
182183
if err != nil {
183-
framework.Logf("error getting mount-test service account: %v", err)
184+
e2elog.Logf("error getting mount-test service account: %v", err)
184185
return false, err
185186
}
186187
if len(sa.Secrets) == 0 {
187-
framework.Logf("mount-test service account has no secret references")
188+
e2elog.Logf("mount-test service account has no secret references")
188189
return false, nil
189190
}
190191
for _, secretRef := range sa.Secrets {
191192
secret, err := f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Get(secretRef.Name, metav1.GetOptions{})
192193
if err != nil {
193-
framework.Logf("Error getting secret %s: %v", secretRef.Name, err)
194+
e2elog.Logf("Error getting secret %s: %v", secretRef.Name, err)
194195
continue
195196
}
196197
if secret.Type == v1.SecretTypeServiceAccountToken {
@@ -199,7 +200,7 @@ var _ = SIGDescribe("ServiceAccounts", func() {
199200
}
200201
}
201202

202-
framework.Logf("default service account has no secret references to valid service account tokens")
203+
e2elog.Logf("default service account has no secret references to valid service account tokens")
203204
return false, nil
204205
}))
205206

@@ -287,29 +288,29 @@ var _ = SIGDescribe("ServiceAccounts", func() {
287288
By("getting the auto-created API token")
288289
sa, err := f.ClientSet.CoreV1().ServiceAccounts(f.Namespace.Name).Get(mountSA.Name, metav1.GetOptions{})
289290
if apierrors.IsNotFound(err) {
290-
framework.Logf("mount service account was not found")
291+
e2elog.Logf("mount service account was not found")
291292
return false, nil
292293
}
293294
if err != nil {
294-
framework.Logf("error getting mount service account: %v", err)
295+
e2elog.Logf("error getting mount service account: %v", err)
295296
return false, err
296297
}
297298
if len(sa.Secrets) == 0 {
298-
framework.Logf("mount service account has no secret references")
299+
e2elog.Logf("mount service account has no secret references")
299300
return false, nil
300301
}
301302
for _, secretRef := range sa.Secrets {
302303
secret, err := f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Get(secretRef.Name, metav1.GetOptions{})
303304
if err != nil {
304-
framework.Logf("Error getting secret %s: %v", secretRef.Name, err)
305+
e2elog.Logf("Error getting secret %s: %v", secretRef.Name, err)
305306
continue
306307
}
307308
if secret.Type == v1.SecretTypeServiceAccountToken {
308309
return true, nil
309310
}
310311
}
311312

312-
framework.Logf("default service account has no secret references to valid service account tokens")
313+
e2elog.Logf("default service account has no secret references to valid service account tokens")
313314
return false, nil
314315
}))
315316

@@ -391,7 +392,7 @@ var _ = SIGDescribe("ServiceAccounts", func() {
391392
}
392393
createdPod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(pod)
393394
framework.ExpectNoError(err)
394-
framework.Logf("created pod %s", tc.PodName)
395+
e2elog.Logf("created pod %s", tc.PodName)
395396

396397
hasServiceAccountTokenVolume := false
397398
for _, c := range createdPod.Spec.Containers {
@@ -405,7 +406,7 @@ var _ = SIGDescribe("ServiceAccounts", func() {
405406
if hasServiceAccountTokenVolume != tc.ExpectTokenVolume {
406407
framework.Failf("%s: expected volume=%v, got %v (%#v)", tc.PodName, tc.ExpectTokenVolume, hasServiceAccountTokenVolume, createdPod)
407408
} else {
408-
framework.Logf("pod %s service account token volume mount: %v", tc.PodName, hasServiceAccountTokenVolume)
409+
e2elog.Logf("pod %s service account token volume mount: %v", tc.PodName, hasServiceAccountTokenVolume)
409410
}
410411
}
411412
})

‎test/e2e/network/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ go_library(
6161
"//test/e2e/framework/auth:go_default_library",
6262
"//test/e2e/framework/endpoints:go_default_library",
6363
"//test/e2e/framework/ingress:go_default_library",
64+
"//test/e2e/framework/log:go_default_library",
6465
"//test/e2e/framework/providers/gce:go_default_library",
6566
"//test/e2e/network/scale:go_default_library",
6667
"//test/images/net/nat:go_default_library",

0 commit comments

Comments
 (0)