Browse Source

Update apiserver for admission controller

Update the apiserver's command prefix to match between the apiserver
chart and the genesis api server.

Includes an optimization of virsh commands to parallelize and wait for
cloud init to complete (requires Ubuntu 16.04.4)

Change-Id: I793d210e15c3c13e8b662bd2459ed8bcba30d434
Bryan Strassner 5 months ago
parent
commit
221441f1bf

+ 4
- 1
deployment_files/global/v1.0demo/profiles/genesis.yaml View File

@@ -91,8 +91,11 @@ data:
91 91
       - --service-cluster-ip-range=SERVICE_CIDR
92 92
       - --service-node-port-range=SERVICE_NODE_PORT_RANGE
93 93
       - --authorization-mode=Node,RBAC
94
-      - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
94
+      - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds,NodeRestriction,EventRateLimit
95 95
       - --endpoint-reconciler-type=lease
96
+      # NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
97
+      - --repair-malformed-updates=false
98
+
96 99
   armada:
97 100
     target_manifest: cluster-bootstrap
98 101
   labels:

+ 27
- 0
deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml View File

@@ -97,6 +97,22 @@ metadata:
97 97
       dest:
98 98
         path: .values.secrets.service_account.public_key
99 99
 
100
+     # Command prefix
101
+    - src:
102
+        schema: pegleg/CommonAddresses/v1
103
+        name: common-addresses
104
+        path: .kubernetes.service_cidr
105
+      dest:
106
+        path: .values.command_prefix[1]
107
+        pattern: SERVICE_CIDR
108
+    - src:
109
+        schema: pegleg/CommonAddresses/v1
110
+        name: common-addresses
111
+        path: .kubernetes.service_node_port_range
112
+      dest:
113
+        path: .values.command_prefix[2]
114
+        pattern: SERVICE_NODE_PORT_RANGE
115
+
100 116
 data:
101 117
   chart_name: apiserver
102 118
   release: kubernetes-apiserver
@@ -115,9 +131,20 @@ data:
115 131
           labels:
116 132
             release_group: airship-kubernetes-apiserver
117 133
   values:
134
+
118 135
     apiserver:
119 136
       etcd:
120 137
         endpoints: https://127.0.0.1:2378
138
+    command_prefix:
139
+      - /apiserver
140
+      - --service-cluster-ip-range=SERVICE_CIDR
141
+      - --service-node-port-range=SERVICE_NODE_PORT_RANGE
142
+      - --authorization-mode=Node,RBAC
143
+      - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
144
+      - --endpoint-reconciler-type=lease
145
+      # NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
146
+      - --repair-malformed-updates=false
147
+
121 148
   dependencies:
122 149
     - kubernetes-apiserver-htk
123 150
 ---

+ 52
- 52
deployment_files/global/v1.0demo/software/config/versions.yaml View File

@@ -19,18 +19,18 @@ data:
19 19
         type: git
20 20
       apiserver-htk:
21 21
         location: https://git.openstack.org/openstack/openstack-helm-infra
22
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
22
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
23 23
         subpath: helm-toolkit
24 24
         type: git
25 25
       calico:
26 26
         calico:
27 27
           location: https://git.openstack.org/openstack/openstack-helm-infra
28
-          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
28
+          reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
29 29
           subpath: calico
30 30
           type: git
31 31
         calico-htk:
32 32
           location: https://git.openstack.org/openstack/openstack-helm-infra
33
-          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
33
+          reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
34 34
           subpath: helm-toolkit
35 35
           type: git
36 36
         etcd:
@@ -40,7 +40,7 @@ data:
40 40
           type: git
41 41
         etcd-htk:
42 42
           location: https://git.openstack.org/openstack/openstack-helm-infra
43
-          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
43
+          reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
44 44
           subpath: helm-toolkit
45 45
           type: git
46 46
       controller-manager:
@@ -50,7 +50,7 @@ data:
50 50
         type: git
