github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #109322 from hoskeri/conformance-test-healthz

Browse Source 
conformance-test: use kubelet healthz port.
This commit is contained in:
Kubernetes Prow Robot 2022-05-03 19:31:06 -07:00 committed by GitHub
commit e5115587b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cluster/ports/ports.go
View File

@ -31,6 +31,9 @@ const (
// until heapster can transition to using the SSL endpoint. // until heapster can transition to using the SSL endpoint.
// TODO(roberthbailey): Remove this once we have a better solution for heapster. // TODO(roberthbailey): Remove this once we have a better solution for heapster.
KubeletReadOnlyPort = 10255 KubeletReadOnlyPort = 10255
// KubeletHealthzPort exposes a healthz endpoint from the kubelet.
// May be overridden by a flag at startup.
KubeletHealthzPort = 10248
// ProxyHealthzPort is the default port for the proxy healthz server. // ProxyHealthzPort is the default port for the proxy healthz server.
// May be overridden by a flag at startup. // May be overridden by a flag at startup.
ProxyHealthzPort = 10256 ProxyHealthzPort = 10256

4
test/e2e_node/conformance/run_test.sh
View File

@ -126,10 +126,10 @@ start_kubelet() {
fi fi
} }
# wait_kubelet retries for 10 times for kubelet to be ready by checking http://127.0.0.1:10255/healthz. # wait_kubelet retries for 10 times for kubelet to be ready by checking http://127.0.0.1:10248/healthz.
wait_kubelet() { wait_kubelet() {
echo "Health checking kubelet..." echo "Health checking kubelet..."
healthCheckURL=http://127.0.0.1:10255/healthz healthCheckURL=http://127.0.0.1:10248/healthz
local maxRetry=10 local maxRetry=10
local cur=1 local cur=1
while [ $cur -le $maxRetry ]; do while [ $cur -le $maxRetry ]; do

7
test/e2e_node/services/kubelet.go
View File

@ -88,14 +88,13 @@ func RunKubelet() {
} }
const ( const (
// Ports of different e2e services.
kubeletReadOnlyPort = "10255"
// KubeletRootDirectory specifies the directory where the kubelet runtime information is stored. // KubeletRootDirectory specifies the directory where the kubelet runtime information is stored.
KubeletRootDirectory = "/var/lib/kubelet" KubeletRootDirectory = "/var/lib/kubelet"
// Health check url of kubelet
kubeletHealthCheckURL = "http://127.0.0.1:" + kubeletReadOnlyPort + "/healthz"
) )
// Health check url of kubelet
var kubeletHealthCheckURL = fmt.Sprintf("http://127.0.0.1:%d/healthz", ports.KubeletHealthzPort)
func baseKubeConfiguration(cfgPath string) (*kubeletconfig.KubeletConfiguration, error) { func baseKubeConfiguration(cfgPath string) (*kubeletconfig.KubeletConfiguration, error) {
cfgPath, err := filepath.Abs(cfgPath) cfgPath, err := filepath.Abs(cfgPath)
if err != nil { if err != nil {

7
test/e2e_node/util.go
View File

@ -41,6 +41,7 @@ import (
kubeletpodresourcesv1 "k8s.io/kubelet/pkg/apis/podresources/v1" kubeletpodresourcesv1 "k8s.io/kubelet/pkg/apis/podresources/v1"
kubeletpodresourcesv1alpha1 "k8s.io/kubelet/pkg/apis/podresources/v1alpha1" kubeletpodresourcesv1alpha1 "k8s.io/kubelet/pkg/apis/podresources/v1alpha1"
stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1" stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/cluster/ports"
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
"k8s.io/kubernetes/pkg/kubelet/apis/podresources" "k8s.io/kubernetes/pkg/kubelet/apis/podresources"
"k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/cm"
@ -70,13 +71,13 @@ const (
defaultPodResourcesPath = "/var/lib/kubelet/pod-resources" defaultPodResourcesPath = "/var/lib/kubelet/pod-resources"
defaultPodResourcesTimeout = 10 * time.Second defaultPodResourcesTimeout = 10 * time.Second
defaultPodResourcesMaxSize = 1024 * 1024 * 16 // 16 Mb defaultPodResourcesMaxSize = 1024 * 1024 * 16 // 16 Mb
kubeletReadOnlyPort = "10255"
kubeletHealthCheckURL = "http://127.0.0.1:" + kubeletReadOnlyPort + "/healthz"
// state files // state files
cpuManagerStateFile = "/var/lib/kubelet/cpu_manager_state" cpuManagerStateFile = "/var/lib/kubelet/cpu_manager_state"
memoryManagerStateFile = "/var/lib/kubelet/memory_manager_state" memoryManagerStateFile = "/var/lib/kubelet/memory_manager_state"
) )
var kubeletHealthCheckURL = fmt.Sprintf("http://127.0.0.1:%d/healthz", ports.KubeletHealthzPort)
func getNodeSummary() (*stats.Summary, error) { func getNodeSummary() (*stats.Summary, error) {
kubeletConfig, err := getCurrentKubeletConfig() kubeletConfig, err := getCurrentKubeletConfig()
if err != nil { if err != nil {
@ -259,7 +260,7 @@ func logKubeletLatencyMetrics(metricNames ...string) {
for _, key := range metricNames { for _, key := range metricNames {
metricSet.Insert(kubeletmetrics.KubeletSubsystem + "_" + key) metricSet.Insert(kubeletmetrics.KubeletSubsystem + "_" + key)
} }
metric, err := e2emetrics.GrabKubeletMetricsWithoutProxy(framework.TestContext.NodeName+":10255", "/metrics") metric, err := e2emetrics.GrabKubeletMetricsWithoutProxy(fmt.Sprintf("%s:%d", framework.TestContext.NodeName, ports.KubeletReadOnlyPort), "/metrics")
if err != nil { if err != nil {
framework.Logf("Error getting kubelet metrics: %v", err) framework.Logf("Error getting kubelet metrics: %v", err)
} else { } else {