Browse Source

Reorder Ranger's values.yaml to follow spec

The values.yaml functionality is the same, just reordered according
to the values ordering spec[1].

BREAKING CHANGE:

1. Removed `release_group`

[1] https://docs.openstack.org/openstack-helm/latest/specs/values-ordering.html

Change-Id: I278a3f8aabc68b3ba17abd0aa74da1955f4400ac
Dustin Specker 6 months ago
parent
commit
38b255a047
1 changed files with 302 additions and 310 deletions
  1. 302
    310
      ranger/values.yaml

+ 302
- 310
ranger/values.yaml View File

@@ -12,172 +12,32 @@
12 12
 # See the License for the specific language governing permissions and
13 13
 # limitations under the License.
14 14
 
15
-# Default values for ranger.
16
-# This is a YAML-formatted file.
17
-# Declare name/value pairs to be passed into your templates.
18
-# name: value
19
-
20
-release_group: null
21
-
22
-labels:
23
-  ranger:
24
-    node_selector_key: openstack-control-plane
25
-    node_selector_value: enabled
26
-  job:
27
-    node_selector_key: openstack-control-plane
28
-    node_selector_value: enabled
29
-  test:
30
-    node_selector_key: openstack-control-plane
31
-    node_selector_value: enabled
32
-
33 15
 images:
34 16
   tags:
35
-    ranger: quay.io/attcomdev/ranger:d376b6059733a4d9b0c47d1c8ba1edf98c8953e3
36
-    ranger_db_sync: quay.io/attcomdev/ranger:d376b6059733a4d9b0c47d1c8ba1edf98c8953e3
37 17
     db_drop: docker.io/openstackhelm/heat:newton
38 18
     db_init: docker.io/openstackhelm/heat:newton
39 19
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
40
-    scripted_test: docker.io/openstackhelm/heat:newton
41 20
     image_repo_sync: docker.io/docker:17.07.0
21
+    ranger: quay.io/attcomdev/ranger:d376b6059733a4d9b0c47d1c8ba1edf98c8953e3
22
+    ranger_db_sync: quay.io/attcomdev/ranger:d376b6059733a4d9b0c47d1c8ba1edf98c8953e3
23
+    scripted_test: docker.io/openstackhelm/heat:newton
42 24
   pull_policy: "IfNotPresent"
43 25
   local_registry:
44 26
     active: false
45 27
     exclude:
46 28
       - dep_check
47 29
       - image_repo_sync
48
-conf:
49
-  ranger:
50
-    DEFAULT:
51
-      protocol: http
52
-      log_level: INFO
53
-      orm_host: 0.0.0.0
54
-      pecan_debug: True
55
-      ranger_base: '/home/ranger/ranger'
56
-      ssl_verify: False
57
-      use_handlers: console
58
-      ranger_agent_https_enable: False
59
-      ranger_agent_client_cert_path: ''
60
-    cms:
61
-      log: null
62
-    fms:
63
-      log: null
64
-    ims:
65
-      log: null
66
-    rms:
67
-      log: null
68
-    rds:
69
-      log: null
70
-      repo_local_location: /home/ranger/git_repo
71
-      repo_remote_location: git@127.0.0.1:/home/repo/ORM.git
72
-      repo_user: orm
73
-      repo_email: orm@test.com
74
-    uuid:
75
-      log: null
76
-    audit:
77
-      log: null
78
-    cli:
79
-      base_region: RegionOne
80
-    database:
81
-      max_retries: -1
82
-    keystone_authtoken:
83
-      auth_type: password
84
-      auth_version: v3
85
-      auth_enabled: False
86
-  ssh:
87
-    user: ranger
88
-    user_home: /home/ranger
89
-    ssh_key_file: ranger
90
-    ssh_key: null
91
-    ssh_config: null
92
-  cert:
93
-    ranger_agent_client_cert: null
94
-
95
-network:
96
-  cms:
97
-    ingress:
98
-      public: true
99
-      classes:
100
-        namespace: "nginx"
101
-        cluster: "nginx-cluster"
102
-      annotations:
103
-        nginx.ingress.kubernetes.io/rewrite-target: /
104
-    external_policy_local: false
105
-    node_port:
106
-      enabled: false
107
-      port: 37080
108
-  fms:
109
-    ingress:
110
-      public: true
111
-      classes:
112
-        namespace: "nginx"
113
-        cluster: "nginx-cluster"
114
-      annotations:
115
-        nginx.ingress.kubernetes.io/rewrite-target: /
116
-    external_policy_local: false
117
-    node_port:
118
-      enabled: false
119
-      port: 38082
120
-  ims:
121
-    ingress:
122
-      public: true
123
-      classes:
124
-        namespace: "nginx"
125
-        cluster: "nginx-cluster"
126
-      annotations:
127
-        nginx.ingress.kubernetes.io/rewrite-target: /
128
-    external_policy_local: false
129
-    node_port:
130
-      enabled: false
131
-      port: 38084
132
-  rms:
133
-    ingress:
134
-      public: true
135
-      classes:
136
-        namespace: "nginx"
137
-        cluster: "nginx-cluster"
138
-      annotations:
139
-        nginx.ingress.kubernetes.io/rewrite-target: /
140
-    external_policy_local: false
141
-    node_port:
142
-      enabled: false
143
-      port: 38080
144
-  audit:
145
-    ingress:
146
-      public: true
147
-      classes:
148
-        namespace: "nginx"
149
-        cluster: "nginx-cluster"
150
-      annotations:
151
-        nginx.ingress.kubernetes.io/rewrite-target: /
152
-    external_policy_local: false
153
-    node_port:
154
-      enabled: false
155
-      port: 38776
156
-  rds:
157
-    ingress:
158
-      public: true
159
-      classes:
160
-        namespace: "nginx"
161
-        cluster: "nginx-cluster"
162
-      annotations:
163
-        nginx.ingress.kubernetes.io/rewrite-target: /
164
-    external_policy_local: false
165
-    node_port:
166
-      enabled: false
167
-      port: 38777
168
-  uuid:
169
-    ingress:
170
-      public: true
171
-      classes:
172
-        namespace: "nginx"
173
-        cluster: "nginx-cluster"
174
-      annotations:
175
-        nginx.ingress.kubernetes.io/rewrite-target: /
176
-    external_policy_local: false
177
-    node_port:
178
-      enabled: false
179
-      port: 38090
180 30
 