51 51
       controller-manager-htk:
52 52
         location: https://git.openstack.org/openstack/openstack-helm-infra
53
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
53
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
54 54
         subpath: helm-toolkit
55 55
         type: git
56 56
       coredns:
@@ -60,7 +60,7 @@ data:
60 60
         type: git
61 61
       coredns-htk:
62 62
         location: https://git.openstack.org/openstack/openstack-helm-infra
63
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
63
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
64 64
         subpath: helm-toolkit
65 65
         type: git
66 66
       etcd:
@@ -70,7 +70,7 @@ data:
70 70
         type: git
71 71
       etcd-htk:
72 72
         location: https://git.openstack.org/openstack/openstack-helm-infra
73
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
73
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
74 74
         subpath: helm-toolkit
75 75
         type: git
76 76
       haproxy:
@@ -80,17 +80,17 @@ data:
80 80
         type: git
81 81
       haproxy-htk:
82 82
         location: https://git.openstack.org/openstack/openstack-helm-infra
83
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
83
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
84 84
         subpath: helm-toolkit
85 85
         type: git
86 86
       ingress:
87 87
         location: https://git.openstack.org/openstack/openstack-helm-infra
88
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
88
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
89 89
         subpath: ingress
90 90
         type: git
91 91
       ingress-htk:
92 92
         location: https://git.openstack.org/openstack/openstack-helm-infra
93
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
93
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
94 94
         subpath: helm-toolkit
95 95
         type: git
96 96
       proxy:
@@ -100,7 +100,7 @@ data:
100 100
         type: git
101 101
       proxy-htk:
102 102
         location: https://git.openstack.org/openstack/openstack-helm-infra
103
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
103
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
104 104
         subpath: helm-toolkit
105 105
         type: git
106 106
       scheduler:
@@ -110,7 +110,7 @@ data:
110 110
         type: git
111 111
       scheduler-htk:
112 112
         location: https://git.openstack.org/openstack/openstack-helm-infra
113
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
113
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
114 114
         subpath: helm-toolkit
115 115
         type: git
116 116
     ucp:
@@ -118,12 +118,12 @@ data:
118 118
         type: git
119 119
         location: https://git.openstack.org/openstack/openstack-helm-infra
120 120
         subpath: nfs-provisioner
121
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
121
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
122 122
       nfs_htk:
123 123
         type: git
124 124
         location: https://git.openstack.org/openstack/openstack-helm-infra
125 125
         subpath: helm-toolkit
126
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
126
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
127 127
       armada:
128 128
         location: https://git.openstack.org/openstack/airship-armada
129 129
         reference: 32baf9851e9cd29f4b8670e73a9409a0e7a59e35
@@ -131,7 +131,7 @@ data:
131 131
         type: git
132 132
       armada-htk:
133 133
         location: https://git.openstack.org/openstack/openstack-helm-infra
134
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
134
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
135 135
         subpath: helm-toolkit
136 136
         type: git
137 137
       barbican:
@@ -141,7 +141,7 @@ data:
141 141
         type: git
142 142
       barbican-htk:
143 143
         location: https://git.openstack.org/openstack/openstack-helm-infra
144
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
144
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
145 145
         subpath: helm-toolkit
146 146
         type: git
147 147
       #TODO Update to split ceph charts
@@ -162,7 +162,7 @@ data:
162 162
         type: git
163 163
       deckhand-htk:
164 164
         location: https://git.openstack.org/openstack/openstack-helm-infra
165
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
165
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
166 166
         subpath: helm-toolkit
167 167
         type: git
168 168
       divingbell:
@@ -172,27 +172,27 @@ data:
172 172
         type: git
173 173
       divingbell-htk:
174 174
         location: https://git.openstack.org/openstack/openstack-helm-infra
175
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
175
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
176 176
         subpath: helm-toolkit
177 177
         type: git
178 178
       drydock:
179 179
         location: https://git.openstack.org/openstack/airship-drydock
180
-        reference: 756a063c3074ddd847af1dd02c9b576b541cedbd
180
+        reference: 3470f89519d018c572905566891bafc8a3c51c3b
181 181
         subpath: charts/drydock
182 182
         type: git
183 183
       drydock-htk:
184 184
         location: https://git.openstack.org/openstack/openstack-helm-infra
185
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
185
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
186 186
         subpath: helm-toolkit
187 187
         type: git
188 188
       ingress:
189 189
         location: https://git.openstack.org/openstack/openstack-helm-infra
190
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
190
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
191 191
         subpath: ingress
192 192
         type: git
193 193
       ingress-htk:
194 194
         location: https://git.openstack.org/openstack/openstack-helm-infra
195
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
195
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
196 196
         subpath: helm-toolkit
197 197
         type: git
198 198
       keystone:
@@ -202,7 +202,7 @@ data:
202 202
         type: git
203 203
       keystone-htk:
204 204
         location: https://git.openstack.org/openstack/openstack-helm-infra
205
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
205
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
206 206
         subpath: helm-toolkit
207 207
         type: git
208 208
       maas:
@@ -212,37 +212,37 @@ data:
212 212
         type: git
213 213
       maas-htk:
214 214
         location: https://git.openstack.org/openstack/openstack-helm-infra
215
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
215
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
216 216
         subpath: helm-toolkit
217 217
         type: git
218 218
       mariadb:
219 219
         location: https://git.openstack.org/openstack/openstack-helm-infra
220
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
220
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
221 221
         subpath: mariadb
222 222
         type: git
223 223
       mariadb-htk:
224 224
         location: https://git.openstack.org/openstack/openstack-helm-infra
225
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
225
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
226 226
         subpath: helm-toolkit
227 227
         type: git
228 228
       memcached:
229 229
         location: https://git.openstack.org/openstack/openstack-helm-infra
230
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
230
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
231 231
         subpath: memcached
232 232
         type: git
233 233
       memcached-htk:
234 234
         location: https://git.openstack.org/openstack/openstack-helm-infra
235
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
235
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
236 236
         subpath: helm-toolkit
237 237
         type: git
238 238
       postgresql:
239 239
         location: https://git.openstack.org/openstack/openstack-helm-infra
240
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
240
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
241 241
         subpath: postgresql
242 242
         type: git
243 243
       postgresql-htk:
244 244
         location: https://git.openstack.org/openstack/openstack-helm-infra
245
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
245
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
246 246
         subpath: helm-toolkit
247 247
         type: git
248 248
       promenade:
@@ -252,17 +252,17 @@ data:
252 252
         type: git
253 253
       promenade-htk:
254 254
         location: https://git.openstack.org/openstack/openstack-helm-infra
255
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
255
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
256 256
         subpath: helm-toolkit
257 257
         type: git
258 258
       rabbitmq:
259 259
         location: https://git.openstack.org/openstack/openstack-helm-infra
260
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
260
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
261 261
         subpath: rabbitmq
262 262
         type: git
263 263
       rabbitmq-htk:
264 264
         location: https://git.openstack.org/openstack/openstack-helm-infra
265
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
265
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
266 266
         subpath: helm-toolkit
267 267
         type: git
268 268
       shipyard:
@@ -272,7 +272,7 @@ data:
272 272
         type: git
273 273
       shipyard-htk:
274 274
         location: https://git.openstack.org/openstack/openstack-helm-infra
275
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
275
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
276 276
         subpath: helm-toolkit
277 277
         type: git
278 278
       tiller:
@@ -282,7 +282,7 @@ data:
282 282
         type: git
283 283
       tiller-htk:
284 284
         location: https://git.openstack.org/openstack/openstack-helm-infra
285
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
285
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
286 286
         subpath: helm-toolkit
287 287
         type: git
288 288
     openstack:
@@ -295,7 +295,7 @@ data:
295 295
         type: git
296 296
         location: https://git.openstack.org/openstack/openstack-helm-infra
297 297
         subpath: helm-toolkit
298
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
298
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
299 299
       heat:
300 300
         type: git
301 301
         location: https://git.openstack.org/openstack/openstack-helm
@@ -305,7 +305,7 @@ data:
305 305
         type: git
306 306
         location: https://git.openstack.org/openstack/openstack-helm-infra
307 307
         subpath: helm-toolkit
308
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
308
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
309 309
       horizon:
310 310
         type: git
311 311
         location: https://git.openstack.org/openstack/openstack-helm
@@ -315,17 +315,17 @@ data:
315 315
         type: git
316 316
         location: https://git.openstack.org/openstack/openstack-helm-infra
317 317
         subpath: helm-toolkit
318
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
318
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
319 319
       ingress:
320 320
         type: git
321 321
         location: https://git.openstack.org/openstack/openstack-helm-infra
322 322
         subpath: ingress
323
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
323
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
324 324
       ingress-htk:
325 325
         type: git
326 326
         location: https://git.openstack.org/openstack/openstack-helm-infra
327 327
         subpath: helm-toolkit
328
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
328
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
329 329
       keystone:
330 330
         type: git
331 331
         location: https://git.openstack.org/openstack/openstack-helm
@@ -335,7 +335,7 @@ data:
335 335
         type: git
336 336
         location: https://git.openstack.org/openstack/openstack-helm-infra
337 337
         subpath: helm-toolkit
338
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
338
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
339 339
       libvirt:
340 340
         type: git
341 341
         location: https://git.openstack.org/openstack/openstack-helm
@@ -345,7 +345,7 @@ data:
345 345
         type: git
346 346
         location: https://git.openstack.org/openstack/openstack-helm-infra
347 347
         subpath: helm-toolkit
348
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
348
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
349 349
       mariadb:
350 350
         type: git
351 351
         location: https://git.openstack.org/openstack/openstack-helm
@@ -355,17 +355,17 @@ data:
355 355
         type: git
356 356
         location: https://git.openstack.org/openstack/openstack-helm-infra
357 357
         subpath: helm-toolkit
358
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
358
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
359 359
       memcached:
360 360
         type: git
361 361
         location: https://git.openstack.org/openstack/openstack-helm-infra
362 362
         subpath: memcached
363
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
363
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
364 364
       memcached-htk:
365 365
         type: git
366 366
         location: https://git.openstack.org/openstack/openstack-helm-infra
367 367
         subpath: helm-toolkit
368
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
368
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
369 369
       neutron:
370 370
         type: git
371 371
         location: https://git.openstack.org/openstack/openstack-helm
@@ -375,7 +375,7 @@ data:
375 375
         type: git
376 376
         location: https://git.openstack.org/openstack/openstack-helm-infra
377 377
         subpath: helm-toolkit
378
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
378
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
379 379
       nova:
380 380
         type: git
381 381
         location: https://git.openstack.org/openstack/openstack-helm
@@ -385,7 +385,7 @@ data:
385 385
         type: git
386 386
         location: https://git.openstack.org/openstack/openstack-helm-infra
387 387
         subpath: helm-toolkit
388
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
388
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
389 389
       openvswitch:
390 390
         type: git
391 391
         location: https://git.openstack.org/openstack/openstack-helm
@@ -395,17 +395,17 @@ data:
395 395
         type: git
396 396
         location: https://git.openstack.org/openstack/openstack-helm-infra
397 397
         subpath: helm-toolkit
398
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
398
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
399 399
       rabbitmq:
400 400
         type: git
401 401
         location: https://git.openstack.org/openstack/openstack-helm-infra
402 402
         subpath: rabbitmq
403
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
403
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
404 404
       rabbitmq-htk:
405 405
         type: git
406 406
         location: https://git.openstack.org/openstack/openstack-helm-infra
