diff --git a/test/e2e/addon_update.go b/test/e2e/addon_update.go index a30f8128ac..116485dd6b 100644 --- a/test/e2e/addon_update.go +++ b/test/e2e/addon_update.go @@ -192,7 +192,7 @@ var _ = Describe("Addon update", func() { var dir string var sshClient *ssh.Client - f := NewFramework("addon-update-test") + f := NewDefaultFramework("addon-update-test") BeforeEach(func() { // This test requires: diff --git a/test/e2e/cadvisor.go b/test/e2e/cadvisor.go index df83a9b820..749f63f2d1 100644 --- a/test/e2e/cadvisor.go +++ b/test/e2e/cadvisor.go @@ -33,7 +33,7 @@ const ( var _ = Describe("Cadvisor", func() { - f := NewFramework("cadvisor") + f := NewDefaultFramework("cadvisor") It("should be healthy on every node.", func() { CheckCadvisorHealthOnAllNodes(f.Client, 5*time.Minute) diff --git a/test/e2e/cluster_size_autoscaling.go b/test/e2e/cluster_size_autoscaling.go index e7e3607db9..704e2a8cea 100644 --- a/test/e2e/cluster_size_autoscaling.go +++ b/test/e2e/cluster_size_autoscaling.go @@ -38,7 +38,7 @@ const ( // // These tests take ~20 minutes to run each. var _ = Describe("Cluster size autoscaling [Feature:ClusterSizeAutoscaling] [Slow]", func() { - f := NewFramework("autoscaling") + f := NewDefaultFramework("autoscaling") var nodeCount int var coresPerNode int var memCapacityMb int diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go index f8692ca588..1171ab0e57 100644 --- a/test/e2e/cluster_upgrade.go +++ b/test/e2e/cluster_upgrade.go @@ -160,7 +160,7 @@ var _ = Describe("Upgrade [Feature:Upgrade]", func() { Logf("Version for %q is %q", testContext.UpgradeTarget, v) }) - f := NewFramework("cluster-upgrade") + f := NewDefaultFramework("cluster-upgrade") var w *ServiceTestFixture BeforeEach(func() { By("Setting up the service, RC, and pods") diff --git a/test/e2e/configmap.go b/test/e2e/configmap.go index ae1279e72c..2fba34d37b 100644 --- a/test/e2e/configmap.go +++ b/test/e2e/configmap.go @@ -29,7 +29,7 @@ import ( var _ = Describe("ConfigMap", func() { - f := NewFramework("configmap") + f := NewDefaultFramework("configmap") It("should be consumable from pods in volume [Conformance]", func() { name := "configmap-test-volume-" + string(util.NewUUID()) diff --git a/test/e2e/container_probe.go b/test/e2e/container_probe.go index 9b50efa123..b8fa739cb4 100644 --- a/test/e2e/container_probe.go +++ b/test/e2e/container_probe.go @@ -36,7 +36,7 @@ const ( ) var _ = Describe("Probing container", func() { - framework := NewFramework("container-probe") + framework := NewDefaultFramework("container-probe") var podClient client.PodInterface probe := webserverProbeBuilder{} diff --git a/test/e2e/daemon_restart.go b/test/e2e/daemon_restart.go index 6bd4ebe685..c4b7200550 100644 --- a/test/e2e/daemon_restart.go +++ b/test/e2e/daemon_restart.go @@ -185,7 +185,7 @@ func getContainerRestarts(c *client.Client, ns string, labelSelector labels.Sele var _ = Describe("DaemonRestart [Disruptive]", func() { - framework := NewFramework("daemonrestart") + framework := NewDefaultFramework("daemonrestart") rcName := "daemonrestart" + strconv.Itoa(numPods) + "-" + string(util.NewUUID()) labelSelector := labels.Set(map[string]string{"name": rcName}).AsSelector() existingPods := cache.NewStore(cache.MetaNamespaceKeyFunc) diff --git a/test/e2e/daemon_set.go b/test/e2e/daemon_set.go index c79af5c068..fba66fc1c0 100644 --- a/test/e2e/daemon_set.go +++ b/test/e2e/daemon_set.go @@ -66,7 +66,7 @@ var _ = Describe("Daemon set", func() { Expect(err).NotTo(HaveOccurred()) }) - f = NewFramework("daemonsets") + f = NewDefaultFramework("daemonsets") image := "gcr.io/google_containers/serve_hostname:1.1" dsName := "daemon-set" diff --git a/test/e2e/dashboard.go b/test/e2e/dashboard.go index a4bf75dff8..23360a48b9 100644 --- a/test/e2e/dashboard.go +++ b/test/e2e/dashboard.go @@ -37,7 +37,7 @@ var _ = Describe("Kubernetes Dashboard", func() { serverStartTimeout = 1 * time.Minute ) - f := NewFramework(uiServiceName) + f := NewDefaultFramework(uiServiceName) It("should check that the kubernetes-dashboard instance is alive", func() { By("Checking whether the kubernetes-dashboard service exists.") diff --git a/test/e2e/density.go b/test/e2e/density.go index 8543d56a36..5ae4f35276 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -131,19 +131,15 @@ var _ = Describe("Density", func() { // Explicitly put here, to delete namespace at the end of the test // (after measuring latency metrics, etc.).framework := NewFramework("density") - framework := NewFramework("density") + options := FrameworkOptions{ + clientQPS: 20, + clientBurst: 30, + } + framework := NewFramework("density", options) framework.NamespaceDeletionTimeout = time.Hour BeforeEach(func() { - // Explicitly create a client with higher QPS limits. - // However, make those at most comparable to components. - config, err := loadConfig() - Expect(err).NotTo(HaveOccurred()) - config.QPS = 20 - config.Burst = 30 - c, err = loadClientFromConfig(config) - Expect(err).NotTo(HaveOccurred()) - + c = framework.Client ns = framework.Namespace.Name nodes := ListSchedulableNodesOrDie(c) @@ -153,7 +149,7 @@ var _ = Describe("Density", func() { // Terminating a namespace (deleting the remaining objects from it - which // generally means events) can affect the current run. Thus we wait for all // terminating namespace to be finally deleted before starting this test. - err = checkTestingNSDeletedExcept(c, ns) + err := checkTestingNSDeletedExcept(c, ns) expectNoError(err) uuid = string(util.NewUUID()) diff --git a/test/e2e/deployment.go b/test/e2e/deployment.go index de337ab7f0..2150bd2bfd 100644 --- a/test/e2e/deployment.go +++ b/test/e2e/deployment.go @@ -37,7 +37,7 @@ import ( ) var _ = Describe("Deployment", func() { - f := NewFramework("deployment") + f := NewDefaultFramework("deployment") It("deployment should create new pods", func() { testNewDeployment(f) diff --git a/test/e2e/dns.go b/test/e2e/dns.go index 6819ccf88f..35a0310988 100644 --- a/test/e2e/dns.go +++ b/test/e2e/dns.go @@ -197,7 +197,7 @@ func validateDNSResults(f *Framework, pod *api.Pod, fileNames []string) { } var _ = Describe("DNS", func() { - f := NewFramework("dns") + f := NewDefaultFramework("dns") It("should provide DNS for the cluster", func() { // TODO: support DNS on vagrant #3580 diff --git a/test/e2e/docker_containers.go b/test/e2e/docker_containers.go index 20eb153361..6583503f8f 100644 --- a/test/e2e/docker_containers.go +++ b/test/e2e/docker_containers.go @@ -25,7 +25,7 @@ import ( ) var _ = Describe("Docker Containers", func() { - framework := NewFramework("containers") + framework := NewDefaultFramework("containers") var c *client.Client var ns string diff --git a/test/e2e/downward_api.go b/test/e2e/downward_api.go index db67d57b5f..6ea88d3e4d 100644 --- a/test/e2e/downward_api.go +++ b/test/e2e/downward_api.go @@ -26,7 +26,7 @@ import ( ) var _ = Describe("Downward API", func() { - framework := NewFramework("downward-api") + framework := NewDefaultFramework("downward-api") It("should provide pod name and namespace as env vars [Conformance]", func() { podName := "downward-api-" + string(util.NewUUID()) diff --git a/test/e2e/downwardapi_volume.go b/test/e2e/downwardapi_volume.go index 12903a0b24..94e1ccb767 100644 --- a/test/e2e/downwardapi_volume.go +++ b/test/e2e/downwardapi_volume.go @@ -31,7 +31,7 @@ var _ = Describe("Downward API volume", func() { // How long to wait for a log pod to be displayed const podLogTimeout = 45 * time.Second - f := NewFramework("downward-api") + f := NewDefaultFramework("downward-api") It("should provide podname only [Conformance]", func() { podName := "downwardapi-volume-" + string(util.NewUUID()) pod := downwardAPIVolumePodForSimpleTest(podName, "/etc/podname") diff --git a/test/e2e/empty_dir.go b/test/e2e/empty_dir.go index 60f0239eb1..815cbf0762 100644 --- a/test/e2e/empty_dir.go +++ b/test/e2e/empty_dir.go @@ -35,7 +35,7 @@ const ( var _ = Describe("EmptyDir volumes", func() { - f := NewFramework("emptydir") + f := NewDefaultFramework("emptydir") Context("when FSGroup is specified [Feature:FSGroup]", func() { It("new files should be created with FSGroup ownership when container is root", func() { diff --git a/test/e2e/empty_dir_wrapper.go b/test/e2e/empty_dir_wrapper.go index 2e5da33c64..ccc988d710 100644 --- a/test/e2e/empty_dir_wrapper.go +++ b/test/e2e/empty_dir_wrapper.go @@ -29,7 +29,7 @@ import ( // This test will create a pod with a secret volume and gitRepo volume // Thus requests a secret, a git server pod, and a git server service var _ = Describe("EmptyDir wrapper volumes", func() { - f := NewFramework("secrets") + f := NewDefaultFramework("secrets") It("should becomes running", func() { name := "secret-test-" + string(util.NewUUID()) diff --git a/test/e2e/es_cluster_logging.go b/test/e2e/es_cluster_logging.go index b48cfcbe5f..6f6b193f27 100644 --- a/test/e2e/es_cluster_logging.go +++ b/test/e2e/es_cluster_logging.go @@ -31,7 +31,7 @@ import ( ) var _ = Describe("Cluster level logging using Elasticsearch [Feature:Elasticsearch]", func() { - f := NewFramework("es-logging") + f := NewDefaultFramework("es-logging") BeforeEach(func() { // TODO: For now assume we are only testing cluster logging with Elasticsearch diff --git a/test/e2e/etcd_failure.go b/test/e2e/etcd_failure.go index 531fdb404d..37120d4284 100644 --- a/test/e2e/etcd_failure.go +++ b/test/e2e/etcd_failure.go @@ -29,7 +29,7 @@ import ( var _ = Describe("Etcd failure [Disruptive]", func() { - framework := NewFramework("etcd-failure") + framework := NewDefaultFramework("etcd-failure") BeforeEach(func() { // This test requires: diff --git a/test/e2e/events.go b/test/e2e/events.go index fa489db709..464c69c1b1 100644 --- a/test/e2e/events.go +++ b/test/e2e/events.go @@ -32,7 +32,7 @@ import ( ) var _ = Describe("Events", func() { - framework := NewFramework("events") + framework := NewDefaultFramework("events") It("should be sent by kubelets and the scheduler about pods scheduling and running [Conformance]", func() { diff --git a/test/e2e/example_cluster_dns.go b/test/e2e/example_cluster_dns.go index 42ccdea54a..3d43ffaee4 100644 --- a/test/e2e/example_cluster_dns.go +++ b/test/e2e/example_cluster_dns.go @@ -42,7 +42,7 @@ except: print 'err'` var _ = Describe("ClusterDns [Feature:Example]", func() { - framework := NewFramework("cluster-dns") + framework := NewDefaultFramework("cluster-dns") var c *client.Client BeforeEach(func() { diff --git a/test/e2e/example_k8petstore.go b/test/e2e/example_k8petstore.go index 3a6d693664..e93292bcbf 100644 --- a/test/e2e/example_k8petstore.go +++ b/test/e2e/example_k8petstore.go @@ -157,7 +157,7 @@ var _ = Describe("Pet Store [Feature:Example]", func() { // The number of nodes dictates total number of generators/transaction expectations. var nodeCount int - f := NewFramework("petstore") + f := NewDefaultFramework("petstore") It(fmt.Sprintf("should scale to persist a nominal number ( %v ) of transactions in %v seconds", k8bpsSmokeTestFinalTransactions, k8bpsSmokeTestTimeout), func() { nodes := ListSchedulableNodesOrDie(f.Client) diff --git a/test/e2e/examples.go b/test/e2e/examples.go index a30b45ea5f..8516605454 100644 --- a/test/e2e/examples.go +++ b/test/e2e/examples.go @@ -37,7 +37,7 @@ const ( ) var _ = Describe("[Feature:Example]", func() { - framework := NewFramework("examples") + framework := NewDefaultFramework("examples") var c *client.Client var ns string BeforeEach(func() { diff --git a/test/e2e/expansion.go b/test/e2e/expansion.go index 5379468038..a5a302f238 100644 --- a/test/e2e/expansion.go +++ b/test/e2e/expansion.go @@ -26,7 +26,7 @@ import ( // These tests exercise the Kubernetes expansion syntax $(VAR). // For more information, see: docs/design/expansion.md var _ = Describe("Variable Expansion", func() { - framework := NewFramework("var-expansion") + framework := NewDefaultFramework("var-expansion") It("should allow composing env vars into new env vars [Conformance]", func() { podName := "var-expansion-" + string(util.NewUUID()) diff --git a/test/e2e/framework.go b/test/e2e/framework.go index bd70545c9a..236aa8e324 100644 --- a/test/e2e/framework.go +++ b/test/e2e/framework.go @@ -65,6 +65,9 @@ type Framework struct { // we install a cleanup action before each test and clear it after. If we // should abort, the AfterSuite hook should run all cleanup actions. cleanupHandle CleanupActionHandle + + // configuration for framework's client + options FrameworkOptions } type TestDataSummary interface { @@ -72,12 +75,26 @@ type TestDataSummary interface { PrintJSON() string } +type FrameworkOptions struct { + clientQPS float32 + clientBurst int +} + // NewFramework makes a new framework and sets up a BeforeEach/AfterEach for // you (you can write additional before/after each functions). -func NewFramework(baseName string) *Framework { +func NewDefaultFramework(baseName string) *Framework { + options := FrameworkOptions{ + clientQPS: 5, + clientBurst: 10, + } + return NewFramework(baseName, options) +} + +func NewFramework(baseName string, options FrameworkOptions) *Framework { f := &Framework{ BaseName: baseName, addonResourceConstraints: make(map[string]resourceConstraint), + options: options, } BeforeEach(f.beforeEach) @@ -93,7 +110,11 @@ func (f *Framework) beforeEach() { f.cleanupHandle = AddCleanupAction(f.afterEach) By("Creating a kubernetes client") - c, err := loadClient() + config, err := loadConfig() + Expect(err).NotTo(HaveOccurred()) + config.QPS = f.options.clientQPS + config.Burst = f.options.clientBurst + c, err := loadClientFromConfig(config) Expect(err).NotTo(HaveOccurred()) f.Client = c diff --git a/test/e2e/garbage_collector.go b/test/e2e/garbage_collector.go index f1f20148b3..a4027877bb 100644 --- a/test/e2e/garbage_collector.go +++ b/test/e2e/garbage_collector.go @@ -30,7 +30,7 @@ import ( // // Slow by design (7 min) var _ = Describe("Garbage collector [Slow]", func() { - f := NewFramework("garbage-collector") + f := NewDefaultFramework("garbage-collector") It("should handle the creation of 1000 pods", func() { SkipUnlessProviderIs("gce") diff --git a/test/e2e/generated_clientset.go b/test/e2e/generated_clientset.go index fadbdd8fed..fedae634cc 100644 --- a/test/e2e/generated_clientset.go +++ b/test/e2e/generated_clientset.go @@ -33,7 +33,7 @@ import ( ) var _ = Describe("Generated release_1_2 clientset", func() { - framework := NewFramework("clientset") + framework := NewDefaultFramework("clientset") It("should create pods, delete pods, watch pods", func() { podClient := framework.Clientset_1_2.Core().Pods(framework.Namespace.Name) By("creating the pod") diff --git a/test/e2e/horizontal_pod_autoscaling.go b/test/e2e/horizontal_pod_autoscaling.go index f1e68bf170..52d1eada42 100644 --- a/test/e2e/horizontal_pod_autoscaling.go +++ b/test/e2e/horizontal_pod_autoscaling.go @@ -36,7 +36,7 @@ const ( // These tests take ~20 minutes each. var _ = Describe("Horizontal pod autoscaling (scale resource: CPU) [Serial] [Slow]", func() { var rc *ResourceConsumer - f := NewFramework("horizontal-pod-autoscaling") + f := NewDefaultFramework("horizontal-pod-autoscaling") titleUp := "Should scale from 1 pod to 3 pods and from 3 to 5" titleDown := "Should scale from 5 pods to 3 pods and from 3 to 1" diff --git a/test/e2e/host_path.go b/test/e2e/host_path.go index bd92234581..d6b65e882b 100644 --- a/test/e2e/host_path.go +++ b/test/e2e/host_path.go @@ -32,7 +32,7 @@ import ( //TODO : Consolidate this code with the code for emptyDir. //This will require some smart. var _ = Describe("hostPath", func() { - framework := NewFramework("hostpath") + framework := NewDefaultFramework("hostpath") var c *client.Client var namespace *api.Namespace diff --git a/test/e2e/initial_resources.go b/test/e2e/initial_resources.go index f250db6970..120ccc2f5a 100644 --- a/test/e2e/initial_resources.go +++ b/test/e2e/initial_resources.go @@ -30,7 +30,7 @@ import ( // // Flaky issue #20272 var _ = Describe("Initial Resources [Feature:InitialResources] [Flaky]", func() { - f := NewFramework("initial-resources") + f := 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. diff --git a/test/e2e/job.go b/test/e2e/job.go index 747bccf705..9a5189bb07 100644 --- a/test/e2e/job.go +++ b/test/e2e/job.go @@ -40,7 +40,7 @@ const ( ) var _ = Describe("Job", func() { - f := NewFramework("job") + f := NewDefaultFramework("job") parallelism := 2 completions := 4 lotsOfFailures := 5 // more than completions diff --git a/test/e2e/kibana_logging.go b/test/e2e/kibana_logging.go index e66476d1a5..6e70e7039b 100644 --- a/test/e2e/kibana_logging.go +++ b/test/e2e/kibana_logging.go @@ -27,7 +27,7 @@ import ( ) var _ = Describe("Kibana Logging Instances Is Alive", func() { - f := NewFramework("kibana-logging") + f := NewDefaultFramework("kibana-logging") BeforeEach(func() { // TODO: For now assume we are only testing cluster logging with Elasticsearch diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index a16481eeac..5fc9c7cec4 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -105,7 +105,7 @@ var ( var _ = Describe("Kubectl client", func() { defer GinkgoRecover() - framework := NewFramework("kubectl") + framework := NewDefaultFramework("kubectl") var c *client.Client var ns string BeforeEach(func() { diff --git a/test/e2e/kubelet.go b/test/e2e/kubelet.go index 9e59c2bc4c..bfda2def36 100644 --- a/test/e2e/kubelet.go +++ b/test/e2e/kubelet.go @@ -89,7 +89,7 @@ func waitTillNPodsRunningOnNodes(c *client.Client, nodeNames sets.String, podNam var _ = Describe("kubelet", func() { var numNodes int var nodeNames sets.String - framework := NewFramework("kubelet") + framework := NewDefaultFramework("kubelet") var resourceMonitor *resourceMonitor BeforeEach(func() { diff --git a/test/e2e/kubelet_etc_hosts.go b/test/e2e/kubelet_etc_hosts.go index 15502daeb4..43c0686f4d 100644 --- a/test/e2e/kubelet_etc_hosts.go +++ b/test/e2e/kubelet_etc_hosts.go @@ -41,7 +41,7 @@ type KubeletManagedHostConfig struct { } var _ = Describe("KubeletManagedEtcHosts", func() { - f := NewFramework("e2e-kubelet-etc-hosts") + f := NewDefaultFramework("e2e-kubelet-etc-hosts") config := &KubeletManagedHostConfig{ f: f, } diff --git a/test/e2e/kubelet_perf.go b/test/e2e/kubelet_perf.go index a68ee40c2a..dd2dc20f3d 100644 --- a/test/e2e/kubelet_perf.go +++ b/test/e2e/kubelet_perf.go @@ -179,7 +179,7 @@ func verifyCPULimits(expected containersCPUSummary, actual nodesCPUSummary) { // Slow by design (1 hour) var _ = Describe("Kubelet [Serial] [Slow]", func() { var nodeNames sets.String - framework := NewFramework("kubelet-perf") + framework := NewDefaultFramework("kubelet-perf") var rm *resourceMonitor BeforeEach(func() { diff --git a/test/e2e/kubeproxy.go b/test/e2e/kubeproxy.go index a945a4d638..288bec9d59 100644 --- a/test/e2e/kubeproxy.go +++ b/test/e2e/kubeproxy.go @@ -66,7 +66,7 @@ type KubeProxyTestConfig struct { } var _ = Describe("KubeProxy", func() { - f := NewFramework("e2e-kubeproxy") + f := NewDefaultFramework("e2e-kubeproxy") config := &KubeProxyTestConfig{ f: f, } diff --git a/test/e2e/limit_range.go b/test/e2e/limit_range.go index d61a836bfd..54feac9fdb 100644 --- a/test/e2e/limit_range.go +++ b/test/e2e/limit_range.go @@ -27,7 +27,7 @@ import ( ) var _ = Describe("LimitRange", func() { - f := NewFramework("limitrange") + f := NewDefaultFramework("limitrange") It("should create a LimitRange with defaults and ensure pod has those defaults applied.", func() { By("Creating a LimitRange") diff --git a/test/e2e/load.go b/test/e2e/load.go index b1dcb28758..05fe5a3398 100644 --- a/test/e2e/load.go +++ b/test/e2e/load.go @@ -64,17 +64,15 @@ var _ = Describe("Load capacity", func() { // Explicitly put here, to delete namespace at the end of the test // (after measuring latency metrics, etc.). - framework := NewFramework("load") + options := FrameworkOptions{ + clientQPS: 50, + clientBurst: 100, + } + framework := NewFramework("load", options) framework.NamespaceDeletionTimeout = time.Hour BeforeEach(func() { - // Explicitly create a client with higher QPS limits. - config, err := loadConfig() - Expect(err).NotTo(HaveOccurred()) - config.QPS = 50 - config.Burst = 100 - c, err = loadClientFromConfig(config) - Expect(err).NotTo(HaveOccurred()) + c = framework.Client ns = framework.Namespace.Name nodes := ListSchedulableNodesOrDie(c) @@ -84,7 +82,7 @@ var _ = Describe("Load capacity", func() { // Terminating a namespace (deleting the remaining objects from it - which // generally means events) can affect the current run. Thus we wait for all // terminating namespace to be finally deleted before starting this test. - err = checkTestingNSDeletedExcept(c, ns) + err := checkTestingNSDeletedExcept(c, ns) expectNoError(err) expectNoError(resetMetrics(c)) diff --git a/test/e2e/mesos.go b/test/e2e/mesos.go index 36f3617922..1332ddbe24 100644 --- a/test/e2e/mesos.go +++ b/test/e2e/mesos.go @@ -30,7 +30,7 @@ import ( ) var _ = Describe("Mesos", func() { - framework := NewFramework("pods") + framework := NewDefaultFramework("pods") var c *client.Client var ns string diff --git a/test/e2e/metrics_grabber_test.go b/test/e2e/metrics_grabber_test.go index 6620771348..7f2b804a7e 100644 --- a/test/e2e/metrics_grabber_test.go +++ b/test/e2e/metrics_grabber_test.go @@ -78,7 +78,7 @@ func checkMetrics(response metrics.Metrics, assumedMetrics map[string][]string) } var _ = Describe("MetricsGrabber", func() { - framework := NewFramework("metrics-grabber") + framework := NewDefaultFramework("metrics-grabber") var c *client.Client var grabber *metrics.MetricsGrabber BeforeEach(func() { diff --git a/test/e2e/monitoring.go b/test/e2e/monitoring.go index 8f44604a87..c690979a16 100644 --- a/test/e2e/monitoring.go +++ b/test/e2e/monitoring.go @@ -32,7 +32,7 @@ import ( ) var _ = Describe("Monitoring", func() { - f := NewFramework("monitoring") + f := NewDefaultFramework("monitoring") BeforeEach(func() { SkipUnlessProviderIs("gce") diff --git a/test/e2e/namespace.go b/test/e2e/namespace.go index 6cfe52f1a5..fef6129682 100644 --- a/test/e2e/namespace.go +++ b/test/e2e/namespace.go @@ -104,7 +104,7 @@ func extinguish(f *Framework, totalNS int, maxAllowedAfterDel int, maxSeconds in // rate of approximately 1 per second. var _ = Describe("Namespaces [Serial]", func() { - f := NewFramework("namespaces") + f := NewDefaultFramework("namespaces") It("should delete fast enough (90 percent of 100 namespaces in 150 seconds)", func() { extinguish(f, 100, 10, 150) }) diff --git a/test/e2e/networking.go b/test/e2e/networking.go index 4f1c344e11..8e8c0288b0 100644 --- a/test/e2e/networking.go +++ b/test/e2e/networking.go @@ -32,7 +32,7 @@ import ( ) var _ = Describe("Networking", func() { - f := NewFramework("nettest") + f := NewDefaultFramework("nettest") var svcname = "nettest" diff --git a/test/e2e/nodeoutofdisk.go b/test/e2e/nodeoutofdisk.go index 9faad90c6d..bdce386aab 100644 --- a/test/e2e/nodeoutofdisk.go +++ b/test/e2e/nodeoutofdisk.go @@ -67,7 +67,7 @@ const ( var _ = Describe("NodeOutOfDisk [Serial] [Flaky]", func() { var c *client.Client var unfilledNodeName, recoveredNodeName string - framework := NewFramework("node-outofdisk") + framework := NewDefaultFramework("node-outofdisk") BeforeEach(func() { c = framework.Client diff --git a/test/e2e/pd.go b/test/e2e/pd.go index 639356b6a8..2244d8a72d 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -47,7 +47,7 @@ var _ = Describe("Pod Disks", func() { host0Name string host1Name string ) - framework := NewFramework("pod-disks") + framework := NewDefaultFramework("pod-disks") BeforeEach(func() { SkipUnlessNodeCountIsAtLeast(2) diff --git a/test/e2e/persistent_volumes.go b/test/e2e/persistent_volumes.go index 120a3f9c84..a738dd704a 100644 --- a/test/e2e/persistent_volumes.go +++ b/test/e2e/persistent_volumes.go @@ -31,7 +31,7 @@ import ( // This test needs privileged containers, which are disabled by default. Run // the test with "go run hack/e2e.go ... --ginkgo.focus=[Feature:Volumes]" var _ = Describe("PersistentVolumes [Feature:Volumes]", func() { - framework := NewFramework("pv") + framework := NewDefaultFramework("pv") var c *client.Client var ns string diff --git a/test/e2e/pods.go b/test/e2e/pods.go index 6110391b56..ad22a094d2 100644 --- a/test/e2e/pods.go +++ b/test/e2e/pods.go @@ -207,7 +207,7 @@ func getRestartDelay(c *client.Client, pod *api.Pod, ns string, name string, con } var _ = Describe("Pods", func() { - framework := NewFramework("pods") + framework := NewDefaultFramework("pods") It("should get a host IP [Conformance]", func() { name := "pod-hostip-" + string(util.NewUUID()) diff --git a/test/e2e/portforward.go b/test/e2e/portforward.go index 223b2a535a..118575b6d1 100644 --- a/test/e2e/portforward.go +++ b/test/e2e/portforward.go @@ -111,7 +111,7 @@ func runPortForward(ns, podName string, port int) (*exec.Cmd, int) { } var _ = Describe("Port forwarding", func() { - framework := NewFramework("port-forwarding") + framework := NewDefaultFramework("port-forwarding") Describe("With a server that expects a client request", func() { It("should support a client that connects, sends no data, and disconnects [Conformance]", func() { diff --git a/test/e2e/pre_stop.go b/test/e2e/pre_stop.go index 32410cd2ec..dcbe714148 100644 --- a/test/e2e/pre_stop.go +++ b/test/e2e/pre_stop.go @@ -159,7 +159,7 @@ func testPreStop(c *client.Client, ns string) { } var _ = Describe("PreStop", func() { - f := NewFramework("prestop") + f := NewDefaultFramework("prestop") It("should call prestop when killing a pod [Conformance]", func() { testPreStop(f.Client, f.Namespace.Name) diff --git a/test/e2e/privileged.go b/test/e2e/privileged.go index 4a40ee63ea..63beac74ae 100644 --- a/test/e2e/privileged.go +++ b/test/e2e/privileged.go @@ -48,7 +48,7 @@ type PrivilegedPodTestConfig struct { } var _ = Describe("PrivilegedPod", func() { - f := NewFramework("e2e-privilegedpod") + f := NewDefaultFramework("e2e-privilegedpod") config := &PrivilegedPodTestConfig{ f: f, } diff --git a/test/e2e/proxy.go b/test/e2e/proxy.go index f37f4f2471..a34d0047e7 100644 --- a/test/e2e/proxy.go +++ b/test/e2e/proxy.go @@ -48,7 +48,7 @@ const ( ) func proxyContext(version string) { - f := NewFramework("proxy") + f := NewDefaultFramework("proxy") prefix := "/api/" + version // Port here has to be kept in sync with default kubelet port. diff --git a/test/e2e/rc.go b/test/e2e/rc.go index a0ff0af90f..6383e8f0a7 100644 --- a/test/e2e/rc.go +++ b/test/e2e/rc.go @@ -30,7 +30,7 @@ import ( ) var _ = Describe("ReplicationController", func() { - framework := NewFramework("replication-controller") + framework := NewDefaultFramework("replication-controller") It("should serve a basic image on each replica with a public image [Conformance]", func() { ServeImageOrFail(framework, "basic", "gcr.io/google_containers/serve_hostname:1.1") diff --git a/test/e2e/reboot.go b/test/e2e/reboot.go index a9d7958cbe..fe11214468 100644 --- a/test/e2e/reboot.go +++ b/test/e2e/reboot.go @@ -82,7 +82,7 @@ var _ = Describe("Reboot [Disruptive] [Feature:Reboot]", func() { } }) - f = NewFramework("reboot") + f = NewDefaultFramework("reboot") It("each node by ordering clean reboot and ensure they function upon restart", func() { // clean shutdown and restart diff --git a/test/e2e/replica_set.go b/test/e2e/replica_set.go index 64118b4f97..f7d9e8b58c 100644 --- a/test/e2e/replica_set.go +++ b/test/e2e/replica_set.go @@ -32,7 +32,7 @@ import ( ) var _ = Describe("ReplicaSet", func() { - framework := NewFramework("replicaset") + framework := NewDefaultFramework("replicaset") It("should serve a basic image on each replica with a public image [Conformance]", func() { ReplicaSetServeImageOrFail(framework, "basic", "gcr.io/google_containers/serve_hostname:1.1") diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index e839c0ee85..8ec35b421e 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -402,7 +402,7 @@ func expectNodeReadiness(isReady bool, newNode chan *api.Node) { } var _ = Describe("Nodes [Disruptive]", func() { - framework := NewFramework("resize-nodes") + framework := NewDefaultFramework("resize-nodes") var systemPodsNo int var c *client.Client var ns string diff --git a/test/e2e/resource_quota.go b/test/e2e/resource_quota.go index 0ad7d25246..7dd5e6c70d 100644 --- a/test/e2e/resource_quota.go +++ b/test/e2e/resource_quota.go @@ -35,7 +35,7 @@ const ( ) var _ = Describe("ResourceQuota", func() { - f := NewFramework("resourcequota") + f := NewDefaultFramework("resourcequota") It("should create a ResourceQuota and ensure its status is promptly calculated.", func() { By("Creating a ResourceQuota") diff --git a/test/e2e/restart.go b/test/e2e/restart.go index 7d88cf2945..fcdaf4917c 100644 --- a/test/e2e/restart.go +++ b/test/e2e/restart.go @@ -49,7 +49,7 @@ const ( ) var _ = Describe("Restart [Disruptive]", func() { - f := NewFramework("restart") + f := NewDefaultFramework("restart") var ps *podStore BeforeEach(func() { diff --git a/test/e2e/scheduler_predicates.go b/test/e2e/scheduler_predicates.go index c128420521..cfcdf5d717 100644 --- a/test/e2e/scheduler_predicates.go +++ b/test/e2e/scheduler_predicates.go @@ -150,7 +150,7 @@ var _ = Describe("SchedulerPredicates [Serial]", func() { } }) - framework := NewFramework("sched-pred") + framework := NewDefaultFramework("sched-pred") BeforeEach(func() { c = framework.Client diff --git a/test/e2e/secrets.go b/test/e2e/secrets.go index 8b439a22ef..e1568158b9 100644 --- a/test/e2e/secrets.go +++ b/test/e2e/secrets.go @@ -26,7 +26,7 @@ import ( ) var _ = Describe("Secrets", func() { - f := NewFramework("secrets") + f := NewDefaultFramework("secrets") It("should be consumable from pods in volume [Conformance]", func() { name := "secret-test-" + string(util.NewUUID()) diff --git a/test/e2e/security_context.go b/test/e2e/security_context.go index 953395fbc3..b301f8044a 100644 --- a/test/e2e/security_context.go +++ b/test/e2e/security_context.go @@ -58,7 +58,7 @@ func scTestPod(hostIPC bool, hostPID bool) *api.Pod { } var _ = Describe("Security Context [Feature:SecurityContext]", func() { - framework := NewFramework("security-context") + framework := NewDefaultFramework("security-context") It("should support pod.Spec.SecurityContext.SupplementalGroups", func() { pod := scTestPod(false, false) diff --git a/test/e2e/service.go b/test/e2e/service.go index 12c852659e..426b8fbb08 100644 --- a/test/e2e/service.go +++ b/test/e2e/service.go @@ -62,7 +62,7 @@ const loadBalancerCreateTimeout = 20 * time.Minute var ServiceNodePortRange = utilnet.PortRange{Base: 30000, Size: 2768} var _ = Describe("Services", func() { - f := NewFramework("services") + f := NewDefaultFramework("services") var c *client.Client diff --git a/test/e2e/service_accounts.go b/test/e2e/service_accounts.go index 74a9ff7fa8..3ee34cb0f1 100644 --- a/test/e2e/service_accounts.go +++ b/test/e2e/service_accounts.go @@ -34,7 +34,7 @@ import ( var serviceAccountTokenNamespaceVersion = version.MustParse("v1.2.0") var _ = Describe("ServiceAccounts", func() { - f := NewFramework("svcaccounts") + f := NewDefaultFramework("svcaccounts") It("should ensure a single API token exists", func() { // wait for the service account to reference a single secret diff --git a/test/e2e/service_latency.go b/test/e2e/service_latency.go index 6f7620bbe1..a2d356f260 100644 --- a/test/e2e/service_latency.go +++ b/test/e2e/service_latency.go @@ -40,7 +40,7 @@ func (d durations) Less(i, j int) bool { return d[i] < d[j] } func (d durations) Swap(i, j int) { d[i], d[j] = d[j], d[i] } var _ = Describe("Service endpoints latency", func() { - f := NewFramework("svc-latency") + f := NewDefaultFramework("svc-latency") It("should not be very high [Conformance]", func() { const ( diff --git a/test/e2e/serviceloadbalancers.go b/test/e2e/serviceloadbalancers.go index c27fe90df3..1159ccf190 100644 --- a/test/e2e/serviceloadbalancers.go +++ b/test/e2e/serviceloadbalancers.go @@ -210,7 +210,7 @@ var _ = Describe("ServiceLoadBalancer [Feature:ServiceLoadBalancer]", func() { var repoRoot string var client *client.Client - framework := NewFramework("servicelb") + framework := NewDefaultFramework("servicelb") BeforeEach(func() { client = framework.Client diff --git a/test/e2e/ssh.go b/test/e2e/ssh.go index 19c665b646..daa97c4a9f 100644 --- a/test/e2e/ssh.go +++ b/test/e2e/ssh.go @@ -25,7 +25,7 @@ import ( var _ = Describe("SSH", func() { - f := NewFramework("ssh") + f := NewDefaultFramework("ssh") BeforeEach(func() { // When adding more providers here, also implement their functionality in util.go's getSigner(...). diff --git a/test/e2e/ubernetes_lite.go b/test/e2e/ubernetes_lite.go index 4f82aefe4e..9c1cf7d13a 100644 --- a/test/e2e/ubernetes_lite.go +++ b/test/e2e/ubernetes_lite.go @@ -32,7 +32,7 @@ import ( ) var _ = Describe("Ubernetes Lite", func() { - framework := NewFramework("ubernetes-lite") + framework := NewDefaultFramework("ubernetes-lite") var zoneCount int var err error image := "gcr.io/google_containers/serve_hostname:1.1" diff --git a/test/e2e/volumes.go b/test/e2e/volumes.go index 4a844502e3..5bb77ad628 100644 --- a/test/e2e/volumes.go +++ b/test/e2e/volumes.go @@ -353,7 +353,7 @@ func deleteCinderVolume(name string) error { // These tests need privileged containers, which are disabled by default. Run // the test with "go run hack/e2e.go ... --ginkgo.focus=[Feature:Volumes]" var _ = Describe("Volumes [Feature:Volumes]", func() { - framework := NewFramework("volume") + framework := NewDefaultFramework("volume") // If 'false', the test won't clear its volumes upon completion. Useful for debugging, // note that namespace deletion is handled by delete-namespace flag