Browse Source

Merge "Reorder Ranger Agent's values.yaml to follow spec"

Zuul 4 months ago
parent
commit
45df8c6363
1 changed files with 294 additions and 294 deletions
  1. 294
    294
      ranger-agent/values.yaml

+ 294
- 294
ranger-agent/values.yaml View File

@@ -17,35 +17,19 @@
17 17
 # Declare name/value pairs to be passed into your templates.
18 18
 # name: value
19 19
 
20
-release_group: null
21
-
22
-labels:
23
-  api:
24
-    node_selector_key: openstack-control-plane
25
-    node_selector_value: enabled
26
-  engine:
27
-    node_selector_key: openstack-control-plane
28
-    node_selector_value: enabled
29
-  job:
30
-    node_selector_key: openstack-control-plane
31
-    node_selector_value: enabled
32
-  test:
33
-    node_selector_key: openstack-control-plane
34
-    node_selector_value: enabled
35
-
36 20
 images:
37 21
   tags:
38
-    ranger_agent: quay.io/attcomdev/ranger-agent:60529ac023bf550f0e9cb9e0eb4d4eb3dbf2d5c6
39
-    ranger-agent_db_sync: quay.io/attcomdev/ranger-agent:60529ac023bf550f0e9cb9e0eb4d4eb3dbf2d5c6
40 22
     db_drop: docker.io/openstackhelm/heat:newton
41 23
     db_init: docker.io/openstackhelm/heat:newton
42
-    ks_user: docker.io/openstackhelm/heat:newton
24
+    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
25
+    image_repo_sync: docker.io/docker:17.07.0
26
+    ks_endpoints: docker.io/openstackhelm/heat:newton
43 27
     ks_service: docker.io/openstackhelm/heat:newton
28
+    ks_user: docker.io/openstackhelm/heat:newton
44 29
     rabbit_init: docker.io/rabbitmq:3.7-management
45
-    ks_endpoints: docker.io/openstackhelm/heat:newton
46
-    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
30
+    ranger-agent_db_sync: quay.io/attcomdev/ranger-agent:60529ac023bf550f0e9cb9e0eb4d4eb3dbf2d5c6
31
+    ranger_agent: quay.io/attcomdev/ranger-agent:60529ac023bf550f0e9cb9e0eb4d4eb3dbf2d5c6
47 32
     scripted_test: docker.io/openstackhelm/heat:newton
48
-    image_repo_sync: docker.io/docker:17.07.0
49 33
   pull_policy: "IfNotPresent"
50 34
   local_registry:
51 35
     active: false
@@ -53,61 +37,19 @@ images:
53 37
       - dep_check
54 38
       - image_repo_sync
55 39
 
56
-conf:
57
-  paste:
58
-    pipeline:main:
59
-      pipeline: request_id api-server
60
-    app:api-server:
61
-      paste.app_factory: ord.api.app:app_factory
62
-    filter:authtoken:
63
-      paste.filter_factory: keystonemiddleware.auth_token:filter_factory
64
-    filter:request_id:
65
-      paste.filter_factory: oslo_middleware:RequestId.factory
66
-  ranger_agent:
67
-    DEFAULT:
68
-      api_workers: 1
69
-      debug: false
70
-      verbose: true
71
-      pecan_debug: true
72
-      repo_connection_timeout: 120
73
-      resource_creation_timeout_min: 1200
74
-      resource_creation_timeout_max: 14400
75
-      use_stderr: true
76
-      api_paste_config: /etc/ranger-agent/api-paste.ini
77
-      local_repo: ranger_repo
78
-      resource_status_check_wait: 15
79
-    api:
80
-      host: 0.0.0.0
81
-    database:
82
-      max_retries: -1
83
-    oslo_messaging_notifications:
84
-      driver: messagingv2
85
-    orm:
86
-      orm_template_repo_url: git@github.com:ranger-agent/templates.git
87
-      repo_pull_check_wait: 2
88
-      retry_limits: 5
89
-    keystone_authtoken:
90
-      auth_type: password
91
-      auth_version: v3
92
-  ssh:
93
-    user: ranger_agent
94
-    user_home: /home/ranger_agent
95
-    ssh_key_file: ranger_agent
96
-    ssh_key: null
97
-    ssh_config: null
98
-network:
40
+labels:
99 41
   api:
