mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-10-31 05:40:42 +00:00 
			
		
		
		
	Fixes static check failures in test/e2e_node/*
This commit is contained in:
		| @@ -114,10 +114,6 @@ test/e2e/storage/vsphere | |||||||
| test/e2e/upgrades | test/e2e/upgrades | ||||||
| test/e2e/upgrades/storage | test/e2e/upgrades/storage | ||||||
| test/e2e/windows | test/e2e/windows | ||||||
| test/e2e_node |  | ||||||
| test/e2e_node/environment |  | ||||||
| test/e2e_node/remote |  | ||||||
| test/e2e_node/runner/remote |  | ||||||
| test/images/agnhost/dns | test/images/agnhost/dns | ||||||
| test/images/agnhost/inclusterclient | test/images/agnhost/inclusterclient | ||||||
| test/images/agnhost/net/nat | test/images/agnhost/net/nat | ||||||
|   | |||||||
| @@ -1190,8 +1190,3 @@ func (tc *nodeConfigTestCase) checkConfigMetrics(f *framework.Framework) { | |||||||
| 		return nil | 		return nil | ||||||
| 	}, timeout, interval).Should(gomega.BeNil()) | 	}, timeout, interval).Should(gomega.BeNil()) | ||||||
| } | } | ||||||
|  |  | ||||||
| // constructs the expected SelfLink for a config map |  | ||||||
| func configMapAPIPath(cm *v1.ConfigMap) string { |  | ||||||
| 	return fmt.Sprintf("/api/v1/namespaces/%s/configmaps/%s", cm.Namespace, cm.Name) |  | ||||||
| } |  | ||||||
|   | |||||||
| @@ -144,6 +144,10 @@ func dns() error { | |||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	kubecmd, err := exec.Command("ps", "aux").CombinedOutput() | 	kubecmd, err := exec.Command("ps", "aux").CombinedOutput() | ||||||
|  | 	if err != nil { | ||||||
|  | 		// Executing ps aux shouldn't have failed | ||||||
|  | 		panic(err) | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	// look for the dns flag and parse the value | 	// look for the dns flag and parse the value | ||||||
| 	dns := dnsRegex.FindStringSubmatch(string(kubecmd)) | 	dns := dnsRegex.FindStringSubmatch(string(kubecmd)) | ||||||
|   | |||||||
| @@ -87,16 +87,24 @@ func checkIPTables() (err error) { | |||||||
| func checkPublicGCR() error { | func checkPublicGCR() error { | ||||||
| 	const image = "k8s.gcr.io/busybox" | 	const image = "k8s.gcr.io/busybox" | ||||||
| 	output, err := runCommand("docker", "images", "-q", image) | 	output, err := runCommand("docker", "images", "-q", image) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	if len(output) != 0 { | 	if len(output) != 0 { | ||||||
| 		if _, err := runCommand("docker", "rmi", "-f", image); err != nil { | 		if _, err := runCommand("docker", "rmi", "-f", image); err != nil { | ||||||
| 			return err | 			return err | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| 	output, err = runCommand("docker", "pull", image) | 	output, err = runCommand("docker", "pull", image) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return err | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	if len(output) == 0 { | 	if len(output) == 0 { | ||||||
| 		return fmt.Errorf("failed to pull %s", image) | 		return fmt.Errorf("failed to pull %s", image) | ||||||
| 	} | 	} | ||||||
| 	if _, err = runCommand("docker", "rmi", "-f", image); err != nil { | 	if _, err := runCommand("docker", "rmi", "-f", image); err != nil { | ||||||
| 		return err | 		return err | ||||||
| 	} | 	} | ||||||
| 	return nil | 	return nil | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package e2e_node | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"github.com/onsi/ginkgo" | 	"github.com/onsi/ginkgo" | ||||||
| 	"k8s.io/api/core/v1" | 	v1 "k8s.io/api/core/v1" | ||||||
| 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||||||
| 	"k8s.io/apimachinery/pkg/util/uuid" | 	"k8s.io/apimachinery/pkg/util/uuid" | ||||||
| 	"k8s.io/kubernetes/pkg/kubelet" | 	"k8s.io/kubernetes/pkg/kubelet" | ||||||
| @@ -158,6 +158,7 @@ var _ = framework.KubeDescribe("ContainerLogPath [NodeConformance]", func() { | |||||||
|  |  | ||||||
| 				// get podID from created Pod | 				// get podID from created Pod | ||||||
| 				createdLogPod, err := podClient.Get(logPodName, metav1.GetOptions{}) | 				createdLogPod, err := podClient.Get(logPodName, metav1.GetOptions{}) | ||||||
|  | 				framework.ExpectNoError(err, "Failed to get pod: %s", logPodName) | ||||||
| 				podNs := createdLogPod.Namespace | 				podNs := createdLogPod.Namespace | ||||||
| 				podName := createdLogPod.Name | 				podName := createdLogPod.Name | ||||||
| 				podID := string(createdLogPod.UID) | 				podID := string(createdLogPod.UID) | ||||||
|   | |||||||
| @@ -18,7 +18,6 @@ package e2e_node | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 	"time" |  | ||||||
|  |  | ||||||
| 	v1 "k8s.io/api/core/v1" | 	v1 "k8s.io/api/core/v1" | ||||||
| 	"k8s.io/apimachinery/pkg/api/resource" | 	"k8s.io/apimachinery/pkg/api/resource" | ||||||
| @@ -33,7 +32,6 @@ import ( | |||||||
| 	imageutils "k8s.io/kubernetes/test/utils/image" | 	imageutils "k8s.io/kubernetes/test/utils/image" | ||||||
|  |  | ||||||
| 	"github.com/onsi/ginkgo" | 	"github.com/onsi/ginkgo" | ||||||
| 	"github.com/onsi/gomega" |  | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // makePodToVerifyPids returns a pod that verifies specified cgroup with pids | // makePodToVerifyPids returns a pod that verifies specified cgroup with pids | ||||||
| @@ -82,28 +80,6 @@ func makePodToVerifyPids(baseName string, pidsLimit resource.Quantity) *v1.Pod { | |||||||
| 	return pod | 	return pod | ||||||
| } | } | ||||||
|  |  | ||||||
| // enablePodPidsLimitInKubelet enables pod pid limit feature for kubelet with a sensible default test limit |  | ||||||
| func enablePodPidsLimitInKubelet(f *framework.Framework) *kubeletconfig.KubeletConfiguration { |  | ||||||
| 	oldCfg, err := getCurrentKubeletConfig() |  | ||||||
| 	framework.ExpectNoError(err) |  | ||||||
| 	newCfg := oldCfg.DeepCopy() |  | ||||||
| 	if newCfg.FeatureGates == nil { |  | ||||||
| 		newCfg.FeatureGates = make(map[string]bool) |  | ||||||
| 		newCfg.FeatureGates["SupportPodPidsLimit"] = true |  | ||||||
| 	} |  | ||||||
| 	newCfg.PodPidsLimit = int64(1024) |  | ||||||
| 	// Update the Kubelet configuration. |  | ||||||
| 	framework.ExpectNoError(setKubeletConfiguration(f, newCfg)) |  | ||||||
|  |  | ||||||
| 	// Wait for the Kubelet to be ready. |  | ||||||
| 	gomega.Eventually(func() bool { |  | ||||||
| 		nodeList := framework.GetReadySchedulableNodesOrDie(f.ClientSet) |  | ||||||
| 		return len(nodeList.Items) == 1 |  | ||||||
| 	}, time.Minute, time.Second).Should(gomega.BeTrue()) |  | ||||||
|  |  | ||||||
| 	return oldCfg |  | ||||||
| } |  | ||||||
|  |  | ||||||
| func runPodPidsLimitTests(f *framework.Framework) { | func runPodPidsLimitTests(f *framework.Framework) { | ||||||
| 	ginkgo.It("should set pids.max for Pod", func() { | 	ginkgo.It("should set pids.max for Pod", func() { | ||||||
| 		ginkgo.By("by creating a G pod") | 		ginkgo.By("by creating a G pod") | ||||||
|   | |||||||
| @@ -136,7 +136,7 @@ const ( | |||||||
| ) | ) | ||||||
|  |  | ||||||
| func getTimestamp() string { | func getTimestamp() string { | ||||||
| 	return fmt.Sprintf(time.Now().Format(timestampFormat)) | 	return fmt.Sprint(time.Now().Format(timestampFormat)) | ||||||
| } | } | ||||||
|  |  | ||||||
| func newWorkspaceDir() string { | func newWorkspaceDir() string { | ||||||
|   | |||||||
| @@ -19,9 +19,9 @@ go_library( | |||||||
|         "//test/e2e_node/remote:go_default_library", |         "//test/e2e_node/remote:go_default_library", | ||||||
|         "//test/e2e_node/system:go_default_library", |         "//test/e2e_node/system:go_default_library", | ||||||
|         "//vendor/github.com/pborman/uuid:go_default_library", |         "//vendor/github.com/pborman/uuid:go_default_library", | ||||||
|         "//vendor/golang.org/x/oauth2:go_default_library", |  | ||||||
|         "//vendor/golang.org/x/oauth2/google:go_default_library", |         "//vendor/golang.org/x/oauth2/google:go_default_library", | ||||||
|         "//vendor/google.golang.org/api/compute/v0.beta:go_default_library", |         "//vendor/google.golang.org/api/compute/v0.beta:go_default_library", | ||||||
|  |         "//vendor/google.golang.org/api/option:go_default_library", | ||||||
|         "//vendor/k8s.io/klog:go_default_library", |         "//vendor/k8s.io/klog:go_default_library", | ||||||
|         "//vendor/sigs.k8s.io/yaml:go_default_library", |         "//vendor/sigs.k8s.io/yaml:go_default_library", | ||||||
|     ], |     ], | ||||||
|   | |||||||
| @@ -40,9 +40,9 @@ import ( | |||||||
| 	"k8s.io/kubernetes/test/e2e_node/system" | 	"k8s.io/kubernetes/test/e2e_node/system" | ||||||
|  |  | ||||||
| 	"github.com/pborman/uuid" | 	"github.com/pborman/uuid" | ||||||
| 	"golang.org/x/oauth2" |  | ||||||
| 	"golang.org/x/oauth2/google" | 	"golang.org/x/oauth2/google" | ||||||
| 	compute "google.golang.org/api/compute/v0.beta" | 	compute "google.golang.org/api/compute/v0.beta" | ||||||
|  | 	"google.golang.org/api/option" | ||||||
| 	"k8s.io/klog" | 	"k8s.io/klog" | ||||||
| 	"sigs.k8s.io/yaml" | 	"sigs.k8s.io/yaml" | ||||||
| ) | ) | ||||||
| @@ -724,12 +724,12 @@ func getComputeClient() (*compute.Service, error) { | |||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		var client *http.Client | 		var client *http.Client | ||||||
| 		client, err = google.DefaultClient(oauth2.NoContext, compute.ComputeScope) | 		client, err = google.DefaultClient(context.Background(), compute.ComputeScope) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			continue | 			continue | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		cs, err = compute.New(client) | 		cs, err = compute.NewService(context.Background(), option.WithHTTPClient(client)) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			continue | 			continue | ||||||
| 		} | 		} | ||||||
|   | |||||||
| @@ -65,7 +65,6 @@ var kubeletAddress = flag.String("kubelet-address", "http://127.0.0.1:10255", "H | |||||||
| var startServices = flag.Bool("start-services", true, "If true, start local node services") | var startServices = flag.Bool("start-services", true, "If true, start local node services") | ||||||
| var stopServices = flag.Bool("stop-services", true, "If true, stop local node services after running tests") | var stopServices = flag.Bool("stop-services", true, "If true, stop local node services after running tests") | ||||||
| var busyboxImage = imageutils.GetE2EImage(imageutils.BusyBox) | var busyboxImage = imageutils.GetE2EImage(imageutils.BusyBox) | ||||||
| var perlImage = imageutils.GetE2EImage(imageutils.Perl) |  | ||||||
|  |  | ||||||
| const ( | const ( | ||||||
| 	// Kubelet internal cgroup name for node allocatable cgroup. | 	// Kubelet internal cgroup name for node allocatable cgroup. | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user