31
+labels:
32
+  job:
33
+    node_selector_key: openstack-control-plane
34
+    node_selector_value: enabled
35
+  ranger:
36
+    node_selector_key: openstack-control-plane
37
+    node_selector_value: enabled
38
+  test:
39
+    node_selector_key: openstack-control-plane
40
+    node_selector_value: enabled
181 41
 
182 42
 dependencies:
183 43
   dynamic:
@@ -189,15 +49,7 @@ dependencies:
189 49
           - endpoint: node
190 50
             service: local_image_registry
191 51
   static:
192
-    ranger:
193
-      jobs:
194
-        - ranger-db-sync
195
-      services:
196
-        - service: oslo_db
197
-          endpoint: internal
198
-    db_sync:
199
-      jobs:
200
-        - ranger-db-init
52
+    db_drop:
201 53
       services:
202 54
         - service: oslo_db
203 55
           endpoint: internal
@@ -205,7 +57,9 @@ dependencies:
205 57
       services:
206 58
         - service: oslo_db
207 59
           endpoint: internal
208
-    db_drop:
60
+    db_sync:
61
+      jobs:
62
+        - ranger-db-init
209 63
       services:
210 64
         - service: oslo_db
211 65
           endpoint: internal
@@ -213,6 +67,84 @@ dependencies:
213 67
       services:
214 68
         - service: local_image_registry
215 69
           endpoint: internal
70
+    ranger:
71
+      jobs:
72
+        - ranger-db-sync
73
+      services:
74
+        - service: oslo_db
75
+          endpoint: internal
76
+
77
+pod:
78
+  user:
79
+    ranger:
80
+      uid: 1000
81
+  affinity:
82
+    anti:
83
+      type:
84
+        default: preferredDuringSchedulingIgnoredDuringExecution
85
+      topologyKey:
86
+        default: kubernetes.io/hostname
87
+  mounts:
88
+    ranger:
89
+      init_container: null
90
+      ranger:
91
+    ranger_tests:
92
+      init_container: null
93
+      ranger_tests:
94
+  replicas:
95
+    ranger: 1
96
+  lifecycle:
97
+    upgrades:
98
+      deployments:
99
+        revision_history: 3
100
+        pod_replacement_strategy: RollingUpdate
101
+        rolling_update:
102
+          max_unavailable: 1
103
+          max_surge: 3
104
+    disruption_budget:
105
+      ranger:
106
+        min_available: 0
107
+    termination_grace_period:
108
+      ranger:
109
+        timeout: 30
110
+  resources:
111
+    enabled: false
112
+    jobs:
113
+      db_drop:
114
+        requests:
115
+          memory: "128Mi"
116
+          cpu: "100m"
117
+        limits:
118
+          memory: "1024Mi"
119
+          cpu: "2000m"
120
+      db_init:
121
+        requests:
122
+          memory: "128Mi"
123
+          cpu: "100m"
124
+        limits:
125
+          memory: "1024Mi"
126
+          cpu: "2000m"
127
+      db_sync:
128
+        requests:
129
+          memory: "128Mi"
130
+          cpu: "100m"
131
+        limits:
132
+          memory: "1024Mi"
133
+          cpu: "2000m"
134
+      tests:
135
+        requests:
136
+          memory: "128Mi"
137
+          cpu: "100m"
138
+        limits:
139
+          memory: "1024Mi"
140
+          cpu: "2000m"
141
+    ranger:
142
+      requests:
143
+        memory: "128Mi"
144
+        cpu: "100m"
145
+      limits:
146
+        memory: "1024Mi"
147
+        cpu: "2000m"
216 148
 
