Browse Source

Update Shipyard Pod Configuration

Updates to use new Shipyard pod configurations, removes node port use.
Requires Shipyard commit a11e962eef or
newer.

Change-Id: Iff5af45d6b4f60c34d18aad821cf9afa4ea67dda
Bryan Strassner 2 months ago
parent
commit
bbfa8eada7

+ 4
- 35
global/software/charts/ucp/shipyard/shipyard.yaml View File

@@ -26,20 +26,6 @@ metadata:
26 26
       dest:
27 27
         path: .values.images.tags
28 28
 
29
-    # Node ports
30
-    - src:
31
-        schema: pegleg/CommonAddresses/v1
32
-        name: common-addresses
33
-        path: .node_ports.shipyard_api
34
-      dest:
35
-        path: .values.network.shipyard.node_port
36
-    - src:
37
-        schema: pegleg/CommonAddresses/v1
38
-        name: common-addresses
39
-        path: .node_ports.airflow_web
40
-      dest:
41
-        path: .values.network.airflow.web.node_port
42
-
43 29
     # Endpoints
44 30
     - src:
45 31
         schema: pegleg/EndpointCatalogue/v1
@@ -71,18 +57,6 @@ metadata:
71 57
         path: .ucp.shipyard
72 58
       dest:
73 59
         path: .values.endpoints.shipyard
74
-    - src:
75
-        schema: pegleg/EndpointCatalogue/v1
76
-        name: ucp_endpoints
77
-        path: .ucp.airflow_web
78
-      dest:
79
-        path: .values.endpoints.airflow_web
80
-    - src:
81
-        schema: pegleg/EndpointCatalogue/v1
82
-        name: ucp_endpoints
83
-        path: .ucp.airflow_flower
84
-      dest:
85
-        path: .values.endpoints.airflow_flower
86 60
     - src:
87 61
         schema: pegleg/EndpointCatalogue/v1
88 62
         name: ucp_endpoints
@@ -289,20 +263,15 @@ data:
289 263
         shipyard:
290 264
           api: 2
291 265
         airflow:
292
-          web: 2
293 266
           worker: 2
294
-          flower: 2
295
-          scheduler: 2
267
+          # TODO: Scheduler can be set to 0 with a future version - here to
268
+          # accommodate the upgrade to the current configuration with the
269
+          # Scheduler being a sidecar with the Worker.
270
+          scheduler: 1
296 271
     labels:
297 272
       job:
298 273
         node_selector_key: ucp-control-plane
299 274
         node_selector_value: enabled
300
-    network:
301
-      shipyard:
302
-        enable_node_port: true
303
-      airflow:
304
-        web:
305
-          enable_node_port: true
306 275
     conf:
307 276
       shipyard:
308 277
         keystone_authtoken:

+ 5
- 5
global/software/config/versions.yaml View File

@@ -408,7 +408,7 @@ data:
408 408
         type: git
409 409
       shipyard:
410 410
         location: https://git.openstack.org/openstack/airship-shipyard
411
-        reference: 6bd02eea8477bba077848463e7e740efe12fa782
411
+        reference: c7472d7f607bb1ee0202cebd9706754f5bb7decf
412 412
         subpath: charts/shipyard
413 413
         type: git
414 414
       shipyard-htk:
@@ -553,10 +553,10 @@ data:
553 553
         promenade: quay.io/airshipit/promenade:76c942b5ce9c106f69173ab8e03319238087262a
554 554
       rabbitmq: {}
555 555
       shipyard:
556
-        airflow: quay.io/airshipit/airflow:6bd02eea8477bba077848463e7e740efe12fa782
557
-        airflow_db_sync: quay.io/airshipit/airflow:6bd02eea8477bba077848463e7e740efe12fa782
558
-        shipyard: quay.io/airshipit/shipyard:6bd02eea8477bba077848463e7e740efe12fa782
559
-        shipyard_db_sync: quay.io/airshipit/shipyard:6bd02eea8477bba077848463e7e740efe12fa782
556
+        airflow: quay.io/airshipit/airflow:c7472d7f607bb1ee0202cebd9706754f5bb7decf
557
+        airflow_db_sync: quay.io/airshipit/airflow:c7472d7f607bb1ee0202cebd9706754f5bb7decf
558
+        shipyard: quay.io/airshipit/shipyard:c7472d7f607bb1ee0202cebd9706754f5bb7decf
559
+        shipyard_db_sync: quay.io/airshipit/shipyard:c7472d7f607bb1ee0202cebd9706754f5bb7decf
560 560
       tiller: {}
561 561
   packages:
562 562
     gpgkey: |-

+ 0
- 2
site/airship-seaworthy/networks/common-addresses.yaml View File

@@ -103,8 +103,6 @@ data:
103 103
     drydock_api: 30000
104 104
     maas_api: 30001
105 105
     maas_proxy: 31800  # hardcoded in MAAS
106
-    shipyard_api: 30003
107
-    airflow_web: 30004
108 106
 
109 107
   ntp:
110 108
     # comma separated NTP server list. Verify that these upstream NTP servers are

+ 0
- 27
site/airship-seaworthy/software/config/endpoints.yaml View File

@@ -246,33 +246,6 @@ data:
246 246
         default: null
247 247
         public:
248 248
           host: shipyard.DOMAIN
249
-    airflow_web:
250
-      name: airflow-web
251
-      hosts:
252
-        default: airflow-web-int
253
-        public: airflow-web
254
-      port:
255
-        airflow_web:
256
-          default: 8080
257
-      path:
258
-        default: /
259
-      scheme:
260
-        default: "http"
261
-      host_fqdn_override:
262
-        default: null
263
-    airflow_flower:
264
-      name: airflow-flower
265
-      hosts:
266
-        default: airflow-flower
267
-      port:
268
-        airflow_flower:
269
-          default: 5555
270
-      path:
271
-        default: /
272
-      scheme:
273
-        default: "http"
274
-      host_fqdn_override:
275
-        default: null
276 249
     prometheus_openstack_exporter:
277 250
       namespace: ucp
278 251
       hosts:

+ 0
- 2
site/airskiff/networks/common-addresses.yaml View File

@@ -100,8 +100,6 @@ data:
100 100
     drydock_api: 30000
101 101
     maas_api: 30001
102 102
     maas_proxy: 31800  # hardcoded in MAAS
103
-    shipyard_api: 30003
104
-    airflow_web: 30004
105 103
 
106 104
   ntp:
107 105
     # comma separated NTP server list. Verify that these upstream NTP servers

+ 0
- 27
site/airskiff/software/config/endpoints.yaml View File

@@ -243,33 +243,6 @@ data:
243 243
         default: null
244 244
         public:
245 245
           host: shipyard.DOMAIN
246
-    airflow_web:
247
-      name: airflow-web
248
-      hosts:
249
-        default: airflow-web-int
250
-        public: airflow-web
251
-      port:
252
-        airflow_web:
253
-          default: 8080
254
-      path:
255
-        default: /
256
-      scheme:
257
-        default: "http"
258
-      host_fqdn_override:
259
-        default: null
260
-    airflow_flower:
261
-      name: airflow-flower
262
-      hosts:
263
-        default: airflow-flower
264
-      port:
265
-        airflow_flower:
266
-          default: 5555
267
-      path:
268
-        default: /
269
-      scheme:
270
-        default: "http"
271
-      host_fqdn_override:
272
-        default: null
273 246
     prometheus_openstack_exporter:
274 247
       namespace: ucp
275 248
       hosts:

Loading…
Cancel
Save