From 2db9bceee97cdcc0a406dfbf6f43bd34085693b7 Mon Sep 17 00:00:00 2001 From: Kaspars Skels Date: Sat, 20 Apr 2019 00:08:40 -0500 Subject: [PATCH] Uplift and Armada timeout fix - Uplift tiller/helm to 2.13.1 - Uplift Airship - Uplift OSH-infra - Armada uwsgi timeout fix Change-Id: Ie1a00abd26042d662931ce1b3bbbdb88ddda3faf --- global/software/charts/ucp/armada/armada.yaml | 4 + global/software/config/versions.yaml | 168 +++++++++--------- 2 files changed, 88 insertions(+), 84 deletions(-) diff --git a/global/software/charts/ucp/armada/armada.yaml b/global/software/charts/ucp/armada/armada.yaml index e32397cd3..fdde5b00d 100644 --- a/global/software/charts/ucp/armada/armada.yaml +++ b/global/software/charts/ucp/armada/armada.yaml @@ -88,6 +88,10 @@ data: pod: replicas: api: 2 + env: + armada_api: + - name: ARMADA_UWSGI_TIMEOUT + value: 14400 conf: armada: DEFAULT: diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml index 43c90f2c5..5db91a84e 100644 --- a/global/software/config/versions.yaml +++ b/global/software/config/versions.yaml @@ -4,103 +4,103 @@ data: kubernetes: apiserver: location: https://opendev.org/airship/promenade - reference: c178634b89cad626b99da31038a4d26545d3428e + reference: 44b5fae04788c6a28de0f9a2e132204561474d47 subpath: charts/apiserver type: git apiserver-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git calico: calico: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: calico type: git calico-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git etcd: location: https://opendev.org/airship/promenade - reference: c178634b89cad626b99da31038a4d26545d3428e + reference: 44b5fae04788c6a28de0f9a2e132204561474d47 subpath: charts/etcd type: git etcd-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git controller-manager: location: https://opendev.org/airship/promenade - reference: c178634b89cad626b99da31038a4d26545d3428e + reference: 44b5fae04788c6a28de0f9a2e132204561474d47 subpath: charts/controller_manager type: git controller-manager-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git coredns: location: https://opendev.org/airship/promenade - reference: c178634b89cad626b99da31038a4d26545d3428e + reference: 44b5fae04788c6a28de0f9a2e132204561474d47 subpath: charts/coredns type: git coredns-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git etcd: location: https://opendev.org/airship/promenade - reference: c178634b89cad626b99da31038a4d26545d3428e + reference: 44b5fae04788c6a28de0f9a2e132204561474d47 subpath: charts/etcd type: git etcd-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git haproxy: location: https://opendev.org/airship/promenade - reference: c178634b89cad626b99da31038a4d26545d3428e + reference: 44b5fae04788c6a28de0f9a2e132204561474d47 subpath: charts/haproxy type: git haproxy-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git ingress: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: ingress type: git ingress-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git proxy: location: https://opendev.org/airship/promenade - reference: c178634b89cad626b99da31038a4d26545d3428e + reference: 44b5fae04788c6a28de0f9a2e132204561474d47 subpath: charts/proxy type: git proxy-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git scheduler: location: https://opendev.org/airship/promenade - reference: c178634b89cad626b99da31038a4d26545d3428e + reference: 44b5fae04788c6a28de0f9a2e132204561474d47 subpath: charts/scheduler type: git scheduler-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git osh: @@ -182,93 +182,93 @@ data: osh_infra: elasticsearch: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: elasticsearch type: git fluent_logging: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: fluent-logging type: git grafana: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: grafana type: git helm_toolkit: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git kibana: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: kibana type: git nagios: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: nagios type: git nfs_provisioner: location: https://opendev.org/openstack/openstack-helm-infra - reference: 8662018a4dceb82a5d699d9e118caff9e5edb156 + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: nfs-provisioner type: git podsecuritypolicy: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: podsecuritypolicy type: git prometheus: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: prometheus type: git prometheus_alertmanager: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: prometheus-alertmanager type: git prometheus_kube_state_metrics: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: prometheus-kube-state-metrics type: git prometheus_node_exporter: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: prometheus-node-exporter type: git prometheus_openstack_exporter: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: prometheus-openstack-exporter type: git prometheus_process_exporter: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: prometheus-process-exporter type: git ucp: armada: location: https://opendev.org/airship/armada - reference: c7d9e21b1e3c144eee54d7d2a5da3eb562255894 + reference: 567a7f992bd1753fa42b0d5072fe281ffaf60c7c subpath: charts/armada type: git armada-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git barbican: location: https://opendev.org/openstack/openstack-helm - reference: 66ba0be81c66c20b5ffae709358970d5937a0202 + reference: f22f53030335121a6019a603910deef0a759b1de subpath: barbican type: git barbican-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git ceph-client: @@ -303,122 +303,122 @@ data: type: git deckhand: location: https://opendev.org/airship/deckhand - reference: 49ad9f38842f7f1ecb86d907d86d332f8186eb8c + reference: 229e2024cd9051b78f15cf4632cef6ccea1a64a6 subpath: charts/deckhand type: git deckhand-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git divingbell: location: https://opendev.org/airship/divingbell - reference: ecade10b2d8135d7a83a43e8eed8e39f9ba8f912 + reference: c45e4faa126e9a1cad7b5d917b71616b674f5ab4 subpath: divingbell type: git divingbell-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git drydock: location: https://opendev.org/airship/drydock - reference: 8f7c91fb9dc97824d426d7384ad1b8dbbf0552c9 + reference: 69f2bb82fcda6daa3acd71ade573e3bcde7cf63e subpath: charts/drydock type: git drydock-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git ingress: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: ingress type: git ingress-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git keystone: location: https://opendev.org/openstack/openstack-helm - reference: 66ba0be81c66c20b5ffae709358970d5937a0202 + reference: f22f53030335121a6019a603910deef0a759b1de subpath: keystone type: git keystone-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git maas: location: https://opendev.org/airship/maas - reference: 5e4ab93da83733a3ccc3f2f50d812242f11fe82e + reference: 2910412699231f8818a6c1b56e86c985da7f3717 subpath: charts/maas type: git maas-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git mariadb: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: mariadb type: git mariadb-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git memcached: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: memcached type: git memcached-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git postgresql: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: postgresql type: git postgresql-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git promenade: location: https://opendev.org/airship/promenade - reference: c178634b89cad626b99da31038a4d26545d3428e + reference: 44b5fae04788c6a28de0f9a2e132204561474d47 subpath: charts/promenade type: git promenade-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git rabbitmq: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: rabbitmq type: git rabbitmq-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git shipyard: location: https://opendev.org/airship/shipyard - reference: 2d10945dd853fda07cdd325a275efd66640a39b4 + reference: 46875d8ac4c549c557d7c5a0300d2e726ddb4769 subpath: charts/shipyard type: git shipyard-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git tenant-ceph-client: @@ -453,12 +453,12 @@ data: type: git tiller: location: https://opendev.org/airship/armada - reference: c7d9e21b1e3c144eee54d7d2a5da3eb562255894 + reference: 567a7f992bd1753fa42b0d5072fe281ffaf60c7c subpath: charts/tiller type: git tiller-htk: location: https://opendev.org/openstack/openstack-helm-infra - reference: a367bacb4bd3af55dd11dbc5c9855749a123779d + reference: 5e1ecd9840397bf9e8829ce0d98fcb721db1b74e subpath: helm-toolkit type: git files: @@ -530,41 +530,41 @@ data: prometheus_openstack_exporter: {} prometheus_process_exporter: {} ucp: - pegleg: - pegleg: quay.io/airshipit/pegleg:178c058474fb632806e281673d3eaf6be80fa854 armada: - api: quay.io/airshipit/armada:c7d9e21b1e3c144eee54d7d2a5da3eb562255894 - helm: docker.io/lachlanevenson/k8s-helm:v2.12.1 - tiller: gcr.io/kubernetes-helm/tiller:v2.12.1 + api: quay.io/airshipit/armada:fe8ad58605d59d0b778b1bb60272e172699aab97 + helm: docker.io/lachlanevenson/k8s-helm:v2.13.1 + tiller: gcr.io/kubernetes-helm/tiller:v2.13.1 barbican: {} deckhand: - db_sync: quay.io/airshipit/deckhand:49ad9f38842f7f1ecb86d907d86d332f8186eb8c - deckhand: quay.io/airshipit/deckhand:49ad9f38842f7f1ecb86d907d86d332f8186eb8c + db_sync: quay.io/airshipit/deckhand:81b2badca57e25efa4ce4a5e750e4923cbaa11fb + deckhand: quay.io/airshipit/deckhand:81b2badca57e25efa4ce4a5e750e4923cbaa11fb divingbell: divingbell: docker.io/ubuntu:16.04 drydock: - drydock: quay.io/airshipit/drydock:8f7c91fb9dc97824d426d7384ad1b8dbbf0552c9 - drydock_db_sync: quay.io/airshipit/drydock:8f7c91fb9dc97824d426d7384ad1b8dbbf0552c9 + drydock: quay.io/airshipit/drydock:22a4f01cb7880828f7b955c56d53603b6170415a + drydock_db_sync: quay.io/airshipit/drydock:22a4f01cb7880828f7b955c56d53603b6170415a ingress: {} keystone: {} maas: - db_sync: quay.io/airshipit/maas-region-controller:5e4ab93da83733a3ccc3f2f50d812242f11fe82e - maas_rack: quay.io/airshipit/maas-rack-controller:5e4ab93da83733a3ccc3f2f50d812242f11fe82e - maas_region: quay.io/airshipit/maas-region-controller:5e4ab93da83733a3ccc3f2f50d812242f11fe82e - bootstrap: quay.io/airshipit/maas-region-controller:5e4ab93da83733a3ccc3f2f50d812242f11fe82e - export_api_key: quay.io/airshipit/maas-region-controller:5e4ab93da83733a3ccc3f2f50d812242f11fe82e - maas_cache: quay.io/airshipit/sstream-cache:5e4ab93da83733a3ccc3f2f50d812242f11fe82e + bootstrap: quay.io/airshipit/maas-region-controller:928cddad00da3d91ef1027e5a6c4d11da74d7570 + db_sync: quay.io/airshipit/maas-region-controller:928cddad00da3d91ef1027e5a6c4d11da74d7570 + export_api_key: quay.io/airshipit/maas-region-controller:928cddad00da3d91ef1027e5a6c4d11da74d7570 + maas_cache: quay.io/airshipit/sstream-cache:928cddad00da3d91ef1027e5a6c4d11da74d7570 + maas_rack: quay.io/airshipit/maas-rack-controller:928cddad00da3d91ef1027e5a6c4d11da74d7570 + maas_region: quay.io/airshipit/maas-region-controller:928cddad00da3d91ef1027e5a6c4d11da74d7570 mariadb: {} memcached: {} + pegleg: + pegleg: quay.io/airshipit/pegleg:cecd24ed38b19f6c05a8d606d045b09639cc6989 postgresql: {} promenade: - promenade: quay.io/airshipit/promenade:12b1e84791befdc0b70b6a3854088d874f369214 + promenade: quay.io/airshipit/promenade:9b62a49eae5b29088c1f7899949df38ae91494e2 rabbitmq: {} shipyard: - airflow: quay.io/airshipit/airflow:2d10945dd853fda07cdd325a275efd66640a39b4 - airflow_db_sync: quay.io/airshipit/airflow:2d10945dd853fda07cdd325a275efd66640a39b4 - shipyard: quay.io/airshipit/shipyard:2d10945dd853fda07cdd325a275efd66640a39b4 - shipyard_db_sync: quay.io/airshipit/shipyard:2d10945dd853fda07cdd325a275efd66640a39b4 + airflow: quay.io/airshipit/airflow:70328e267bd738cf062ae53d50fdde37e089fd1b + airflow_db_sync: quay.io/airshipit/airflow:70328e267bd738cf062ae53d50fdde37e089fd1b + shipyard: quay.io/airshipit/shipyard:70328e267bd738cf062ae53d50fdde37e089fd1b + shipyard_db_sync: quay.io/airshipit/shipyard:70328e267bd738cf062ae53d50fdde37e089fd1b tiller: {} packages: gpgkey: |-