use log funcs of core framework in the auth, kubectl and windows pkg
This commit is contained in:
@@ -37,7 +37,6 @@ go_library(
|
||||
"//staging/src/k8s.io/kubelet/config/v1beta1:go_default_library",
|
||||
"//test/e2e/framework:go_default_library",
|
||||
"//test/e2e/framework/kubelet:go_default_library",
|
||||
"//test/e2e/framework/log:go_default_library",
|
||||
"//test/e2e/framework/metrics:go_default_library",
|
||||
"//test/e2e/framework/node:go_default_library",
|
||||
"//test/e2e/framework/pod:go_default_library",
|
||||
|
@@ -31,7 +31,6 @@ import (
|
||||
"k8s.io/client-go/tools/cache"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet"
|
||||
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
||||
e2emetrics "k8s.io/kubernetes/test/e2e/framework/metrics"
|
||||
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
|
||||
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||
@@ -121,7 +120,7 @@ func runDensityBatchTest(f *framework.Framework, testArg densityTest) (time.Dura
|
||||
}, 10*time.Minute, 10*time.Second).Should(gomega.BeTrue())
|
||||
|
||||
if len(watchTimes) < testArg.podsNr {
|
||||
e2elog.Failf("Timeout reached waiting for all Pods to be observed by the watch.")
|
||||
framework.Failf("Timeout reached waiting for all Pods to be observed by the watch.")
|
||||
}
|
||||
|
||||
// Analyze results
|
||||
|
@@ -23,7 +23,6 @@ import (
|
||||
v1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
||||
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||
|
||||
"github.com/onsi/ginkgo"
|
||||
@@ -54,11 +53,11 @@ var _ = SIGDescribe("DNS", func() {
|
||||
}
|
||||
testUtilsPod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(testUtilsPod)
|
||||
framework.ExpectNoError(err)
|
||||
e2elog.Logf("Created pod %v", testUtilsPod)
|
||||
framework.Logf("Created pod %v", testUtilsPod)
|
||||
defer func() {
|
||||
e2elog.Logf("Deleting pod %s...", testUtilsPod.Name)
|
||||
framework.Logf("Deleting pod %s...", testUtilsPod.Name)
|
||||
if err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Delete(testUtilsPod.Name, metav1.NewDeleteOptions(0)); err != nil {
|
||||
e2elog.Failf("Failed to delete pod %s: %v", testUtilsPod.Name, err)
|
||||
framework.Failf("Failed to delete pod %s: %v", testUtilsPod.Name, err)
|
||||
}
|
||||
}()
|
||||
framework.ExpectNoError(f.WaitForPodRunning(testUtilsPod.Name), "failed to wait for pod %s to be running", testUtilsPod.Name)
|
||||
@@ -75,17 +74,17 @@ var _ = SIGDescribe("DNS", func() {
|
||||
})
|
||||
framework.ExpectNoError(err)
|
||||
|
||||
e2elog.Logf("ipconfig /all:\n%s", stdout)
|
||||
framework.Logf("ipconfig /all:\n%s", stdout)
|
||||
dnsRegex, err := regexp.Compile(`DNS Servers[\s*.]*:(\s*[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})+`)
|
||||
|
||||
if dnsRegex.MatchString(stdout) {
|
||||
match := dnsRegex.FindString(stdout)
|
||||
|
||||
if !strings.Contains(match, testInjectedIP) {
|
||||
e2elog.Failf("customized DNS options not found in ipconfig /all, got: %s", match)
|
||||
framework.Failf("customized DNS options not found in ipconfig /all, got: %s", match)
|
||||
}
|
||||
} else {
|
||||
e2elog.Failf("cannot find DNS server info in ipconfig /all output: \n%s", stdout)
|
||||
framework.Failf("cannot find DNS server info in ipconfig /all output: \n%s", stdout)
|
||||
}
|
||||
// TODO: Add more test cases for other DNSPolicies.
|
||||
})
|
||||
|
@@ -52,7 +52,6 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
clientset "k8s.io/client-go/kubernetes"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
||||
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||
|
||||
"github.com/onsi/ginkgo"
|
||||
@@ -99,28 +98,28 @@ var _ = SIGDescribe("[Feature:Windows] [Feature:WindowsGMSA] GMSA Full [Slow]",
|
||||
deployScriptPath, err := downloadFile(gmsaWebhookDeployScriptURL)
|
||||
defer func() { os.Remove(deployScriptPath) }()
|
||||
if err != nil {
|
||||
e2elog.Failf(err.Error())
|
||||
framework.Failf(err.Error())
|
||||
}
|
||||
|
||||
ginkgo.By("deploying the GMSA webhook")
|
||||
webhookCleanUp, err := deployGmsaWebhook(f, deployScriptPath)
|
||||
defer webhookCleanUp()
|
||||
if err != nil {
|
||||
e2elog.Failf(err.Error())
|
||||
framework.Failf(err.Error())
|
||||
}
|
||||
|
||||
ginkgo.By("creating the GMSA custom resource")
|
||||
customResourceCleanup, err := createGmsaCustomResource(crdManifestContents)
|
||||
defer customResourceCleanup()
|
||||
if err != nil {
|
||||
e2elog.Failf(err.Error())
|
||||
framework.Failf(err.Error())
|
||||
}
|
||||
|
||||
ginkgo.By("creating an RBAC role to grant use access to that GMSA resource")
|
||||
rbacRoleName, rbacRoleCleanup, err := createRBACRoleForGmsa(f)
|
||||
defer rbacRoleCleanup()
|
||||
if err != nil {
|
||||
e2elog.Failf(err.Error())
|
||||
framework.Failf(err.Error())
|
||||
}
|
||||
|
||||
ginkgo.By("creating a service account")
|
||||
@@ -144,7 +143,7 @@ var _ = SIGDescribe("[Feature:Windows] [Feature:WindowsGMSA] GMSA Full [Slow]",
|
||||
|
||||
expectedSubstr := "The command completed successfully"
|
||||
if !strings.Contains(output, expectedSubstr) {
|
||||
e2elog.Failf("Expected %q to contain %q", output, expectedSubstr)
|
||||
framework.Failf("Expected %q to contain %q", output, expectedSubstr)
|
||||
}
|
||||
})
|
||||
})
|
||||
@@ -157,7 +156,7 @@ func findPreconfiguredGmsaNodes(c clientset.Interface) []v1.Node {
|
||||
}
|
||||
nodes, err := c.CoreV1().Nodes().List(nodeOpts)
|
||||
if err != nil {
|
||||
e2elog.Failf("Unable to list nodes: %v", err)
|
||||
framework.Failf("Unable to list nodes: %v", err)
|
||||
}
|
||||
return nodes.Items
|
||||
}
|
||||
@@ -211,7 +210,7 @@ func retrieveCRDManifestFileContents(f *framework.Framework, node v1.Node) strin
|
||||
// escape quotes and backward slashes
|
||||
output, err := runKubectlExecInNamespace(f.Namespace.Name, podName, "powershell", "Get-Content", strings.ReplaceAll(gmsaCrdManifestPath, `\`, "/"))
|
||||
if err != nil {
|
||||
e2elog.Failf("failed to retrieve the contents of %q on node %q: %v", gmsaCrdManifestPath, node.Name, err)
|
||||
framework.Failf("failed to retrieve the contents of %q on node %q: %v", gmsaCrdManifestPath, node.Name, err)
|
||||
}
|
||||
|
||||
// Windows to linux new lines
|
||||
@@ -250,7 +249,7 @@ func deployGmsaWebhook(f *framework.Framework, deployScriptPath string) (func(),
|
||||
|
||||
output, err := cmd.CombinedOutput()
|
||||
if err == nil {
|
||||
e2elog.Logf("GMSA webhook successfully deployed, output:\n%s", string(output))
|
||||
framework.Logf("GMSA webhook successfully deployed, output:\n%s", string(output))
|
||||
} else {
|
||||
err = errors.Wrapf(err, "unable to deploy GMSA webhook, output:\n%s", string(output))
|
||||
}
|
||||
@@ -332,7 +331,7 @@ func createServiceAccount(f *framework.Framework) string {
|
||||
},
|
||||
}
|
||||
if _, err := f.ClientSet.CoreV1().ServiceAccounts(f.Namespace.Name).Create(account); err != nil {
|
||||
e2elog.Failf("unable to create service account %q: %v", accountName, err)
|
||||
framework.Failf("unable to create service account %q: %v", accountName, err)
|
||||
}
|
||||
return accountName
|
||||
}
|
||||
|
@@ -29,7 +29,6 @@ import (
|
||||
v1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
||||
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||
|
||||
"github.com/onsi/ginkgo"
|
||||
@@ -104,12 +103,12 @@ var _ = SIGDescribe("[Feature:Windows] [Feature:WindowsGMSA] GMSA Kubelet [Slow]
|
||||
}, 1*time.Minute, 1*time.Second).Should(gomega.BeTrue())
|
||||
|
||||
if !strings.HasPrefix(output, domain) {
|
||||
e2elog.Failf("Expected %q to start with %q", output, domain)
|
||||
framework.Failf("Expected %q to start with %q", output, domain)
|
||||
}
|
||||
|
||||
expectedSubstr := "The command completed successfully"
|
||||
if !strings.Contains(output, expectedSubstr) {
|
||||
e2elog.Failf("Expected %q to contain %q", output, expectedSubstr)
|
||||
framework.Failf("Expected %q to contain %q", output, expectedSubstr)
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -35,7 +35,6 @@ import (
|
||||
kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1"
|
||||
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
||||
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||
|
||||
"github.com/onsi/ginkgo"
|
||||
@@ -85,7 +84,7 @@ type nodeMemory struct {
|
||||
func checkNodeAllocatableTest(f *framework.Framework) {
|
||||
|
||||
nodeMem := getNodeMemory(f)
|
||||
e2elog.Logf("nodeMem says: %+v", nodeMem)
|
||||
framework.Logf("nodeMem says: %+v", nodeMem)
|
||||
|
||||
// calculate the allocatable mem based on capacity - reserved amounts
|
||||
calculatedNodeAlloc := nodeMem.capacity.DeepCopy()
|
||||
@@ -126,7 +125,7 @@ func overrideAllocatableMemoryTest(f *framework.Framework, allocatablePods int)
|
||||
for _, e := range eventList.Items {
|
||||
// Look for an event that shows FailedScheduling
|
||||
if e.Type == "Warning" && e.Reason == "FailedScheduling" && e.InvolvedObject.Name == failurePods[0].ObjectMeta.Name {
|
||||
e2elog.Logf("Found %+v event with message %+v", e.Reason, e.Message)
|
||||
framework.Logf("Found %+v event with message %+v", e.Reason, e.Message)
|
||||
return true
|
||||
}
|
||||
}
|
||||
@@ -294,11 +293,11 @@ func pollConfigz(timeout time.Duration, pollInterval time.Duration, nodeName str
|
||||
gomega.Eventually(func() bool {
|
||||
resp, err = client.Do(req)
|
||||
if err != nil {
|
||||
e2elog.Logf("Failed to get /configz, retrying. Error: %v", err)
|
||||
framework.Logf("Failed to get /configz, retrying. Error: %v", err)
|
||||
return false
|
||||
}
|
||||
if resp.StatusCode != 200 {
|
||||
e2elog.Logf("/configz response status not 200, retrying. Response was: %+v", resp)
|
||||
framework.Logf("/configz response status not 200, retrying. Response was: %+v", resp)
|
||||
return false
|
||||
}
|
||||
|
||||
|
@@ -21,7 +21,6 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/util/uuid"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
||||
testutils "k8s.io/kubernetes/test/utils"
|
||||
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||
|
||||
@@ -46,13 +45,13 @@ var _ = SIGDescribe("[Feature:Windows] SecurityContext RunAsUserName", func() {
|
||||
ginkgo.By("Creating a pod with an invalid username")
|
||||
podInvalid := f.PodClient().Create(runAsUserNamePod(toPtr("FooLish")))
|
||||
|
||||
e2elog.Logf("Waiting for pod %s to enter the error state.", podInvalid.Name)
|
||||
framework.Logf("Waiting for pod %s to enter the error state.", podInvalid.Name)
|
||||
framework.ExpectNoError(f.WaitForPodTerminated(podInvalid.Name, ""))
|
||||
|
||||
podInvalid, _ = f.PodClient().Get(podInvalid.Name, metav1.GetOptions{})
|
||||
podTerminatedReason := testutils.TerminatedContainers(podInvalid)[runAsUserNameContainerName]
|
||||
if "ContainerCannotRun" != podTerminatedReason {
|
||||
e2elog.Failf("The container terminated reason was supposed to be: 'ContainerCannotRun', not: '%q'", podTerminatedReason)
|
||||
framework.Failf("The container terminated reason was supposed to be: 'ContainerCannotRun', not: '%q'", podTerminatedReason)
|
||||
}
|
||||
})
|
||||
|
||||
|
@@ -22,7 +22,6 @@ import (
|
||||
v1 "k8s.io/api/core/v1"
|
||||
clientset "k8s.io/client-go/kubernetes"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
||||
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
|
||||
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
|
||||
|
||||
@@ -46,7 +45,7 @@ var _ = SIGDescribe("Services", func() {
|
||||
jig := e2eservice.NewTestJig(cs, serviceName)
|
||||
nodeIP, err := e2enode.PickIP(jig.Client)
|
||||
if err != nil {
|
||||
e2elog.Logf("Unexpected error occurred: %v", err)
|
||||
framework.Logf("Unexpected error occurred: %v", err)
|
||||
}
|
||||
// TODO: write a wrapper for ExpectNoErrorWithOffset()
|
||||
framework.ExpectNoErrorWithOffset(0, err)
|
||||
|
Reference in New Issue
Block a user