From 26d14300e9f9ccfb71b5490125357fb12470cb71 Mon Sep 17 00:00:00 2001 From: Filip Grzadkowski Date: Mon, 11 May 2015 14:30:57 +0200 Subject: [PATCH] Increase disk size for kubernetes master. Signed-off-by: Filip Grzadkowski --- cluster/gce/config-default.sh | 2 ++ cluster/gce/config-test.sh | 2 ++ cluster/gce/util.sh | 3 ++- test/e2e/density.go | 14 +++++++------- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index cdb19bf86f7..37a6c401a7c 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -21,6 +21,8 @@ ZONE=${KUBE_GCE_ZONE:-us-central1-b} MASTER_SIZE=${MASTER_SIZE:-n1-standard-1} MINION_SIZE=${MINION_SIZE:-n1-standard-1} NUM_MINIONS=${NUM_MINIONS:-4} +MASTER_DISK_TYPE=pd-standard +MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-100GB} MINION_DISK_TYPE=pd-standard MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index e4cc473638b..f0406ca8ec3 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -21,6 +21,8 @@ ZONE=${KUBE_GCE_ZONE:-us-central1-b} MASTER_SIZE=${MASTER_SIZE:-g1-small} MINION_SIZE=${MINION_SIZE:-g1-small} NUM_MINIONS=${NUM_MINIONS:-2} +MASTER_DISK_TYPE=pd-standard +MASTER_DISK_SIZE=${MASTER_DISK_SIZE:-100GB} MINION_DISK_TYPE=pd-standard MINION_DISK_SIZE=${MINION_DISK_SIZE:-100GB} diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index bcc4c22cb7e..702c75e04e6 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -531,7 +531,8 @@ function kube-up { gcloud compute disks create "${MASTER_NAME}-pd" \ --project "${PROJECT}" \ --zone "${ZONE}" \ - --size "10GB" + --type "${MASTER_DISK_TYPE}" \ + --size "${MASTER_DISK_SIZE}" # Generate a bearer token for this cluster. We push this separately # from the other cluster variables so that the client (this diff --git a/test/e2e/density.go b/test/e2e/density.go index 4c300c745c7..0a814b55699 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -75,6 +75,13 @@ var _ = Describe("Density", func() { if err := c.Namespaces().Delete(ns); err != nil { Failf("Couldn't delete ns %s", err) } + + // Verify latency metrics + // TODO: Update threshold to 1s once we reach this goal + // TODO: We should reset metrics before the test. Currently previous tests influence latency metrics. + highLatencyRequests, err := HighLatencyRequests(c, 10*time.Second, util.NewStringSet("events")) + expectNoError(err) + Expect(highLatencyRequests).NotTo(BeNumerically(">", 0)) }) // Tests with "Skipped" substring in their name will be skipped when running @@ -154,13 +161,6 @@ var _ = Describe("Density", func() { // Tune the threshold for allowed failures. badEvents := BadEvents(events) Expect(badEvents).NotTo(BeNumerically(">", int(math.Floor(0.01*float64(totalPods))))) - - // Verify latency metrics - // TODO: Update threshold to 1s once we reach this goal - // TODO: We should reset metrics before the test. Currently previous tests influence latency metrics. - highLatencyRequests, err := HighLatencyRequests(c, 10*time.Second, util.NewStringSet("events")) - expectNoError(err) - Expect(highLatencyRequests).NotTo(BeNumerically(">", 0)) }) } })