100
-    ingress:
101
-      public: true
102
-      classes:
103
-        namespace: "nginx"
104
-        cluster: "nginx-cluster"
105
-      annotations:
106
-        nginx.ingress.kubernetes.io/rewrite-target: /
107
-    external_policy_local: false
108
-    node_port:
109
-      enabled: false
110
-      port: 30010
42
+    node_selector_key: openstack-control-plane
43
+    node_selector_value: enabled
44
+  engine:
45
+    node_selector_key: openstack-control-plane
46
+    node_selector_value: enabled
47
+  job:
48
+    node_selector_key: openstack-control-plane
49
+    node_selector_value: enabled
50
+  test:
51
+    node_selector_key: openstack-control-plane
52
+    node_selector_value: enabled
111 53
 
112 54
 dependencies:
113 55
   dynamic:
@@ -128,20 +70,10 @@ dependencies:
128 70
       services:
129 71
         - service: oslo_db
130 72
           endpoint: internal
131
-    engine:
132
-      jobs:
133
-        - ranger-agent-db-sync
134
-        - ranger-agent-ks-user
135
-        - ranger-agent-rabbit-init
73
+    db_drop:
136 74
       services:
137 75
         - service: oslo_db
138 76
           endpoint: internal
139
-        - service: identity
140
-          endpoint: internal
141
-        - service: orchestration
142
-          endpoint: internal
143
-        - service: image
144
-          endpoint: internal
145 77
     db_init:
146 78
       services:
147 79
         - service: oslo_db
@@ -152,11 +84,27 @@ dependencies:
152 84
       services:
153 85
         - service: oslo_db
154 86
           endpoint: internal
155
-    db_drop:
87
+    engine:
88
+      jobs:
89
+        - ranger-agent-db-sync
90
+        - ranger-agent-ks-user
91
+        - ranger-agent-rabbit-init
156 92
       services:
157 93
         - service: oslo_db
158 94
           endpoint: internal
159
-    ks_user:
95
+        - service: identity
96
+          endpoint: internal
97
+        - service: orchestration
98
+          endpoint: internal
99
+        - service: image
100
+          endpoint: internal
101
+    image_repo_sync:
102
+      services:
103
+        - endpoint: internal
104
+          service: local_image_registry
105
+    ks_endpoints:
106
+      jobs:
107
+        - ranger-agent-ks-service
160 108
       services:
161 109
         - service: identity
162 110
           endpoint: internal
@@ -164,9 +112,7 @@ dependencies:
164 112
       services:
165 113
         - service: identity
166 114
           endpoint: internal
167
-    ks_endpoints:
168
-      jobs:
169
-        - ranger-agent-ks-service
115
+    ks_user:
170 116
       services:
171 117
         - service: identity
172 118
           endpoint: internal
@@ -174,10 +120,142 @@ dependencies:
174 120
       services:
175 121
         - service: oslo_messaging
176 122
           endpoint: internal
