github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #122866 from pohly/e2e-klog-fatal

Browse Source 
e2e: replace klog.Fatal with assertion
This commit is contained in:
Kubernetes Prow Robot 2024-01-19 19:22:14 +01:00 committed by GitHub
commit 2d4100335e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/e2e.go
View File

@ -183,9 +183,7 @@ func setupSuite(ctx context.Context) {
} }
c, err := framework.LoadClientset() c, err := framework.LoadClientset()
if err != nil { framework.ExpectNoError(err, "Error loading client")
klog.Fatal("Error loading client: ", err)
}
// Delete any namespaces except those created by the system. This ensures no // Delete any namespaces except those created by the system. This ensures no
// lingering resources are left over from a previous test run. // lingering resources are left over from a previous test run.
@ -380,9 +378,7 @@ func setupSuitePerGinkgoNode(ctx context.Context) {
// the dual stack clusters can be ipv4-ipv6 or ipv6-ipv4, order matters, // the dual stack clusters can be ipv4-ipv6 or ipv6-ipv4, order matters,
// and services use the primary IP family by default // and services use the primary IP family by default
c, err := framework.LoadClientset() c, err := framework.LoadClientset()
if err != nil { framework.ExpectNoError(err, "Error loading client")
klog.Fatal("Error loading client: ", err)
}
framework.TestContext.IPFamily = getDefaultClusterIPFamily(ctx, c) framework.TestContext.IPFamily = getDefaultClusterIPFamily(ctx, c)
framework.Logf("Cluster IP family: %s", framework.TestContext.IPFamily) framework.Logf("Cluster IP family: %s", framework.TestContext.IPFamily)
} }

4
test/e2e/framework/test_context.go
View File

@ -549,9 +549,7 @@ func AfterReadingAllFlags(t *TestContextType) {
if len(t.BearerToken) == 0 { if len(t.BearerToken) == 0 {
var err error var err error
t.BearerToken, err = GenerateSecureToken(16) t.BearerToken, err = GenerateSecureToken(16)
if err != nil { ExpectNoError(err, "Failed to generate bearer token")
klog.Fatalf("Failed to generate bearer token: %v", err)
}
} }
// Allow 1% of nodes to be unready (statistically) - relevant for large clusters. // Allow 1% of nodes to be unready (statistically) - relevant for large clusters.