github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #110875 from marquiz/devel/e2e

Browse Source 
test/e2e: fix GetCurrentKubeletConfig
This commit is contained in:
Kubernetes Prow Robot 2022-06-30 09:06:21 -07:00 committed by GitHub
commit 019141a13c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/e2e/framework/kubelet/config.go
View File

@ -38,7 +38,7 @@ import (
// GetCurrentKubeletConfig fetches the current Kubelet Config for the given node // GetCurrentKubeletConfig fetches the current Kubelet Config for the given node
func GetCurrentKubeletConfig(nodeName, namespace string, useProxy bool) (*kubeletconfig.KubeletConfiguration, error) { func GetCurrentKubeletConfig(nodeName, namespace string, useProxy bool) (*kubeletconfig.KubeletConfiguration, error) {
resp := pollConfigz(5*time.Minute, 5*time.Second, nodeName, namespace, useProxy) resp := pollConfigz(5*time.Minute, 5*time.Second, nodeName, namespace, useProxy)
if resp == nil { if len(resp) == 0 {
return nil, fmt.Errorf("failed to fetch /configz from %q", nodeName) return nil, fmt.Errorf("failed to fetch /configz from %q", nodeName)
} }
kubeCfg, err := decodeConfigz(resp) kubeCfg, err := decodeConfigz(resp)
@ -49,7 +49,7 @@ func GetCurrentKubeletConfig(nodeName, namespace string, useProxy bool) (*kubele
} }
// returns a status 200 response from the /configz endpoint or nil if fails // returns a status 200 response from the /configz endpoint or nil if fails
func pollConfigz(timeout time.Duration, pollInterval time.Duration, nodeName, namespace string, useProxy bool) *http.Response { func pollConfigz(timeout time.Duration, pollInterval time.Duration, nodeName, namespace string, useProxy bool) []byte {
endpoint := "" endpoint := ""
if useProxy { if useProxy {
// start local proxy, so we can send graceful deletion over query string, rather than body parameter // start local proxy, so we can send graceful deletion over query string, rather than body parameter
@ -88,26 +88,35 @@ func pollConfigz(timeout time.Duration, pollInterval time.Duration, nodeName, na
} }
req.Header.Add("Accept", "application/json") req.Header.Add("Accept", "application/json")
var resp *http.Response var respBody []byte
err = wait.PollImmediate(pollInterval, timeout, func() (bool, error) { err = wait.PollImmediate(pollInterval, timeout, func() (bool, error) {
resp, err = client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {
framework.Logf("Failed to get /configz, retrying. Error: %v", err) framework.Logf("Failed to get /configz, retrying. Error: %v", err)
return false, nil return false, nil
} }
defer resp.Body.Close()
if resp.StatusCode != 200 { if resp.StatusCode != 200 {
framework.Logf("/configz response status not 200, retrying. Response was: %+v", resp) framework.Logf("/configz response status not 200, retrying. Response was: %+v", resp)
return false, nil return false, nil
} }
respBody, err = io.ReadAll(resp.Body)
if err != nil {
framework.Logf("failed to read body from /configz response, retrying. Error: %v", err)
return false, nil
}
return true, nil return true, nil
}) })
framework.ExpectNoError(err, "Failed to get successful response from /configz") framework.ExpectNoError(err, "Failed to get successful response from /configz")
return resp
return respBody
} }
// Decodes the http response from /configz and returns a kubeletconfig.KubeletConfiguration (internal type). // Decodes the http response from /configz and returns a kubeletconfig.KubeletConfiguration (internal type).
func decodeConfigz(resp *http.Response) (*kubeletconfig.KubeletConfiguration, error) { func decodeConfigz(respBody []byte) (*kubeletconfig.KubeletConfiguration, error) {
// This hack because /configz reports the following structure: // This hack because /configz reports the following structure:
// {"kubeletconfig": {the JSON representation of kubeletconfigv1beta1.KubeletConfiguration}} // {"kubeletconfig": {the JSON representation of kubeletconfigv1beta1.KubeletConfiguration}}
type configzWrapper struct { type configzWrapper struct {
@ -117,12 +126,7 @@ func decodeConfigz(resp *http.Response) (*kubeletconfig.KubeletConfiguration, er
configz := configzWrapper{} configz := configzWrapper{}
kubeCfg := kubeletconfig.KubeletConfiguration{} kubeCfg := kubeletconfig.KubeletConfiguration{}
contentsBytes, err := io.ReadAll(resp.Body) err := json.Unmarshal(respBody, &configz)
if err != nil {
return nil, err
}
err = json.Unmarshal(contentsBytes, &configz)
if err != nil { if err != nil {
return nil, err return nil, err
} }