407 407
         subpath: helm-toolkit
408
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
408
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
409 409
 
410 410
   files:
411 411
     kubelet: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz
@@ -470,9 +470,9 @@ data:
470 470
         divingbell: docker.io/ubuntu:16.04
471 471
       drydock:
472 472
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
473
-        drydock: quay.io/airshipit/drydock:04ab7a6a90d2b0aadeabed804df31c9927538f91
473
+        drydock: quay.io/airshipit/drydock:3470f89519d018c572905566891bafc8a3c51c3b
474 474
         drydock_db_init: docker.io/postgres:9.5
475
-        drydock_db_sync: quay.io/airshipit/drydock:04ab7a6a90d2b0aadeabed804df31c9927538f91
475
+        drydock_db_sync: quay.io/airshipit/drydock:3470f89519d018c572905566891bafc8a3c51c3b
476 476
         ks_endpoints: docker.io/openstackhelm/heat:ocata
477 477
         ks_service: docker.io/openstackhelm/heat:ocata
478 478
         ks_user: docker.io/openstackhelm/heat:ocata

+ 6
- 3
deployment_files/global/v1.0dev/profiles/genesis.yaml View File

@@ -91,8 +91,11 @@ data:
91 91
       - --service-cluster-ip-range=SERVICE_CIDR
92 92
       - --service-node-port-range=SERVICE_NODE_PORT_RANGE
93 93
       - --authorization-mode=Node,RBAC
94
-      - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
94
+      - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds,NodeRestriction,EventRateLimit
95 95
       - --endpoint-reconciler-type=lease
96
+      # NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
97
+      - --repair-malformed-updates=false
98
+
96 99
   armada:
97 100
     target_manifest: cluster-bootstrap
98 101
   labels:
@@ -109,11 +112,11 @@ data:
109 112
       - openvswitch=enabled
110 113
       - promenade-genesis=enabled
111 114
       - ucp-control-plane=enabled
112
-      - ceph-mgr=enabled
113 115
       - ceph-mon=enabled
114 116
       - ceph-mds=enabled
115
-      - ceph-rgw=enabled
116 117
       - ceph-osd=enabled
118
+      - ceph-rgw=enabled
119
+      - ceph-mgr=enabled
117 120
   files:
118 121
     - path: /var/lib/anchor/calico-etcd-bootstrap
119 122
       content: "# placeholder for triggering calico etcd bootstrapping\n# this file will be deleted"

+ 27
- 0
deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml View File

@@ -97,6 +97,22 @@ metadata:
97 97
       dest:
98 98
         path: .values.secrets.service_account.public_key
99 99
 
100
+     # Command prefix
101
+    - src:
102
+        schema: pegleg/CommonAddresses/v1
103
+        name: common-addresses
104
+        path: .kubernetes.service_cidr
105
+      dest:
106
+        path: .values.command_prefix[1]
107
+        pattern: SERVICE_CIDR
108
+    - src:
109
+        schema: pegleg/CommonAddresses/v1
110
+        name: common-addresses
111
+        path: .kubernetes.service_node_port_range
112
+      dest:
113
+        path: .values.command_prefix[2]
114
+        pattern: SERVICE_NODE_PORT_RANGE
115
+
100 116
 data:
101 117
   chart_name: apiserver
102 118
   release: kubernetes-apiserver
@@ -115,9 +131,20 @@ data:
115 131
           labels:
116 132
             release_group: airship-kubernetes-apiserver
117 133
   values:
134
+
118 135
     apiserver:
119 136
       etcd:
120 137
         endpoints: https://127.0.0.1:2378
138
+    command_prefix:
139
+      - /apiserver
140
+      - --service-cluster-ip-range=SERVICE_CIDR
141
+      - --service-node-port-range=SERVICE_NODE_PORT_RANGE
142
+      - --authorization-mode=Node,RBAC
143
+      - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
144
+      - --endpoint-reconciler-type=lease
145
+      # NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
146
+      - --repair-malformed-updates=false
147
+
121 148
   dependencies:
