Merge pull request kubernetes#3120 from brett-elliott/e2-sort-2

Sorted machine types by cpus

Author: k8s-ci-robot

cluster-autoscaler/cloudprovider/gce/gce_price_model.go

@@ -45,217 +45,216 @@ var (
 	// between the three machine types, the prices for e2-micro and e2-small
 	// are artificially set to be higher than the price of e2-medium.
 	instancePrices = map[string]float64{
+		"c2-standard-4":    0.2088,
+		"c2-standard-8":    0.4176,
 		"c2-standard-16":   0.8352,
 		"c2-standard-30":   1.5660,
-		"c2-standard-4":    0.2088,
 		"c2-standard-60":   3.1321,
-		"c2-standard-8":    0.4176,
-		"e2-highcpu-16":    0.39576,
 		"e2-highcpu-2":     0.04947,
 		"e2-highcpu-4":     0.09894,
 		"e2-highcpu-8":     0.19788,
-		"e2-highmem-16":    0.72320,
+		"e2-highcpu-16":    0.39576,
 		"e2-highmem-2":     0.09040,
 		"e2-highmem-4":     0.18080,
 		"e2-highmem-8":     0.36160,
+		"e2-highmem-16":    0.72320,
 		"e2-medium":        0.03351,
 		"e2-micro":         0.03353, // Should be 0.00838. Set to be > e2-medium.
 		"e2-small":         0.03352, // Should be 0.01675. Set to be > e2-medium.
-		"e2-standard-16":   0.53609,
 		"e2-standard-2":    0.06701,
 		"e2-standard-4":    0.13402,
 		"e2-standard-8":    0.26805,
+		"e2-standard-16":   0.53609,
 		"f1-micro":         0.0076,
 		"g1-small":         0.0257,
 		"m1-megamem-96":    10.6740,
-		"m1-ultramem-160":  25.2156,
 		"m1-ultramem-40":   6.3039,
 		"m1-ultramem-80":   12.6078,
+		"m1-ultramem-160":  25.2156,
 		"m2-ultramem-208":  42.186,
 		"m2-ultramem-416":  84.371,
-		"n1-highcpu-16":    0.5672,
 		"n1-highcpu-2":     0.0709,
-		"n1-highcpu-32":    1.1344,
 		"n1-highcpu-4":     0.1418,
-		"n1-highcpu-64":    2.2688,
 		"n1-highcpu-8":     0.2836,
+		"n1-highcpu-16":    0.5672,
+		"n1-highcpu-32":    1.1344,
+		"n1-highcpu-64":    2.2688,
 		"n1-highcpu-96":    3.402,
-		"n1-highmem-16":    0.9472,
 		"n1-highmem-2":     0.1184,
-		"n1-highmem-32":    1.8944,
 		"n1-highmem-4":     0.2368,
-		"n1-highmem-64":    3.7888,
 		"n1-highmem-8":     0.4736,
+		"n1-highmem-16":    0.9472,
+		"n1-highmem-32":    1.8944,
+		"n1-highmem-64":    3.7888,
 		"n1-highmem-96":    5.6832,
 		"n1-standard-1":    0.0475,
-		"n1-standard-16":   0.7600,
 		"n1-standard-2":    0.0950,
-		"n1-standard-32":   1.5200,
 		"n1-standard-4":    0.1900,
-		"n1-standard-64":   3.0400,
 		"n1-standard-8":    0.3800,
+		"n1-standard-16":   0.7600,
+		"n1-standard-32":   1.5200,
+		"n1-standard-64":   3.0400,
 		"n1-standard-96":   4.5600,
-		"n2-highcpu-16":    0.5736,
 		"n2-highcpu-2":     0.0717,
-		"n2-highcpu-32":    1.1471,
 		"n2-highcpu-4":     0.1434,
+		"n2-highcpu-8":     0.2868,
+		"n2-highcpu-16":    0.5736,
+		"n2-highcpu-32":    1.1471,
 		"n2-highcpu-48":    1.7207,
 		"n2-highcpu-64":    2.2943,
-		"n2-highcpu-8":     0.2868,
 		"n2-highcpu-80":    2.8678,
-		"n2-highmem-16":    1.0481,
 		"n2-highmem-2":     0.1310,
-		"n2-highmem-32":    2.0962,
 		"n2-highmem-4":     0.2620,
+		"n2-highmem-8":     0.5241,
+		"n2-highmem-16":    1.0481,
+		"n2-highmem-32":    2.0962,
 		"n2-highmem-48":    3.1443,
 		"n2-highmem-64":    4.1924,
-		"n2-highmem-8":     0.5241,
 		"n2-highmem-80":    5.2406,
-		"n2-standard-16":   0.7769,
 		"n2-standard-2":    0.0971,
-		"n2-standard-32":   1.5539,
 		"n2-standard-4":    0.1942,
+		"n2-standard-8":    0.3885,
+		"n2-standard-16":   0.7769,
+		"n2-standard-32":   1.5539,
 		"n2-standard-48":   2.3308,
 		"n2-standard-64":   3.1078,
-		"n2-standard-8":    0.3885,
 		"n2-standard-80":   3.8847,
-		"n2d-highcpu-128":  3.9920,
-		"n2d-highcpu-16":   0.4990,
 		"n2d-highcpu-2":    0.0624,
-		"n2d-highcpu-224":  6.9861,
-		"n2d-highcpu-32":   0.9980,
 		"n2d-highcpu-4":    0.1248,
+		"n2d-highcpu-8":    0.2495,
+		"n2d-highcpu-16":   0.4990,
+		"n2d-highcpu-32":   0.9980,
 		"n2d-highcpu-48":   1.4970,
 		"n2d-highcpu-64":   1.9960,
-		"n2d-highcpu-8":    0.2495,
 		"n2d-highcpu-80":   2.4950,
 		"n2d-highcpu-96":   2.9940,
-		"n2d-highmem-16":   0.9119,
+		"n2d-highcpu-128":  3.9920,
+		"n2d-highcpu-224":  6.9861,
 		"n2d-highmem-2":    0.1140,
-		"n2d-highmem-32":   1.8237,
 		"n2d-highmem-4":    0.2280,
+		"n2d-highmem-8":    0.4559,
+		"n2d-highmem-16":   0.9119,
+		"n2d-highmem-32":   1.8237,
 		"n2d-highmem-48":   2.7356,
 		"n2d-highmem-64":   3.6474,
-		"n2d-highmem-8":    0.4559,
 		"n2d-highmem-80":   4.5593,
 		"n2d-highmem-96":   5.4711,
-		"n2d-standard-128": 5.4075,
-		"n2d-standard-16":  0.6759,
 		"n2d-standard-2":   0.0845,
-		"n2d-standard-224": 9.4632,
-		"n2d-standard-32":  1.3519,
 		"n2d-standard-4":   0.1690,
+		"n2d-standard-8":   0.3380,
+		"n2d-standard-16":  0.6759,
+		"n2d-standard-32":  1.3519,
 		"n2d-standard-48":  2.0278,
 		"n2d-standard-64":  2.7038,
-		"n2d-standard-8":   0.3380,
 		"n2d-standard-80":  3.3797,
 		"n2d-standard-96":  4.0556,
+		"n2d-standard-128": 5.4075,
+		"n2d-standard-224": 9.4632,
 	}
-
 	preemptiblePrices = map[string]float64{
+		"c2-standard-4":    0.0505,
+		"c2-standard-8":    0.1011,
 		"c2-standard-16":   0.2021,
 		"c2-standard-30":   0.3790,
-		"c2-standard-4":    0.0505,
 		"c2-standard-60":   0.7579,
-		"c2-standard-8":    0.1011,
-		"e2-highcpu-16":    0.11873,
 		"e2-highcpu-2":     0.01484,
 		"e2-highcpu-4":     0.02968,
 		"e2-highcpu-8":     0.05936,
-		"e2-highmem-16":    0.21696,
+		"e2-highcpu-16":    0.11873,
 		"e2-highmem-2":     0.02712,
 		"e2-highmem-4":     0.05424,
 		"e2-highmem-8":     0.10848,
+		"e2-highmem-16":    0.21696,
 		"e2-medium":        0.01005,
 		"e2-micro":         0.01007, // Should be 0.00251. Set to be > e2-medium.
 		"e2-small":         0.01006, // Should be 0.00503. Set to be > e2-medium.
-		"e2-standard-16":   0.16083,
 		"e2-standard-2":    0.02010,
 		"e2-standard-4":    0.04021,
 		"e2-standard-8":    0.08041,
+		"e2-standard-16":   0.16083,
 		"f1-micro":         0.0035,
 		"g1-small":         0.0070,
 		"m1-megamem-96":    2.2600,
-		"m1-ultramem-160":  5.3244,
 		"m1-ultramem-40":   1.3311,
 		"m1-ultramem-80":   2.6622,
-		"n1-highcpu-16":    0.1200,
+		"m1-ultramem-160":  5.3244,
 		"n1-highcpu-2":     0.0150,
-		"n1-highcpu-32":    0.2400,
 		"n1-highcpu-4":     0.0300,
-		"n1-highcpu-64":    0.4800,
 		"n1-highcpu-8":     0.0600,
+		"n1-highcpu-16":    0.1200,
+		"n1-highcpu-32":    0.2400,
+		"n1-highcpu-64":    0.4800,
 		"n1-highcpu-96":    0.7200,
-		"n1-highmem-16":    0.2000,
 		"n1-highmem-2":     0.0250,
-		"n1-highmem-32":    0.4000,
 		"n1-highmem-4":     0.0500,
-		"n1-highmem-64":    0.8000,
 		"n1-highmem-8":     0.1000,
+		"n1-highmem-16":    0.2000,
+		"n1-highmem-32":    0.4000,
+		"n1-highmem-64":    0.8000,
 		"n1-highmem-96":    1.2000,
 		"n1-standard-1":    0.0100,
-		"n1-standard-16":   0.1600,
 		"n1-standard-2":    0.0200,
-		"n1-standard-32":   0.3200,
 		"n1-standard-4":    0.0400,
-		"n1-standard-64":   0.6400,
 		"n1-standard-8":    0.0800,
+		"n1-standard-16":   0.1600,
+		"n1-standard-32":   0.3200,
+		"n1-standard-64":   0.6400,
 		"n1-standard-96":   0.9600,
-		"n2-highcpu-16":    0.1388,
 		"n2-highcpu-2":     0.0173,
-		"n2-highcpu-32":    0.2776,
 		"n2-highcpu-4":     0.0347,
+		"n2-highcpu-8":     0.0694,
+		"n2-highcpu-16":    0.1388,
+		"n2-highcpu-32":    0.2776,
 		"n2-highcpu-48":    0.4164,
 		"n2-highcpu-64":    0.5552,
-		"n2-highcpu-8":     0.0694,
 		"n2-highcpu-80":    0.6940,
-		"n2-highmem-16":    0.2536,
 		"n2-highmem-2":     0.0317,
-		"n2-highmem-32":    0.5073,
 		"n2-highmem-4":     0.0634,
+		"n2-highmem-8":     0.1268,
+		"n2-highmem-16":    0.2536,
+		"n2-highmem-32":    0.5073,
 		"n2-highmem-48":    0.7609,
 		"n2-highmem-64":    1.0145,
-		"n2-highmem-8":     0.1268,
 		"n2-highmem-80":    1.2681,
-		"n2-standard-16":   0.1880,
 		"n2-standard-2":    0.0235,
-		"n2-standard-32":   0.3760,
 		"n2-standard-4":    0.0470,
+		"n2-standard-8":    0.0940,
+		"n2-standard-16":   0.1880,
+		"n2-standard-32":   0.3760,
 		"n2-standard-48":   0.5640,
 		"n2-standard-64":   0.7520,
-		"n2-standard-8":    0.0940,
 		"n2-standard-80":   0.9400,
-		"n2d-highcpu-128":  0.9660,
-		"n2d-highcpu-16":   0.1208,
 		"n2d-highcpu-2":    0.0151,
-		"n2d-highcpu-224":  1.6905,
-		"n2d-highcpu-32":   0.2415,
 		"n2d-highcpu-4":    0.0302,
+		"n2d-highcpu-8":    0.0604,
+		"n2d-highcpu-16":   0.1208,
+		"n2d-highcpu-32":   0.2415,
 		"n2d-highcpu-48":   0.3623,
 		"n2d-highcpu-64":   0.4830,
-		"n2d-highcpu-8":    0.0604,
 		"n2d-highcpu-80":   0.6038,
 		"n2d-highcpu-96":   0.7245,
-		"n2d-highmem-16":   0.2207,
+		"n2d-highcpu-128":  0.9660,
+		"n2d-highcpu-224":  1.6905,
 		"n2d-highmem-2":    0.0276,
-		"n2d-highmem-32":   0.4413,
 		"n2d-highmem-4":    0.0552,
+		"n2d-highmem-8":    0.1103,
+		"n2d-highmem-16":   0.2207,
+		"n2d-highmem-32":   0.4413,
 		"n2d-highmem-48":   0.6620,
 		"n2d-highmem-64":   0.8826,
-		"n2d-highmem-8":    0.1103,
 		"n2d-highmem-80":   1.1033,
 		"n2d-highmem-96":   1.3239,
-		"n2d-standard-128": 1.3085,
-		"n2d-standard-16":  0.1636,
 		"n2d-standard-2":   0.0204,
-		"n2d-standard-224": 2.2900,
-		"n2d-standard-32":  0.3271,
 		"n2d-standard-4":   0.0409,
+		"n2d-standard-8":   0.0818,
+		"n2d-standard-16":  0.1636,
+		"n2d-standard-32":  0.3271,
 		"n2d-standard-48":  0.4907,
 		"n2d-standard-64":  0.6543,
-		"n2d-standard-8":   0.0818,
 		"n2d-standard-80":  0.8178,
 		"n2d-standard-96":  0.9814,
+		"n2d-standard-128": 1.3085,
+		"n2d-standard-224": 2.2900,
 	}
 )