github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-13 06:04:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #89192 from andrewsykim/e2e-framework-ports

Browse Source 
e2e/framework: remove imports to pkg/master/ports
This commit is contained in:
Kubernetes Prow Robot
2020-03-19 06:06:37 -07:00
committed by GitHub
parent b8a729b899 f0f6c6fc81
commit f01e0b2f70
9 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/framework/util.go
View File

@@ -64,7 +64,6 @@ import (
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
"k8s.io/kubernetes/pkg/client/conditions"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/master/ports"
taintutils "k8s.io/kubernetes/pkg/util/taints"
testutils "k8s.io/kubernetes/test/utils"
imageutils "k8s.io/kubernetes/test/utils/image"
@@ -971,7 +970,7 @@ func getKubeletPods(c clientset.Interface, node string) (*v1.PodList, error) {
client = c.CoreV1().RESTClient().Get().
Resource("nodes").
SubResource("proxy").
Name(fmt.Sprintf("%v:%v", node, ports.KubeletPort)).
Name(fmt.Sprintf("%v:%v", node, KubeletPort)).
Suffix("pods").
Do(context.TODO())
@@ -1313,7 +1312,7 @@ func RestartControllerManager() error {
// WaitForControllerManagerUp waits for the kube-controller-manager to be up.
func WaitForControllerManagerUp() error {
cmd := "curl http://localhost:" + strconv.Itoa(ports.InsecureKubeControllerManagerPort) + "/healthz"
cmd := "curl http://localhost:" + strconv.Itoa(InsecureKubeControllerManagerPort) + "/healthz"
for start := time.Now(); time.Since(start) < time.Minute; time.Sleep(5 * time.Second) {
result, err := e2essh.SSH(cmd, net.JoinHostPort(GetMasterHost(), sshPort), TestContext.Provider)
if err != nil || result.Code != 0 {