177
-    image_repo_sync:
178
-      services:
179
-        - endpoint: internal
180
-          service: local_image_registry
123
+
124
+network:
125
+  api:
126
+    ingress:
127
+      public: true
128
+      classes:
129
+        namespace: "nginx"
130
+        cluster: "nginx-cluster"
131
+      annotations:
132
+        nginx.ingress.kubernetes.io/rewrite-target: /
133
+    external_policy_local: false
134
+    node_port:
135
+      enabled: false
136
+      port: 30010
137
+
138
+pod:
139
+  user:
140
+    ranger_agent:
141
+      uid: 1000
142
+  affinity:
143
+    anti:
144
+      type:
145
+        default: preferredDuringSchedulingIgnoredDuringExecution
146
+      topologyKey:
147
+        default: kubernetes.io/hostname
148
+  mounts:
149
+    ranger_agent_api:
150
+      init_container: null
151
+      ranger_agent_api:
152
+    ranger_agent_engine:
153
+      init_container: null
154
+      ranger_agent_engine:
155
+    ranger_agent_tests:
156
+      init_container: null
157
+      ranger_agent_tests:
158
+  replicas:
159
+    api: 1
160
+    engine: 1
161
+  lifecycle:
162
+    upgrades:
163
+      deployments:
164
+        revision_history: 3
165
+        pod_replacement_strategy: RollingUpdate
166
+        rolling_update:
167
+          max_unavailable: 1
168
+          max_surge: 3
169
+    disruption_budget:
170
+      ranger_agent_api:
171
+        min_available: 0
172
+      ranger_agent_engine:
173
+        min_available: 0
174
+    termination_grace_period:
175
+      ranger_agent_api:
176
+        timeout: 30
177
+      ranger_agent_engine:
178
+        timeout: 30
179
+  resources:
180
+    enabled: false
181
+    jobs:
182
+      db_drop:
183
+        requests:
184
+          memory: "128Mi"
185
+          cpu: "100m"
186
+        limits:
187
+          memory: "1024Mi"
188
+          cpu: "2000m"
189
+      db_init:
190
+        requests:
191
+          memory: "128Mi"
192
+          cpu: "100m"
193
+        limits:
194
+          memory: "1024Mi"
195
+          cpu: "2000m"
196
+      db_sync:
197
+        requests:
198
+          memory: "128Mi"
199
+          cpu: "100m"
200
+        limits:
201
+          memory: "1024Mi"
202
+          cpu: "2000m"
203
+      image_repo_sync:
204
+        requests:
205
+          memory: "128Mi"
206
+          cpu: "100m"
207
+        limits:
208
+          memory: "1024Mi"
209
+          cpu: "2000m"
210
+      ks_endpoints:
211
+        requests:
212
+          memory: "128Mi"
213
+          cpu: "100m"
214
+        limits:
215
+          memory: "1024Mi"
216
+          cpu: "2000m"
217
+      ks_service:
218
+        requests:
219
+          memory: "128Mi"
220
+          cpu: "100m"
221
+        limits:
222
+          memory: "1024Mi"
223
+          cpu: "2000m"
224
+      ks_user:
225
+        requests:
226
+          memory: "128Mi"
227
+          cpu: "100m"
228
+        limits:
229
+          memory: "1024Mi"
230
+          cpu: "2000m"
231
+      rabbit_init:
232
+        requests:
233
+          memory: "128Mi"
234
+          cpu: "100m"
235
+        limits:
236
+          memory: "1024Mi"
237
+          cpu: "2000m"
238
+      tests:
239
+        requests:
240
+          memory: "128Mi"
241
+          cpu: "100m"
242
+        limits:
243
+          memory: "1024Mi"
244
+          cpu: "2000m"
245
+    ranger_agent_api:
246
+      requests:
247
+        memory: "128Mi"
248
+        cpu: "100m"
249
+      limits:
250
+        memory: "1024Mi"
251
+        cpu: "2000m"
252
+    ranger_agent_engine:
253
+      requests:
254
+        memory: "128Mi"
255
+        cpu: "100m"
256
+      limits:
257
+        memory: "1024Mi"
258
+        cpu: "2000m"
181 259
 
182 260
 # Names of secrets used  and environmental checks
183 261
 secrets:
@@ -197,81 +275,22 @@ secrets:
197 275
         public: ranger-agent
198 276
 
199 277
 # typically overridden by environmental
200
-# values, but should include all endpoints
201
-# required by this chart
202
-endpoints:
203
-  cluster_domain_suffix: cluster.local
204
-  local_image_registry:
205
-    name: docker-registry
206
-    namespace: docker-registry
207
-    hosts:
208
-      default: localhost
209
-      internal: docker-registry
210
-      node: localhost
211
-    host_fqdn_override:
212
-      default: null
213
-    port:
214
-      registry:
215
-        node: 5000
216
-  oslo_db:
217
-    auth:
218
-      admin:
219
-        username: root
220
-        password: password
221
-      ranger_agent:
222
-        username: ranger-agent
223
-        password: password
224
-    hosts:
225
-      default: mariadb
226
-    host_fqdn_override:
227
-      default: null
228
-    path: /ord
229
-    scheme: mysql+pymysql
230
-    port:
231
-      mysql:
232
-        default: 3306
233
-  oslo_cache:
234
-    hosts:
235
-      default: memcached
236
-    host_fqdn_override:
237
-      default: null
238
-    port:
239
-      memcache:
240
-        default: 11211
241
-  oslo_messaging:
242
-    auth:
243
-      admin:
244
-        username: rabbitmq
245
-        password: password
246
-      ranger-agent:
247
-        username: ranger-agent
248
-        password: password
249
-    hosts:
250
-      default: rabbitmq
251
-    host_fqdn_override:
252
-      default: null
253
-    path: /ranger-agent
254
-    scheme: rabbit
255
-    port:
256
-      amqp:
257
-        default: 5672
258
-      http:
259
-        default: 15672
260
-  ranger_rds:
261
-    name: rds-url
278
+# values, but should include all endpoints
279
+# required by this chart
280
+endpoints:
281
+  cluster_domain_suffix: cluster.local
282
+  local_image_registry:
283
+    name: docker-registry
284
+    namespace: docker-registry
262 285
     hosts:
