diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 835c94f0efb..06ca8dd1c2c 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -74,7 +74,6 @@ go_library( "gke_node_pools.go", "ha_master.go", "ingress.go", - "initial_resources.go", "job.go", "kibana_logging.go", "kube_proxy.go", diff --git a/test/e2e/initial_resources.go b/test/e2e/initial_resources.go deleted file mode 100644 index 17ffd6aea2a..00000000000 --- a/test/e2e/initial_resources.go +++ /dev/null @@ -1,74 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package e2e - -import ( - "fmt" - "time" - - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/test/e2e/common" - "k8s.io/kubernetes/test/e2e/framework" -) - -// [Feature:InitialResources]: Initial resources is an experimental feature, so -// these tests are not run by default. -// -// Flaky issue #20272 -var _ = framework.KubeDescribe("Initial Resources [Feature:InitialResources] [Flaky]", func() { - f := framework.NewDefaultFramework("initial-resources") - - It("should set initial resources based on historical data", func() { - // TODO(piosz): Add cleanup data in InfluxDB that left from previous tests. - cpu := 100 - mem := 200 - for i := 0; i < 10; i++ { - rc := common.NewStaticResourceConsumer(fmt.Sprintf("ir-%d", i), 1, cpu, mem, 0, int64(2*cpu), int64(2*mem), f) - defer rc.CleanUp() - } - // Wait some time to make sure usage data is gathered. - time.Sleep(10 * time.Minute) - - pod := runPod(f, "ir-test", common.GetResourceConsumerImage()) - r := pod.Spec.Containers[0].Resources.Requests - Expect(r.Cpu().MilliValue()).Should(BeNumerically("~", cpu, 10)) - Expect(r.Memory().Value()).Should(BeNumerically("~", mem*1024*1024, 20*1024*1024)) - }) -}) - -func runPod(f *framework.Framework, name, image string) *v1.Pod { - pod := &v1.Pod{ - ObjectMeta: metav1.ObjectMeta{ - Name: name, - }, - Spec: v1.PodSpec{ - Containers: []v1.Container{ - { - Name: name, - Image: image, - }, - }, - }, - } - createdPod, err := f.ClientSet.Core().Pods(f.Namespace.Name).Create(pod) - framework.ExpectNoError(err) - framework.ExpectNoError(framework.WaitForPodRunningInNamespace(f.ClientSet, createdPod)) - return createdPod -}