217 149
 # Names of secrets used  and environmental checks
218 150
 secrets:
@@ -229,12 +161,12 @@ secrets:
229 161
     ims:
230 162
       ims:
231 163
         public: ims
232
-    rms:
233
-      rms:
234
-        public: rms
235 164
     rds:
236 165
       rds:
237 166
         public: rds
167
+    rms:
168
+      rms:
169
+        public: rms
238 170
 
239 171
 # typically overriden by environmental
240 172
 # values, but should include all endpoints
@@ -252,32 +184,20 @@ endpoints:
252 184
       default: null
253 185
     port:
254 186
       registry:
255
-      node: 5000
256
-  oslo_db:
257
-    auth:
258
-      admin:
259
-        username: root
260
-        password: password
261
-      ranger:
262
-        username: ranger
263
-        password: password
264
-    hosts:
265
-      default: mariadb
266
-    host_fqdn_override:
267
-      default: null
268
-    path: /orm
269
-    scheme: mysql+pymysql
270
-    port:
271
-      mysql:
272
-        default: 3306
273
-  oslo_cache:
187
+        node: 5000
188
+  audit:
189
+    name: audit
274 190
     hosts:
275
-      default: memcached
191
+      default: audit-api
276 192
     host_fqdn_override:
277 193
       default: null
194
+    path:
195
+      default: /v1/audit/transaction
196
+    scheme:
197
+      default: http
278 198
     port:
279
-      memcache:
280
-        default: 11211
199
+      api:
200
+        default: 7008
281 201
   cms:
282 202
     name: cms
283 203
     hosts:
@@ -315,6 +235,30 @@ endpoints:
315 235
       api:
316 236
         default: 8082
317 237
         public: 80
238
+  identity:
239
+    name: keystone
240
+    auth:
241
+      ranger:
242
+        role: admin
243
+        region_name: RegionOne
244
+        username: ranger-admin
245
+        password: password
246
+        project_name: service
247
+        user_domain_name: default
248
+        project_domain_name: default
249
+    hosts:
250
+      default: keystone
251
+      internal: keystone-api
252
+    host_fqdn_override:
253
+      default: null
254
+    path:
255
+      default: /v3
256
+    scheme:
257
+      default: http
258
+    port:
259
+      api:
260
+        default: 80
261
+        internal: 5000
318 262
   ims:
319 263
     name: ims
320 264
     hosts:
@@ -330,21 +274,31 @@ endpoints:
330 274
       api:
331 275
         default: 8084
332 276
         public: 80
333
-  rms:
334
-    name: rms
277
+  oslo_cache:
335 278
     hosts:
336
-      default: rms-api
337
-      public: rms
279
+      default: memcached
338 280
     host_fqdn_override:
339 281
       default: null
340
-    path:
341
-      default: /v2/orm/regions
342
-    scheme:
343
-      default: http
344 282
     port:
345
-      api:
346
-        default: 7003
347
-        public: 80
283
+      memcache:
284
+        default: 11211
285
+  oslo_db:
286
+    auth:
287
+      admin:
288
+        username: root
289
+        password: password
290
+      ranger:
291
+        username: ranger
292
+        password: password
293
+    hosts:
294
+      default: mariadb
295
+    host_fqdn_override:
296
+      default: null
297
+    path: /orm
298
+    scheme: mysql+pymysql
299
+    port:
300
+      mysql:
301
+        default: 3306
348 302
   rds:
349 303
     name: rds
350 304
     hosts:
