Skip to content

Commit eec4a36

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#3119 from brett-elliott/e2
Add prices for all machine types, adjust e2 fractional VM pricing
2 parents f114438 + 5e0611a commit eec4a36

File tree

1 file changed

+212
-42
lines changed

1 file changed

+212
-42
lines changed

‎cluster-autoscaler/cloudprovider/gce/gce_price_model.go‎

Lines changed: 212 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -40,52 +40,222 @@ const (
4040
)
4141

4242
var (
43+
// e2-micro and e2-small have allocatable set too high resulting in
44+
// overcommit. To make cluster autoscaler prefer e2-medium given the choice
45+
// between the three machine types, the prices for e2-micro and e2-small
46+
// are artificially set to be higher than the price of e2-medium.
4347
instancePrices = map[string]float64{
44-
"n1-standard-1": 0.0475,
45-
"n1-standard-2": 0.0950,
46-
"n1-standard-4": 0.1900,
47-
"n1-standard-8": 0.3800,
48-
"n1-standard-16": 0.7600,
49-
"n1-standard-32": 1.5200,
50-
"n1-standard-64": 3.0400,
51-
"f1-micro": 0.0076,
52-
"g1-small": 0.0257,
53-
"n1-highmem-2": 0.1184,
54-
"n1-highmem-4": 0.2368,
55-
"n1-highmem-8": 0.4736,
56-
"n1-highmem-16": 0.9472,
57-
"n1-highmem-32": 1.8944,
58-
"n1-highmem-64": 3.7888,
59-
"n1-highcpu-2": 0.0709,
60-
"n1-highcpu-4": 0.1418,
61-
"n1-highcpu-8": 0.2836,
62-
"n1-highcpu-16": 0.5672,
63-
"n1-highcpu-32": 1.1344,
64-
"n1-highcpu-64": 2.2688,
48+
"c2-standard-16": 0.8352,
49+
"c2-standard-30": 1.5660,
50+
"c2-standard-4": 0.2088,
51+
"c2-standard-60": 3.1321,
52+
"c2-standard-8": 0.4176,
53+
"e2-highcpu-16": 0.39576,
54+
"e2-highcpu-2": 0.04947,
55+
"e2-highcpu-4": 0.09894,
56+
"e2-highcpu-8": 0.19788,
57+
"e2-highmem-16": 0.72320,
58+
"e2-highmem-2": 0.09040,
59+
"e2-highmem-4": 0.18080,
60+
"e2-highmem-8": 0.36160,
61+
"e2-medium": 0.03351,
62+
"e2-micro": 0.03353, // Should be 0.00838. Set to be > e2-medium.
63+
"e2-small": 0.03352, // Should be 0.01675. Set to be > e2-medium.
64+
"e2-standard-16": 0.53609,
65+
"e2-standard-2": 0.06701,
66+
"e2-standard-4": 0.13402,
67+
"e2-standard-8": 0.26805,
68+
"f1-micro": 0.0076,
69+
"g1-small": 0.0257,
70+
"m1-megamem-96": 10.6740,
71+
"m1-ultramem-160": 25.2156,
72+
"m1-ultramem-40": 6.3039,
73+
"m1-ultramem-80": 12.6078,
74+
"m2-ultramem-208": 42.186,
75+
"m2-ultramem-416": 84.371,
76+
"n1-highcpu-16": 0.5672,
77+
"n1-highcpu-2": 0.0709,
78+
"n1-highcpu-32": 1.1344,
79+
"n1-highcpu-4": 0.1418,
80+
"n1-highcpu-64": 2.2688,
81+
"n1-highcpu-8": 0.2836,
82+
"n1-highcpu-96": 3.402,
83+
"n1-highmem-16": 0.9472,
84+
"n1-highmem-2": 0.1184,
85+
"n1-highmem-32": 1.8944,
86+
"n1-highmem-4": 0.2368,
87+
"n1-highmem-64": 3.7888,
88+
"n1-highmem-8": 0.4736,
89+
"n1-highmem-96": 5.6832,
90+
"n1-standard-1": 0.0475,
91+
"n1-standard-16": 0.7600,
92+
"n1-standard-2": 0.0950,
93+
"n1-standard-32": 1.5200,
94+
"n1-standard-4": 0.1900,
95+
"n1-standard-64": 3.0400,
96+
"n1-standard-8": 0.3800,
97+
"n1-standard-96": 4.5600,
98+
"n2-highcpu-16": 0.5736,
99+
"n2-highcpu-2": 0.0717,
100+
"n2-highcpu-32": 1.1471,
101+
"n2-highcpu-4": 0.1434,
102+
"n2-highcpu-48": 1.7207,
103+
"n2-highcpu-64": 2.2943,
104+
"n2-highcpu-8": 0.2868,
105+
"n2-highcpu-80": 2.8678,
106+
"n2-highmem-16": 1.0481,
107+
"n2-highmem-2": 0.1310,
108+
"n2-highmem-32": 2.0962,
109+
"n2-highmem-4": 0.2620,
110+
"n2-highmem-48": 3.1443,
111+
"n2-highmem-64": 4.1924,
112+
"n2-highmem-8": 0.5241,
113+
"n2-highmem-80": 5.2406,
114+
"n2-standard-16": 0.7769,
115+
"n2-standard-2": 0.0971,
116+
"n2-standard-32": 1.5539,
117+
"n2-standard-4": 0.1942,
118+
"n2-standard-48": 2.3308,
119+
"n2-standard-64": 3.1078,
120+
"n2-standard-8": 0.3885,
121+
"n2-standard-80": 3.8847,
122+
"n2d-highcpu-128": 3.9920,
123+
"n2d-highcpu-16": 0.4990,
124+
"n2d-highcpu-2": 0.0624,
125+
"n2d-highcpu-224": 6.9861,
126+
"n2d-highcpu-32": 0.9980,
127+
"n2d-highcpu-4": 0.1248,
128+
"n2d-highcpu-48": 1.4970,
129+
"n2d-highcpu-64": 1.9960,
130+
"n2d-highcpu-8": 0.2495,
131+
"n2d-highcpu-80": 2.4950,
132+
"n2d-highcpu-96": 2.9940,
133+
"n2d-highmem-16": 0.9119,
134+
"n2d-highmem-2": 0.1140,
135+
"n2d-highmem-32": 1.8237,
136+
"n2d-highmem-4": 0.2280,
137+
"n2d-highmem-48": 2.7356,
138+
"n2d-highmem-64": 3.6474,
139+
"n2d-highmem-8": 0.4559,
140+
"n2d-highmem-80": 4.5593,
141+
"n2d-highmem-96": 5.4711,
142+
"n2d-standard-128": 5.4075,
143+
"n2d-standard-16": 0.6759,
144+
"n2d-standard-2": 0.0845,
145+
"n2d-standard-224": 9.4632,
146+
"n2d-standard-32": 1.3519,
147+
"n2d-standard-4": 0.1690,
148+
"n2d-standard-48": 2.0278,
149+
"n2d-standard-64": 2.7038,
150+
"n2d-standard-8": 0.3380,
151+
"n2d-standard-80": 3.3797,
152+
"n2d-standard-96": 4.0556,
65153
}
66154

67155
preemptiblePrices = map[string]float64{
68-
"n1-standard-1": 0.0100,
69-
"n1-standard-2": 0.0200,
70-
"n1-standard-4": 0.0400,
71-
"n1-standard-8": 0.0800,
72-
"n1-standard-16": 0.1600,
73-
"n1-standard-32": 0.3200,
74-
"n1-standard-64": 0.6400,
75-
"f1-micro": 0.0035,
76-
"g1-small": 0.0070,
77-
"n1-highmem-2": 0.0250,
78-
"n1-highmem-4": 0.0500,
79-
"n1-highmem-8": 0.1000,
80-
"n1-highmem-16": 0.2000,
81-
"n1-highmem-32": 0.4000,
82-
"n1-highmem-64": 0.8000,
83-
"n1-highcpu-2": 0.0150,
84-
"n1-highcpu-4": 0.0300,
85-
"n1-highcpu-8": 0.0600,
86-
"n1-highcpu-16": 0.1200,
87-
"n1-highcpu-32": 0.2400,
88-
"n1-highcpu-64": 0.4800,
156+
"c2-standard-16": 0.2021,
157+
"c2-standard-30": 0.3790,
158+
"c2-standard-4": 0.0505,
159+
"c2-standard-60": 0.7579,
160+
"c2-standard-8": 0.1011,
161+
"e2-highcpu-16": 0.11873,
162+
"e2-highcpu-2": 0.01484,
163+
"e2-highcpu-4": 0.02968,
164+
"e2-highcpu-8": 0.05936,
165+
"e2-highmem-16": 0.21696,
166+
"e2-highmem-2": 0.02712,
167+
"e2-highmem-4": 0.05424,
168+
"e2-highmem-8": 0.10848,
169+
"e2-medium": 0.01005,
170+
"e2-micro": 0.01007, // Should be 0.00251. Set to be > e2-medium.
171+
"e2-small": 0.01006, // Should be 0.00503. Set to be > e2-medium.
172+
"e2-standard-16": 0.16083,
173+
"e2-standard-2": 0.02010,
174+
"e2-standard-4": 0.04021,
175+
"e2-standard-8": 0.08041,
176+
"f1-micro": 0.0035,
177+
"g1-small": 0.0070,
178+
"m1-megamem-96": 2.2600,
179+
"m1-ultramem-160": 5.3244,
180+
"m1-ultramem-40": 1.3311,
181+
"m1-ultramem-80": 2.6622,
182+
"n1-highcpu-16": 0.1200,
183+
"n1-highcpu-2": 0.0150,
184+
"n1-highcpu-32": 0.2400,
185+
"n1-highcpu-4": 0.0300,
186+
"n1-highcpu-64": 0.4800,
187+
"n1-highcpu-8": 0.0600,
188+
"n1-highcpu-96": 0.7200,
189+
"n1-highmem-16": 0.2000,
190+
"n1-highmem-2": 0.0250,
191+
"n1-highmem-32": 0.4000,
192+
"n1-highmem-4": 0.0500,
193+
"n1-highmem-64": 0.8000,
194+
"n1-highmem-8": 0.1000,
195+
"n1-highmem-96": 1.2000,
196+
"n1-standard-1": 0.0100,
197+
"n1-standard-16": 0.1600,
198+
"n1-standard-2": 0.0200,
199+
"n1-standard-32": 0.3200,
200+
"n1-standard-4": 0.0400,
201+
"n1-standard-64": 0.6400,
202+
"n1-standard-8": 0.0800,
203+
"n1-standard-96": 0.9600,
204+
"n2-highcpu-16": 0.1388,
205+
"n2-highcpu-2": 0.0173,
206+
"n2-highcpu-32": 0.2776,
207+
"n2-highcpu-4": 0.0347,
208+
"n2-highcpu-48": 0.4164,
209+
"n2-highcpu-64": 0.5552,
210+
"n2-highcpu-8": 0.0694,
211+
"n2-highcpu-80": 0.6940,
212+
"n2-highmem-16": 0.2536,
213+
"n2-highmem-2": 0.0317,
214+
"n2-highmem-32": 0.5073,
215+
"n2-highmem-4": 0.0634,
216+
"n2-highmem-48": 0.7609,
217+
"n2-highmem-64": 1.0145,
218+
"n2-highmem-8": 0.1268,
219+
"n2-highmem-80": 1.2681,
220+
"n2-standard-16": 0.1880,
221+
"n2-standard-2": 0.0235,
222+
"n2-standard-32": 0.3760,
223+
"n2-standard-4": 0.0470,
224+
"n2-standard-48": 0.5640,
225+
"n2-standard-64": 0.7520,
226+
"n2-standard-8": 0.0940,
227+
"n2-standard-80": 0.9400,
228+
"n2d-highcpu-128": 0.9660,
229+
"n2d-highcpu-16": 0.1208,
230+
"n2d-highcpu-2": 0.0151,
231+
"n2d-highcpu-224": 1.6905,
232+
"n2d-highcpu-32": 0.2415,
233+
"n2d-highcpu-4": 0.0302,
234+
"n2d-highcpu-48": 0.3623,
235+
"n2d-highcpu-64": 0.4830,
236+
"n2d-highcpu-8": 0.0604,
237+
"n2d-highcpu-80": 0.6038,
238+
"n2d-highcpu-96": 0.7245,
239+
"n2d-highmem-16": 0.2207,
240+
"n2d-highmem-2": 0.0276,
241+
"n2d-highmem-32": 0.4413,
242+
"n2d-highmem-4": 0.0552,
243+
"n2d-highmem-48": 0.6620,
244+
"n2d-highmem-64": 0.8826,
245+
"n2d-highmem-8": 0.1103,
246+
"n2d-highmem-80": 1.1033,
247+
"n2d-highmem-96": 1.3239,
248+
"n2d-standard-128": 1.3085,
249+
"n2d-standard-16": 0.1636,
250+
"n2d-standard-2": 0.0204,
251+
"n2d-standard-224": 2.2900,
252+
"n2d-standard-32": 0.3271,
253+
"n2d-standard-4": 0.0409,
254+
"n2d-standard-48": 0.4907,
255+
"n2d-standard-64": 0.6543,
256+
"n2d-standard-8": 0.0818,
257+
"n2d-standard-80": 0.8178,
258+
"n2d-standard-96": 0.9814,
89259
}
90260
)
91261

0 commit comments

Comments
 (0)