263
-      default: rds
264
-      public: rds-public
286
+      default: localhost
287
+      internal: docker-registry
288
+      node: localhost
265 289
     host_fqdn_override:
266 290
       default: null
267
-    path:
268
-      default: /v1/rds/status
269
-    scheme:
270
-      default: http
271 291
     port:
272
-      rds:
273
-        default: 8777
274
-        public: 80
292
+      registry:
293
+        node: 5000
275 294
   identity:
276 295
     name: keystone
277 296
     auth:
@@ -347,6 +366,50 @@ endpoints:
347 366
       api:
348 367
         default: 8004
349 368
         public: 80
369
+  oslo_cache:
370
+    hosts:
371
+      default: memcached
372
+    host_fqdn_override:
373
+      default: null
374
+    port:
375
+      memcache:
376
+        default: 11211
377
+  oslo_db:
378
+    auth:
379
+      admin:
380
+        username: root
381
+        password: password
382
+      ranger_agent:
383
+        username: ranger-agent
384
+        password: password
385
+    hosts:
386
+      default: mariadb
387
+    host_fqdn_override:
388
+      default: null
389
+    path: /ord
390
+    scheme: mysql+pymysql
391
+    port:
392
+      mysql:
393
+        default: 3306
394
+  oslo_messaging:
395
+    auth:
396
+      admin:
397
+        username: rabbitmq
398
+        password: password
399
+      ranger-agent:
400
+        username: ranger-agent
401
+        password: password
402
+    hosts:
403
+      default: rabbitmq
404
+    host_fqdn_override:
405
+      default: null
406
+    path: /ranger-agent
407
+    scheme: rabbit
408
+    port:
409
+      amqp:
410
+        default: 5672
411
+      http:
412
+        default: 15672
350 413
   ranger_agent:
351 414
     name: ranger-agent
352 415
     hosts:
@@ -369,128 +432,22 @@ endpoints:
369 432
       api:
370 433
         default: 9010
371 434
         public: 80
435
+  ranger_rds:
436
+    name: rds-url
437
+    hosts:
438
+      default: rds
439
+      public: rds-public
440
+    host_fqdn_override:
441
+      default: null
442
+    path:
443
+      default: /v1/rds/status
444
+    scheme:
445
+      default: http
446
+    port:
447
+      rds:
448
+        default: 8777
449
+        public: 80
372 450
 
373
-pod:
374
-  user:
375
-    ranger_agent:
376
-      uid: 1000
377
-  affinity:
378
-    anti:
379
-      type:
380
-        default: preferredDuringSchedulingIgnoredDuringExecution
381
-      topologyKey:
382
-        default: kubernetes.io/hostname
383
-  mounts:
384
-    ranger_agent_api:
385
-      init_container: null
386
-      ranger_agent_api:
387
-    ranger_agent_engine:
388
-      init_container: null
389
-      ranger_agent_engine:
390
-    ranger_agent_tests:
391
-      init_container: null
392
-      ranger_agent_tests:
393
-  replicas:
394
-    api: 1
395
-    engine: 1
396
-  lifecycle:
397
-    upgrades:
398
-      deployments:
399
-        revision_history: 3
400
-        pod_replacement_strategy: RollingUpdate
401
-        rolling_update:
402
-          max_unavailable: 1
403
-          max_surge: 3
404
-    disruption_budget:
405
-      ranger_agent_api:
406
-        min_available: 0
407
-      ranger_agent_engine:
408
-        min_available: 0
409
-    termination_grace_period:
410
-      ranger_agent_api:
411
-        timeout: 30
412
-      ranger_agent_engine:
413
-        timeout: 30
414
-  resources:
415
-    enabled: false
416
-    ranger_agent_api:
417
-      requests:
418
-        memory: "128Mi"
419
-        cpu: "100m"
420
-      limits:
421
-        memory: "1024Mi"
422
-        cpu: "2000m"
423
-    ranger_agent_engine:
424
-      requests:
425
-        memory: "128Mi"
426
-        cpu: "100m"
427
-      limits:
428
-        memory: "1024Mi"
429
-        cpu: "2000m"
430
-    jobs:
431
-      db_init:
432
-        requests:
433
-          memory: "128Mi"
434
-          cpu: "100m"
435
-        limits:
436
-          memory: "1024Mi"
437
-          cpu: "2000m"
438
-      db_sync:
439
-        requests:
440
-          memory: "128Mi"
441
-          cpu: "100m"
442
-        limits:
443
-          memory: "1024Mi"
444
-          cpu: "2000m"
445
-      db_drop:
446
-        requests:
447
-          memory: "128Mi"
448
-          cpu: "100m"
449
-        limits:
450
-          memory: "1024Mi"
451
-          cpu: "2000m"
452
-      ks_endpoints:
453
-        requests:
454
-          memory: "128Mi"
455
-          cpu: "100m"
456
-        limits:
457
-          memory: "1024Mi"
458
-          cpu: "2000m"
459
-      ks_service:
460
-        requests:
461
-          memory: "128Mi"
462
-          cpu: "100m"
463
-        limits:
464
-          memory: "1024Mi"
465
-          cpu: "2000m"
466
-      ks_user:
467
-        requests:
468
-          memory: "128Mi"
469
-          cpu: "100m"
470
-        limits:
471
-          memory: "1024Mi"
472
-          cpu: "2000m"
473
-      rabbit_init:
474
-        requests:
475
-          memory: "128Mi"
476
-          cpu: "100m"
477
-        limits:
478
-          memory: "1024Mi"
479
-          cpu: "2000m"
480
-      tests:
481
-        requests:
482
-          memory: "128Mi"
483
-          cpu: "100m"
484
-        limits:
485
-          memory: "1024Mi"
486
-          cpu: "2000m"
487
-      image_repo_sync:
488
-        requests:
489
-          memory: "128Mi"
490
-          cpu: "100m"
491
-        limits:
492
-          memory: "1024Mi"
493
-          cpu: "2000m"
494 451
 