@@ -360,128 +314,120 @@ endpoints:
360 314
       api:
361 315
         default: 8777
362 316
         public: 80
363
-  uuid:
364
-    name: uuid
365
-    hosts:
366
-      default: uuid-api
367
-    host_fqdn_override:
368
-      default: null
369
-    path:
370
-      default: /v1/uuids
371
-    scheme:
372
-      default: http
373
-    port:
374
-      api:
375
-        default: 7001
376
-  audit:
377
-    name: audit
317
+  rms:
318
+    name: rms
378 319
     hosts:
379
-      default: audit-api
320
+      default: rms-api
321
+      public: rms
380 322
     host_fqdn_override:
381 323
       default: null
382 324
     path:
383
-      default: /v1/audit/transaction
325
+      default: /v2/orm/regions
384 326
     scheme:
385 327
       default: http
386 328
     port:
387 329
       api:
388
-        default: 7008
389
-  identity:
390
-    name: keystone
391
-    auth:
392
-      ranger:
393
-        role: admin
394
-        region_name: RegionOne
395
-        username: ranger-admin
396
-        password: password
397
-        project_name: service
398
-        user_domain_name: default
399
-        project_domain_name: default
330
+        default: 7003
331
+        public: 80
332
+  uuid:
333
+    name: uuid
400 334
     hosts:
401
-      default: keystone
402
-      internal: keystone-api
335
+      default: uuid-api
403 336
     host_fqdn_override:
404 337
       default: null
405 338
     path:
406
-      default: /v3
339
+      default: /v1/uuids
407 340
     scheme:
408 341
       default: http
409 342
     port:
410 343
       api:
411
-        default: 80
412
-        internal: 5000
344
+        default: 7001
413 345
 
414
-pod:
415
-  user:
416
-    ranger:
417
-      uid: 1000
418
-  affinity:
419
-    anti:
420
-      type:
421
-        default: preferredDuringSchedulingIgnoredDuringExecution
422
-      topologyKey:
423
-        default: kubernetes.io/hostname
424
-  mounts:
425
-    ranger:
426
-      init_container: null
427
-      ranger:
428
-    ranger_tests:
429
-      init_container: null
430
-      ranger_tests:
431
-  replicas:
432
-    ranger: 1
433
-  lifecycle:
434
-    upgrades:
435
-      deployments:
436
-        revision_history: 3
437
-        pod_replacement_strategy: RollingUpdate
438
-        rolling_update:
439
-          max_unavailable: 1
440
-          max_surge: 3
441
-    disruption_budget:
442
-      ranger:
443
-        min_available: 0
444
-    termination_grace_period:
445
-      ranger:
446
-        timeout: 30
447
-  resources:
448
-    enabled: false
449
-    ranger:
450
-      requests:
451
-        memory: "128Mi"
452
-        cpu: "100m"
453
-      limits:
454
-        memory: "1024Mi"
455
-        cpu: "2000m"
456
-    jobs:
457
-      db_init:
458
-        requests:
459
-          memory: "128Mi"
460
-          cpu: "100m"
461
-        limits:
462
-          memory: "1024Mi"
463
-          cpu: "2000m"
464
-      db_sync:
465
-        requests:
466
-          memory: "128Mi"
467
-          cpu: "100m"
468
-        limits:
469
-          memory: "1024Mi"
470
-          cpu: "2000m"
471
-      db_drop:
472
-        requests:
473
-          memory: "128Mi"
474
-          cpu: "100m"
475
-        limits:
476
-          memory: "1024Mi"
477
-          cpu: "2000m"
478
-      tests:
479
-        requests:
480
-          memory: "128Mi"
481
-          cpu: "100m"
482
-        limits:
483
-          memory: "1024Mi"
484
-          cpu: "2000m"
346
+network:
347
+  audit:
348
+    ingress:
349
+      public: true
350
+      classes:
351
+        namespace: "nginx"
352
+        cluster: "nginx-cluster"
353
+      annotations:
354
+        nginx.ingress.kubernetes.io/rewrite-target: /
355
+    external_policy_local: false
356
+    node_port:
357
+      enabled: false
358
+      port: 38776
359
+  cms:
360
+    ingress:
361
+      public: true
362
+      classes:
363
+        namespace: "nginx"
364
+        cluster: "nginx-cluster"
365
+      annotations:
366
+        nginx.ingress.kubernetes.io/rewrite-target: /
367
+    external_policy_local: false
368
+    node_port:
369
+      enabled: false
370
+      port: 37080
371
+  fms:
372
+    ingress:
373
+      public: true
374
+      classes:
375
+        namespace: "nginx"
376
+        cluster: "nginx-cluster"
377
+      annotations:
378
+        nginx.ingress.kubernetes.io/rewrite-target: /
379
+    external_policy_local: false
380
+    node_port:
381
+      enabled: false
382
+      port: 38082
383
+  ims:
384
+    ingress:
385
+      public: true
386
+      classes:
387
+        namespace: "nginx"
388
+        cluster: "nginx-cluster"
389
+      annotations:
390
+        nginx.ingress.kubernetes.io/rewrite-target: /
391
+    external_policy_local: false
392
+    node_port:
393
+      enabled: false
394
+      port: 38084
395
+  rds:
396
+    ingress:
397
+      public: true
398
+      classes:
399
+        namespace: "nginx"
400
+        cluster: "nginx-cluster"
401
+      annotations:
402
+        nginx.ingress.kubernetes.io/rewrite-target: /
403
+    external_policy_local: false
404
+    node_port:
405
+      enabled: false
406
+      port: 38777
407
+  rms:
408
+    ingress:
409
+      public: true
410
+      classes:
411
+        namespace: "nginx"
412
+        cluster: "nginx-cluster"
413
+      annotations:
414
+        nginx.ingress.kubernetes.io/rewrite-target: /
415
+    external_policy_local: false
416
+    node_port:
417
+      enabled: false
418
+      port: 38080
419
+  uuid:
420
+    ingress:
421
+      public: true
422
+      classes:
423
+        namespace: "nginx"
424
+        cluster: "nginx-cluster"
425
+      annotations:
426
+        nginx.ingress.kubernetes.io/rewrite-target: /
427
+    external_policy_local: false
428
+    node_port:
429
+      enabled: false
430
+      port: 38090
485 431
 