122 149
     - kubernetes-apiserver-htk
123 150
 ---

+ 34
- 34
deployment_files/global/v1.0dev/software/config/versions.yaml View File

@@ -22,17 +22,17 @@ data:
22 22
           type: git
23 23
           location: https://git.openstack.org/openstack/openstack-helm-infra
24 24
           subpath: helm-toolkit
25
-          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
25
+          reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
26 26
         calico:
27 27
           type: git
28 28
           location: https://git.openstack.org/openstack/openstack-helm-infra
29 29
           subpath: calico
30
-          reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
30
+          reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
31 31
         calico-htk:
32 32
           type: git
33 33
           location: https://git.openstack.org/openstack/openstack-helm-infra
34 34
           subpath: helm-toolkit
35
-          reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
35
+          reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
36 36
       apiserver:
37 37
         type: git
38 38
         location: https://git.openstack.org/openstack/airship-promenade
@@ -42,7 +42,7 @@ data:
42 42
         type: git
43 43
         location: https://git.openstack.org/openstack/openstack-helm-infra
44 44
         subpath: helm-toolkit
45
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
45
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
46 46
       controller-manager:
47 47
         type: git
48 48
         location: https://git.openstack.org/openstack/airship-promenade
@@ -52,7 +52,7 @@ data:
52 52
         type: git
53 53
         location: https://git.openstack.org/openstack/openstack-helm-infra
54 54
         subpath: helm-toolkit
55
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
55
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
56 56
       coredns:
57 57
         type: git
58 58
         location: https://git.openstack.org/openstack/airship-promenade
@@ -62,7 +62,7 @@ data:
62 62
         type: git
63 63
         location: https://git.openstack.org/openstack/openstack-helm-infra
64 64
         subpath: helm-toolkit
65
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
65
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
66 66
       haproxy:
67 67
         type: git
68 68
         location: https://git.openstack.org/openstack/airship-promenade
@@ -72,7 +72,7 @@ data:
72 72
         type: git
73 73
         location: https://git.openstack.org/openstack/openstack-helm-infra
74 74
         subpath: helm-toolkit
75
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
75
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
76 76
       etcd:
77 77
         type: git
78 78
         location: https://git.openstack.org/openstack/airship-promenade
@@ -82,17 +82,17 @@ data:
82 82
         type: git
83 83
         location: https://git.openstack.org/openstack/openstack-helm-infra
84 84
         subpath: helm-toolkit
85
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
85
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
86 86
       ingress:
87 87
         type: git
88 88
         location: https://git.openstack.org/openstack/openstack-helm-infra
89 89
         subpath: ingress
90
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
90
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
91 91
       ingress-htk:
92 92
         type: git
93 93
         location: https://git.openstack.org/openstack/openstack-helm-infra
94 94
         subpath: helm-toolkit
95
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
95
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
96 96
       proxy:
97 97
         type: git
98 98
         location: https://git.openstack.org/openstack/airship-promenade
@@ -102,7 +102,7 @@ data:
102 102
         type: git
103 103
         location: https://git.openstack.org/openstack/openstack-helm-infra
104 104
         subpath: helm-toolkit
105
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
105
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
106 106
       scheduler:
107 107
         type: git
108 108
         location: https://git.openstack.org/openstack/airship-promenade
@@ -112,18 +112,18 @@ data:
112 112
         type: git
113 113
         location: https://git.openstack.org/openstack/openstack-helm-infra
114 114
         subpath: helm-toolkit
115
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
115
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
116 116
     ucp:
117 117
       nfs_provisioner:
118 118
         type: git
119 119
         location: https://git.openstack.org/openstack/openstack-helm-infra
120 120
         subpath: nfs-provisioner
121
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
121
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
122 122
       nfs_htk:
123 123
         type: git
