136f89dfc5
The recently introduced failure handling in ExpectNoError depends on error
wrapping: if an error prefix gets added with `fmt.Errorf("foo: %v", err)`, then
ExpectNoError cannot detect that the root cause is an assertion failure and
then will add another useless "unexpected error" prefix and will not dump the
additional failure information (currently the backtrace inside the E2E
framework).
Instead of manually deciding on a case-by-case basis where %w is needed, all
error wrapping was updated automatically with
sed -i "s/fmt.Errorf\(.*\): '*\(%s\|%v\)'*\",\(.* err)\)/fmt.Errorf\1: %w\",\3/" $(git grep -l 'fmt.Errorf' test/e2e*)
This may be unnecessary in some cases, but it's not wrong.
63 lines
2.3 KiB
Go
63 lines
2.3 KiB
Go
/*
|
|
Copyright 2020 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package kubesystem
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net"
|
|
"strconv"
|
|
"time"
|
|
|
|
"k8s.io/kubernetes/test/e2e/framework"
|
|
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
|
|
)
|
|
|
|
// RestartControllerManager restarts the kube-controller-manager.
|
|
func RestartControllerManager(ctx context.Context) error {
|
|
// TODO: Make it work for all providers and distros.
|
|
if !framework.ProviderIs("gce", "aws") {
|
|
return fmt.Errorf("unsupported provider for RestartControllerManager: %s", framework.TestContext.Provider)
|
|
}
|
|
if framework.ProviderIs("gce") && !framework.MasterOSDistroIs("gci") {
|
|
return fmt.Errorf("unsupported master OS distro: %s", framework.TestContext.MasterOSDistro)
|
|
}
|
|
cmd := "pidof kube-controller-manager | xargs sudo kill"
|
|
framework.Logf("Restarting controller-manager via ssh, running: %v", cmd)
|
|
result, err := e2essh.SSH(ctx, cmd, net.JoinHostPort(framework.APIAddress(), e2essh.SSHPort), framework.TestContext.Provider)
|
|
if err != nil || result.Code != 0 {
|
|
e2essh.LogResult(result)
|
|
return fmt.Errorf("couldn't restart controller-manager: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// WaitForControllerManagerUp waits for the kube-controller-manager to be up.
|
|
func WaitForControllerManagerUp(ctx context.Context) error {
|
|
cmd := "curl -k https://localhost:" + strconv.Itoa(framework.KubeControllerManagerPort) + "/healthz"
|
|
for start := time.Now(); time.Since(start) < time.Minute && ctx.Err() == nil; time.Sleep(5 * time.Second) {
|
|
result, err := e2essh.SSH(ctx, cmd, net.JoinHostPort(framework.APIAddress(), e2essh.SSHPort), framework.TestContext.Provider)
|
|
if err != nil || result.Code != 0 {
|
|
e2essh.LogResult(result)
|
|
}
|
|
if result.Stdout == "ok" {
|
|
return nil
|
|
}
|
|
}
|
|
return fmt.Errorf("waiting for controller-manager timed out")
|
|
}
|