mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 21:17:23 +00:00
Merge pull request #81814 from oomichi/replace-e2elog-framework-job-node
Use log functions of core framework on sub [j-l]
This commit is contained in:
commit
2bd3226564
@ -20,7 +20,6 @@ go_library(
|
|||||||
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
|
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
|
||||||
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
|
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
|
||||||
"//test/e2e/framework:go_default_library",
|
"//test/e2e/framework:go_default_library",
|
||||||
"//test/e2e/framework/log:go_default_library",
|
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -26,7 +26,6 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/util/wait"
|
"k8s.io/apimachinery/pkg/util/wait"
|
||||||
clientset "k8s.io/client-go/kubernetes"
|
clientset "k8s.io/client-go/kubernetes"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// GetJob uses c to get the Job in namespace ns named name. If the returned error is nil, the returned Job is valid.
|
// GetJob uses c to get the Job in namespace ns named name. If the returned error is nil, the returned Job is valid.
|
||||||
@ -64,7 +63,7 @@ func UpdateJobWithRetries(c clientset.Interface, namespace, name string, applyUp
|
|||||||
// Apply the update, then attempt to push it to the apiserver.
|
// Apply the update, then attempt to push it to the apiserver.
|
||||||
applyUpdate(job)
|
applyUpdate(job)
|
||||||
if job, err = jobs.Update(job); err == nil {
|
if job, err = jobs.Update(job); err == nil {
|
||||||
e2elog.Logf("Updating job %s", name)
|
framework.Logf("Updating job %s", name)
|
||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
updateErr = err
|
updateErr = err
|
||||||
|
@ -10,7 +10,6 @@ go_library(
|
|||||||
"//staging/src/k8s.io/apimachinery/pkg/version:go_default_library",
|
"//staging/src/k8s.io/apimachinery/pkg/version:go_default_library",
|
||||||
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
|
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
|
||||||
"//test/e2e/framework:go_default_library",
|
"//test/e2e/framework:go_default_library",
|
||||||
"//test/e2e/framework/log:go_default_library",
|
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -27,40 +27,39 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/version"
|
"k8s.io/apimachinery/pkg/version"
|
||||||
clientset "k8s.io/client-go/kubernetes"
|
clientset "k8s.io/client-go/kubernetes"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// RealVersion turns a version constants into a version string deployable on
|
// RealVersion turns a version constants into a version string deployable on
|
||||||
// GKE. See hack/get-build.sh for more information.
|
// GKE. See hack/get-build.sh for more information.
|
||||||
func RealVersion(s string) (string, error) {
|
func RealVersion(s string) (string, error) {
|
||||||
e2elog.Logf("Getting real version for %q", s)
|
framework.Logf("Getting real version for %q", s)
|
||||||
v, _, err := framework.RunCmd(path.Join(framework.TestContext.RepoRoot, "hack/get-build.sh"), "-v", s)
|
v, _, err := framework.RunCmd(path.Join(framework.TestContext.RepoRoot, "hack/get-build.sh"), "-v", s)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return v, fmt.Errorf("error getting real version for %q: %v", s, err)
|
return v, fmt.Errorf("error getting real version for %q: %v", s, err)
|
||||||
}
|
}
|
||||||
e2elog.Logf("Version for %q is %q", s, v)
|
framework.Logf("Version for %q is %q", s, v)
|
||||||
return strings.TrimPrefix(strings.TrimSpace(v), "v"), nil
|
return strings.TrimPrefix(strings.TrimSpace(v), "v"), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func traceRouteToMaster() {
|
func traceRouteToMaster() {
|
||||||
traceroute, err := exec.LookPath("traceroute")
|
traceroute, err := exec.LookPath("traceroute")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e2elog.Logf("Could not find traceroute program")
|
framework.Logf("Could not find traceroute program")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
cmd := exec.Command(traceroute, "-I", framework.GetMasterHost())
|
cmd := exec.Command(traceroute, "-I", framework.GetMasterHost())
|
||||||
out, err := cmd.Output()
|
out, err := cmd.Output()
|
||||||
if len(out) != 0 {
|
if len(out) != 0 {
|
||||||
e2elog.Logf(string(out))
|
framework.Logf(string(out))
|
||||||
}
|
}
|
||||||
if exiterr, ok := err.(*exec.ExitError); err != nil && ok {
|
if exiterr, ok := err.(*exec.ExitError); err != nil && ok {
|
||||||
e2elog.Logf("Error while running traceroute: %s", exiterr.Stderr)
|
framework.Logf("Error while running traceroute: %s", exiterr.Stderr)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// CheckMasterVersion validates the master version
|
// CheckMasterVersion validates the master version
|
||||||
func CheckMasterVersion(c clientset.Interface, want string) error {
|
func CheckMasterVersion(c clientset.Interface, want string) error {
|
||||||
e2elog.Logf("Checking master version")
|
framework.Logf("Checking master version")
|
||||||
var err error
|
var err error
|
||||||
var v *version.Info
|
var v *version.Info
|
||||||
waitErr := wait.PollImmediate(5*time.Second, 2*time.Minute, func() (bool, error) {
|
waitErr := wait.PollImmediate(5*time.Second, 2*time.Minute, func() (bool, error) {
|
||||||
@ -81,7 +80,7 @@ func CheckMasterVersion(c clientset.Interface, want string) error {
|
|||||||
if !strings.HasPrefix(got, want) {
|
if !strings.HasPrefix(got, want) {
|
||||||
return fmt.Errorf("master had kube-apiserver version %s which does not start with %s", got, want)
|
return fmt.Errorf("master had kube-apiserver version %s which does not start with %s", got, want)
|
||||||
}
|
}
|
||||||
e2elog.Logf("Master is at version %s", want)
|
framework.Logf("Master is at version %s", want)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user