124 124
         location: https://git.openstack.org/openstack/openstack-helm-infra
125 125
         subpath: helm-toolkit
126
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
126
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
127 127
       armada:
128 128
         type: git
129 129
         location: https://git.openstack.org/openstack/airship-armada
@@ -133,7 +133,7 @@ data:
133 133
         type: git
134 134
         location: https://git.openstack.org/openstack/openstack-helm-infra
135 135
         subpath: helm-toolkit
136
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
136
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
137 137
       barbican:
138 138
         type: git
139 139
         location: https://git.openstack.org/openstack/openstack-helm
@@ -143,7 +143,7 @@ data:
143 143
         type: git
144 144
         location: https://git.openstack.org/openstack/openstack-helm-infra
145 145
         subpath: helm-toolkit
146
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
146
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
147 147
       #TODO Update to split ceph charts
148 148
       ceph:
149 149
         type: git
@@ -165,7 +165,7 @@ data:
165 165
         type: git
166 166
         location: https://git.openstack.org/openstack/openstack-helm-infra
167 167
         subpath: helm-toolkit
168
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
168
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
169 169
       divingbell:
170 170
         type: git
171 171
         location: https://git.openstack.org/openstack/airship-divingbell
@@ -175,27 +175,27 @@ data:
175 175
         type: git
176 176
         location: https://git.openstack.org/openstack/openstack-helm-infra
177 177
         subpath: helm-toolkit
178
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
178
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
179 179
       drydock:
180 180
         type: git
181 181
         location: https://git.openstack.org/openstack/airship-drydock
182 182
         subpath: charts/drydock
183
-        reference: master
183
+        reference: 3470f89519d018c572905566891bafc8a3c51c3b
184 184
       drydock-htk:
185 185
         type: git
186 186
         location: https://git.openstack.org/openstack/openstack-helm-infra
187 187
         subpath: helm-toolkit
188
-        reference: bc1afb87d7aa529a4ed5321d889cdfe2f1af8a44
188
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
189 189
       ingress:
190 190
         type: git
191 191
         location: https://git.openstack.org/openstack/openstack-helm-infra
192 192
         subpath: ingress
193
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
193
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
194 194
       ingress-htk:
195 195
         type: git
196 196
         location: https://git.openstack.org/openstack/openstack-helm-infra
197 197
         subpath: helm-toolkit
198
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
198
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
199 199
       postgresql:
200 200
         type: git
201 201
         location: https://git.openstack.org/openstack/openstack-helm
@@ -205,7 +205,7 @@ data:
205 205
         type: git
206 206
         location: https://git.openstack.org/openstack/openstack-helm-infra
207 207
         subpath: helm-toolkit
208
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
208
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
209 209
       promenade:
210 210
         type: git
211 211
         location: https://git.openstack.org/openstack/airship-promenade
@@ -215,7 +215,7 @@ data:
215 215
         type: git
216 216
         location: https://git.openstack.org/openstack/openstack-helm-infra
217 217
         subpath: helm-toolkit
218
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
218
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
219 219
       keystone:
220 220
         type: git
221 221
         location: https://git.openstack.org/openstack/openstack-helm
@@ -225,7 +225,7 @@ data:
225 225
         type: git
226 226
         location: https://git.openstack.org/openstack/openstack-helm-infra
227 227
         subpath: helm-toolkit
228
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
228
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
229 229
       maas:
230 230
         type: git
231 231
         location: https://git.openstack.org/openstack/airship-maas
@@ -235,7 +235,7 @@ data:
235 235
         type: git
236 236
         location: https://git.openstack.org/openstack/openstack-helm-infra
237 237
         subpath: helm-toolkit
238
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
238
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
239 239
       mariadb:
240 240
         type: git
241 241
         location: https://git.openstack.org/openstack/openstack-helm
@@ -245,27 +245,27 @@ data:
245 245
         type: git