495 452
 manifests:
496 453
   configmap_bin: true
@@ -498,14 +455,9 @@ manifests:
498 455
   deployment_ranger_agent_api: true
499 456
   deployment_ranger_agent_engine: true
500 457
   ingress_ranger_agent_api: true
501
-  secret_db: true
502
-  secret_keystone: true
503
-  secret_ssh_key: true
504
-  secret_rabbitmq: true
505
-  secret_ingress_tls: true
458
+  job_db_drop: false
506 459
   job_db_init: true
507 460
   job_db_sync: true
508
-  job_db_drop: false
509 461
   job_image_repo_sync: true
510 462
   job_ks_endpoints: true
511 463
   job_ks_service: true
@@ -514,5 +466,53 @@ manifests:
514 466
   job_rabbit_init: true
515 467
   pdb_api: true
516 468
   pod_test: true
469
+  secret_db: true
470
+  secret_ingress_tls: true
471
+  secret_keystone: true
472
+  secret_rabbitmq: true
473
+  secret_ssh_key: true
517 474
   service_ingress_ranger_agent_api: true
518 475
   service_ranger_agent_api: true
476
+
477
+conf:
478
+  paste:
479
+    pipeline:main:
480
+      pipeline: request_id api-server
481
+    app:api-server:
482
+      paste.app_factory: ord.api.app:app_factory
483
+    filter:authtoken:
484
+      paste.filter_factory: keystonemiddleware.auth_token:filter_factory
485
+    filter:request_id:
486
+      paste.filter_factory: oslo_middleware:RequestId.factory
487
+  ranger_agent:
488
+    DEFAULT:
489
+      api_workers: 1
490
+      debug: false
491
+      verbose: true
492
+      pecan_debug: true
493
+      repo_connection_timeout: 120
494
+      resource_creation_timeout_min: 1200
495
+      resource_creation_timeout_max: 14400
496
+      use_stderr: true
497
+      api_paste_config: /etc/ranger-agent/api-paste.ini
498
+      local_repo: ranger_repo
499
+      resource_status_check_wait: 15
500
+    api:
501
+      host: 0.0.0.0
502
+    database:
503
+      max_retries: -1
504
+    keystone_authtoken:
505
+      auth_type: password
506
+      auth_version: v3
507
+    orm:
508
+      orm_template_repo_url: git@github.com:ranger-agent/templates.git
509
+      repo_pull_check_wait: 2
510
+      retry_limits: 5
511
+    oslo_messaging_notifications:
512
+      driver: messagingv2
513
+  ssh:
514
+    user: ranger_agent
515
+    user_home: /home/ranger_agent
516
+    ssh_key_file: ranger_agent
517
+    ssh_key: null
518
+    ssh_config: null

Loading…
Cancel
Save