486 432
 manifests:
487 433
   configmap_bin: true
@@ -489,28 +435,74 @@ manifests:
489 435
   deployment_ranger_services: true
490 436
   ingress_cms: true
491 437
   ingress_fms: true
492
-  ingress_rms: true
493 438
   ingress_ims: true
494 439
   ingress_rds: true
440
+  ingress_rms: true
495 441
   secret_db: true
496
-  secret_ssh_key: true
497 442
   secret_ingress_tls: true
443
+  secret_ssh_key: true
444
+  job_db_drop: false
498 445
   job_db_init: true
499 446
   job_db_sync: true
500
-  job_db_drop: false
501 447
   job_image_repo_sync: true
502 448
   pdb_api: true
503 449
   pod_test: true
504 450
   service_ingress_cms: true
505 451
   service_ingress_fms: true
506 452
   service_ingress_ims: true
507
-  service_ingress_rms: true
508 453
   service_ingress_rds: true
454
+  service_ingress_rms: true
455
+  service_audit: true
509 456
   service_cms: true
510 457
   service_fms: true
511 458
   service_ims: true
512
-  service_rms: true
513 459
   service_rds: true
460
+  service_rms: true
514 461
   service_uuid: true
515
-  service_audit: true
516 462
 
463
+conf:
464
+  ranger:
465
+    DEFAULT:
466
+      protocol: http
467
+      log_level: INFO
468
+      orm_host: 0.0.0.0
469
+      pecan_debug: True
470
+      ranger_base: '/home/ranger/ranger'
471
+      ssl_verify: False
472
+      use_handlers: console
473
+      ranger_agent_https_enable: False
474
+      ranger_agent_client_cert_path: ''
475
+    audit:
476
+      log: null
477
+    cli:
478
+      base_region: RegionOne
479
+    cms:
480
+      log: null
481
+    database:
482
+      max_retries: -1
483
+    fms:
484
+      log: null
485
+    ims:
486
+      log: null
487
+    keystone_authtoken:
488
+      auth_type: password
489
+      auth_version: v3
490
+      auth_enabled: False
491
+    rds:
492
+      log: null
493
+      repo_local_location: /home/ranger/git_repo
494
+      repo_remote_location: git@127.0.0.1:/home/repo/ORM.git
495
+      repo_user: orm
496
+      repo_email: orm@test.com
497
+    rms:
498
+      log: null
499
+    uuid:
500
+      log: null
501
+  ssh:
502
+    user: ranger
503
+    user_home: /home/ranger
504
+    ssh_key_file: ranger
505
+    ssh_key: null
506
+    ssh_config: null
507
+  cert:
508
+    ranger_agent_client_cert: null

Loading…
Cancel
Save