github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #95613 from MHBauer/CAP_NET_RAW

Browse Source 
CAP_NET_RAW should be NET_RAW
This commit is contained in:
Kubernetes Prow Robot
2020-12-08 16:29:28 -08:00
committed by GitHub
parent e40cba59e3 1ac20e931e
commit 5cdc3e6e20
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e_node/summary_test.go
View File

@@ -60,6 +60,7 @@ var _ = framework.KubeDescribe("Summary API [NodeConformance]", func() {
pods := getSummaryTestPods(f, numRestarts, pod0, pod1) pods := getSummaryTestPods(f, numRestarts, pod0, pod1)
f.PodClient().CreateBatch(pods) f.PodClient().CreateBatch(pods)
ginkgo.By("restarting the containers to ensure container metrics are still being gathered after a container is restarted")
gomega.Eventually(func() error { gomega.Eventually(func() error {
for _, pod := range pods { for _, pod := range pods {
err := verifyPodRestartCount(f, pod.Name, len(pod.Spec.Containers), numRestarts) err := verifyPodRestartCount(f, pod.Name, len(pod.Spec.Containers), numRestarts)
@@ -70,7 +71,7 @@ var _ = framework.KubeDescribe("Summary API [NodeConformance]", func() {
return nil return nil
}, time.Minute, 5*time.Second).Should(gomega.BeNil()) }, time.Minute, 5*time.Second).Should(gomega.BeNil())
// Wait for cAdvisor to collect 2 stats points ginkgo.By("Waiting 15 seconds for cAdvisor to collect 2 stats points")
time.Sleep(15 * time.Second) time.Sleep(15 * time.Second)
// Setup expectations. // Setup expectations.
@@ -78,7 +79,7 @@ var _ = framework.KubeDescribe("Summary API [NodeConformance]", func() {
maxStartAge = time.Hour * 24 * 365 // 1 year maxStartAge = time.Hour * 24 * 365 // 1 year
maxStatsAge = time.Minute maxStatsAge = time.Minute
) )
// fetch node so we can know proper node memory bounds for unconstrained cgroups ginkgo.By("Fetching node so we can match against an appropriate memory limit")
node := getLocalNode(f) node := getLocalNode(f)
memoryCapacity := node.Status.Capacity["memory"] memoryCapacity := node.Status.Capacity["memory"]
memoryLimit := memoryCapacity.Value() memoryLimit := memoryCapacity.Value()
@@ -305,7 +306,7 @@ var _ = framework.KubeDescribe("Summary API [NodeConformance]", func() {
"Time": recent(maxStatsAge), "Time": recent(maxStatsAge),
"AvailableBytes": fsCapacityBounds, "AvailableBytes": fsCapacityBounds,
"CapacityBytes": fsCapacityBounds, "CapacityBytes": fsCapacityBounds,
// we assume we are not running tests on machines < 10tb of disk // we assume we are not running tests on machines more than 10tb of disk
"UsedBytes": bounded(e2evolume.Kb, 10*e2evolume.Tb), "UsedBytes": bounded(e2evolume.Kb, 10*e2evolume.Tb),
"InodesFree": bounded(1e4, 1e8), "InodesFree": bounded(1e4, 1e8),
"Inodes": bounded(1e4, 1e8), "Inodes": bounded(1e4, 1e8),
@@ -316,7 +317,7 @@ var _ = framework.KubeDescribe("Summary API [NodeConformance]", func() {
"Time": recent(maxStatsAge), "Time": recent(maxStatsAge),
"AvailableBytes": fsCapacityBounds, "AvailableBytes": fsCapacityBounds,
"CapacityBytes": fsCapacityBounds, "CapacityBytes": fsCapacityBounds,
// we assume we are not running tests on machines < 10tb of disk // we assume we are not running tests on machines more than 10tb of disk
"UsedBytes": bounded(e2evolume.Kb, 10*e2evolume.Tb), "UsedBytes": bounded(e2evolume.Kb, 10*e2evolume.Tb),
"InodesFree": bounded(1e4, 1e8), "InodesFree": bounded(1e4, 1e8),
"Inodes": bounded(1e4, 1e8), "Inodes": bounded(1e4, 1e8),
@@ -360,7 +361,7 @@ func getSummaryTestPods(f *framework.Framework, numRestarts int32, names ...stri
Image: busyboxImage, Image: busyboxImage,
SecurityContext: &v1.SecurityContext{ SecurityContext: &v1.SecurityContext{
Capabilities: &v1.Capabilities{ Capabilities: &v1.Capabilities{
Add: []v1.Capability{"CAP_NET_RAW"}, Add: []v1.Capability{"NET_RAW"},
}, },
}, },
Command: getRestartingContainerCommand("/test-empty-dir-mnt", 0, numRestarts, "echo 'some bytes' >/outside_the_volume.txt; ping -c 1 google.com; echo 'hello world' >> /test-empty-dir-mnt/file;"), Command: getRestartingContainerCommand("/test-empty-dir-mnt", 0, numRestarts, "echo 'some bytes' >/outside_the_volume.txt; ping -c 1 google.com; echo 'hello world' >> /test-empty-dir-mnt/file;"),