246 246
         location: https://git.openstack.org/openstack/openstack-helm-infra
247 247
         subpath: helm-toolkit
248
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
248
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
249 249
       memcached:
250 250
         type: git
251 251
         location: https://git.openstack.org/openstack/openstack-helm-infra
252 252
         subpath: memcached
253
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
253
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
254 254
       memcached-htk:
255 255
         type: git
256 256
         location: https://git.openstack.org/openstack/openstack-helm-infra
257 257
         subpath: helm-toolkit
258
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
258
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
259 259
       rabbitmq:
260 260
         type: git
261 261
         location: https://git.openstack.org/openstack/openstack-helm-infra
262 262
         subpath: rabbitmq
263
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
263
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
264 264
       rabbitmq-htk:
265 265
         type: git
266 266
         location: https://git.openstack.org/openstack/openstack-helm-infra
267 267
         subpath: helm-toolkit
268
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
268
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
269 269
       shipyard:
270 270
         type: git
271 271
         location: https://git.openstack.org/openstack/airship-shipyard
@@ -285,7 +285,7 @@ data:
285 285
         type: git
286 286
         location: https://git.openstack.org/openstack/openstack-helm-infra
287 287
         subpath: helm-toolkit
288
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
288
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
289 289
 
290 290
   files:
291 291
     kubelet: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz
@@ -327,13 +327,13 @@ data:
327 327
         ks_user: docker.io/openstackhelm/heat:ocata
328 328
         barbican_api: docker.io/openstackhelm/barbican:ocata
329 329
       drydock:
330
-        drydock: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99
330
+        drydock: quay.io/airshipit/drydock:3470f89519d018c572905566891bafc8a3c51c3b
331 331
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
332 332
         ks_user: docker.io/openstackhelm/heat:ocata
333 333
         ks_service: docker.io/openstackhelm/heat:ocata
334 334
         ks_endpoints: docker.io/openstackhelm/heat:ocata
335 335
         drydock_db_init: docker.io/postgres:9.5
336
-        drydock_db_sync: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99
336
+        drydock_db_sync: quay.io/airshipit/drydock:3470f89519d018c572905566891bafc8a3c51c3b
337 337
       shipyard:
338 338
         airflow: quay.io/airshipit/airflow:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
339 339
         shipyard: quay.io/airshipit/shipyard:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca

+ 13
- 6
tools/multi_nodes_gate/airship_gate/lib/virsh.sh View File

@@ -153,7 +153,8 @@ vm_create() {
153 153
             --disk "vol=${VIRSH_POOL}/cloud-init-${NAME}.iso,device=cdrom" &>> "${LOG_FILE}"
154 154
 
155 155
         ssh_wait "${NAME}"
156
-        ssh_cmd "${NAME}" sync
156
+	ssh_cmd "${NAME}" cloud-init status --wait
157
+	ssh_cmd "${NAME}" sync
157 158
 
158 159
     else
159 160
         log Creating VM "${NAME}"
@@ -172,18 +173,24 @@ vm_create() {
172 173
     fi
173 174
 }
174 175
 
176
+vm_create_validate() {
177
+    NAME=${1}
178
+    vm_create "${name}"
179
+    if [[ "$(config_vm_bootstrap ${name})" == "true" ]]
180
+    then
181
+      vm_validate "${name}"
182
+    fi
183
+}
184
+
175 185
 vm_create_all() {
176 186
     log Starting all VMs
177 187
 
178 188
     VM_NAMES=($(config_vm_names))
179 189
     for name in ${VM_NAMES[*]}
180 190
     do
181
-      vm_create "${name}"
182
-      if [[ "$(config_vm_bootstrap ${name})" == "true" ]]
183
-      then
184
-        vm_validate "${name}"
185
-      fi
191
+      vm_create_validate "${name}" &
186 192
     done
193
+    wait
187 194
 }
188 195
 
189 196
 vm_start() {

Loading…
Cancel
Save