mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-04 23:17:50 +00:00
Revert "e2e: wait for pods with gomega"
This commit is contained in:
@@ -63,7 +63,7 @@ func NewE2EServices(monitorParent bool) *E2EServices {
|
||||
func (e *E2EServices) Start(featureGates map[string]bool) error {
|
||||
var err error
|
||||
if e.services, err = e.startInternalServices(); err != nil {
|
||||
return fmt.Errorf("failed to start internal services: %w", err)
|
||||
return fmt.Errorf("failed to start internal services: %v", err)
|
||||
}
|
||||
klog.Infof("Node services started.")
|
||||
// running the kubelet depends on whether we are running conformance test-suite
|
||||
@@ -73,7 +73,7 @@ func (e *E2EServices) Start(featureGates map[string]bool) error {
|
||||
// Start kubelet
|
||||
e.kubelet, err = e.startKubelet(featureGates)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to start kubelet: %w", err)
|
||||
return fmt.Errorf("failed to start kubelet: %v", err)
|
||||
}
|
||||
klog.Infof("Kubelet started.")
|
||||
}
|
||||
@@ -130,7 +130,7 @@ const (
|
||||
func (e *E2EServices) startInternalServices() (*server, error) {
|
||||
testBin, err := os.Executable()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("can't get current binary: %w", err)
|
||||
return nil, fmt.Errorf("can't get current binary: %v", err)
|
||||
}
|
||||
// Pass all flags into the child process, so that it will see the same flag set.
|
||||
startCmd := exec.Command(testBin,
|
||||
|
||||
Reference in New Issue
Block a user