Skip to content

Commit bb770c0

Browse files
ffromaniffromani
committed
e2e: getCurrentKubeletConfig: move in subpkg
Address review comments and move the helper function in the `framework/kubelet` package to avoid circular deps (see kubernetes#81245) Signed-off-by: Francesco Romani <[email protected]>
1 parent 08ba240 commit bb770c0

File tree

5 files changed

+24
-18
lines changed

5 files changed

+24
-18
lines changed

‎test/e2e/framework/BUILD‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ go_library(
99
"flake_reporting_util.go",
1010
"framework.go",
1111
"google_compute.go",
12-
"kubeletconfig.go",
1312
"log.go",
1413
"log_size_monitoring.go",
1514
"nodes_util.go",
@@ -65,7 +64,6 @@ go_library(
6564
"//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library",
6665
"//staging/src/k8s.io/client-go/tools/watch:go_default_library",
6766
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
68-
"//staging/src/k8s.io/kubelet/config/v1beta1:go_default_library",
6967
"//test/e2e/framework/auth:go_default_library",
7068
"//test/e2e/framework/ginkgowrapper:go_default_library",
7169
"//test/e2e/framework/kubectl:go_default_library",

‎test/e2e/framework/kubelet/BUILD‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
33
go_library(
44
name = "go_default_library",
55
srcs = [
6+
"config.go",
67
"kubelet_pods.go",
78
"stats.go",
89
],
910
importpath = "k8s.io/kubernetes/test/e2e/framework/kubelet",
1011
visibility = ["//visibility:public"],
1112
deps = [
13+
"//pkg/kubelet/apis/config:go_default_library",
1214
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
1315
"//pkg/kubelet/dockershim/metrics:go_default_library",
1416
"//pkg/master/ports:go_default_library",
@@ -17,8 +19,11 @@ go_library(
1719
"//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
1820
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
1921
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
22+
"//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library",
2023
"//staging/src/k8s.io/client-go/rest:go_default_library",
24+
"//staging/src/k8s.io/kubelet/config/v1beta1:go_default_library",
2125
"//test/e2e/framework:go_default_library",
26+
"//test/e2e/framework/kubectl:go_default_library",
2227
"//test/e2e/framework/metrics:go_default_library",
2328
],
2429
)

‎test/e2e/framework/kubeletconfig.go‎ renamed to ‎test/e2e/framework/kubelet/config.go‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package framework
17+
package kubelet
1818

1919
import (
2020
"crypto/tls"
@@ -31,6 +31,7 @@ import (
3131
kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1"
3232
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
3333

34+
"k8s.io/kubernetes/test/e2e/framework"
3435
e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl"
3536
)
3637

@@ -52,47 +53,47 @@ func pollConfigz(timeout time.Duration, pollInterval time.Duration, nodeName, na
5253
endpoint := ""
5354
if useProxy {
5455
// start local proxy, so we can send graceful deletion over query string, rather than body parameter
55-
Logf("Opening proxy to cluster")
56-
tk := e2ekubectl.NewTestKubeconfig(TestContext.CertDir, TestContext.Host, TestContext.KubeConfig, TestContext.KubeContext, TestContext.KubectlPath, namespace)
56+
framework.Logf("Opening proxy to cluster")
57+
tk := e2ekubectl.NewTestKubeconfig(framework.TestContext.CertDir, framework.TestContext.Host, framework.TestContext.KubeConfig, framework.TestContext.KubeContext, framework.TestContext.KubectlPath, namespace)
5758
cmd := tk.KubectlCmd("proxy", "-p", "0")
58-
stdout, stderr, err := StartCmdAndStreamOutput(cmd)
59-
ExpectNoError(err)
59+
stdout, stderr, err := framework.StartCmdAndStreamOutput(cmd)
60+
framework.ExpectNoError(err)
6061
defer stdout.Close()
6162
defer stderr.Close()
62-
defer TryKill(cmd)
63+
defer framework.TryKill(cmd)
6364

6465
buf := make([]byte, 128)
6566
var n int
6667
n, err = stdout.Read(buf)
67-
ExpectNoError(err)
68+
framework.ExpectNoError(err)
6869
output := string(buf[:n])
6970
proxyRegexp := regexp.MustCompile("Starting to serve on 127.0.0.1:([0-9]+)")
7071
match := proxyRegexp.FindStringSubmatch(output)
71-
ExpectEqual(len(match), 2)
72+
framework.ExpectEqual(len(match), 2)
7273
port, err := strconv.Atoi(match[1])
73-
ExpectNoError(err)
74-
Logf("http requesting node kubelet /configz")
74+
framework.ExpectNoError(err)
75+
framework.Logf("http requesting node kubelet /configz")
7576
endpoint = fmt.Sprintf("http://127.0.0.1:%d/api/v1/nodes/%s/proxy/configz", port, nodeName)
7677
} else {
77-
endpoint = fmt.Sprintf("http://127.0.0.1:8080/api/v1/nodes/%s/proxy/configz", TestContext.NodeName)
78+
endpoint = fmt.Sprintf("http://127.0.0.1:8080/api/v1/nodes/%s/proxy/configz", framework.TestContext.NodeName)
7879
}
7980
tr := &http.Transport{
8081
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
8182
}
8283
client := &http.Client{Transport: tr}
8384
req, err := http.NewRequest("GET", endpoint, nil)
84-
ExpectNoError(err)
85+
framework.ExpectNoError(err)
8586
req.Header.Add("Accept", "application/json")
8687

8788
var resp *http.Response
8889
wait.PollImmediate(pollInterval, timeout, func() (bool, error) {
8990
resp, err = client.Do(req)
9091
if err != nil {
91-
Logf("Failed to get /configz, retrying. Error: %v", err)
92+
framework.Logf("Failed to get /configz, retrying. Error: %v", err)
9293
return false, nil
9394
}
9495
if resp.StatusCode != 200 {
95-
Logf("/configz response status not 200, retrying. Response was: %+v", resp)
96+
framework.Logf("/configz response status not 200, retrying. Response was: %+v", resp)
9697
return false, nil
9798
}
9899

‎test/e2e/windows/memory_limits.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"k8s.io/apimachinery/pkg/labels"
2929
"k8s.io/apimachinery/pkg/util/uuid"
3030
"k8s.io/kubernetes/test/e2e/framework"
31+
e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet"
3132
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3233
imageutils "k8s.io/kubernetes/test/utils/image"
3334

@@ -188,7 +189,7 @@ func getNodeMemory(f *framework.Framework) nodeMemory {
188189

189190
nodeName := nodeList.Items[0].ObjectMeta.Name
190191

191-
kubeletConfig, err := framework.GetCurrentKubeletConfig(nodeName, f.Namespace.Name, true)
192+
kubeletConfig, err := e2ekubelet.GetCurrentKubeletConfig(nodeName, f.Namespace.Name, true)
192193
framework.ExpectNoError(err)
193194

194195
systemReserve, err := resource.ParseQuantity(kubeletConfig.SystemReserved["memory"])

‎test/e2e_node/util.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ import (
4949
"k8s.io/kubernetes/pkg/kubelet/remote"
5050
"k8s.io/kubernetes/pkg/kubelet/util"
5151
"k8s.io/kubernetes/test/e2e/framework"
52+
e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet"
5253
e2emetrics "k8s.io/kubernetes/test/e2e/framework/metrics"
5354
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
5455
imageutils "k8s.io/kubernetes/test/utils/image"
@@ -123,7 +124,7 @@ func getNodeDevices() (*kubeletpodresourcesv1alpha1.ListPodResourcesResponse, er
123124
// Returns the current KubeletConfiguration
124125
func getCurrentKubeletConfig() (*kubeletconfig.KubeletConfiguration, error) {
125126
// namespace only relevant if useProxy==true, so we don't bother
126-
return framework.GetCurrentKubeletConfig(framework.TestContext.NodeName, "", false)
127+
return e2ekubelet.GetCurrentKubeletConfig(framework.TestContext.NodeName, "", false)
127128
}
128129

129130
// Must be called within a Context. Allows the function to modify the KubeletConfiguration during the BeforeEach of the context.

0 commit comments

Comments
 (0)