From 20ea85df6e4fd2b3646295af60fd2409986ad4f5 Mon Sep 17 00:00:00 2001 From: Evgeny L Date: Fri, 30 Aug 2019 20:09:41 +0000 Subject: [PATCH] Fix airskiff gate and uplift shipyard Now Shipyard [1] requires `statefulset` to be configured for airflow endpoints. This patch fixes both airskiff gates and other sites. [1] https://review.opendev.org/#/c/671575/ Change-Id: I29edeb27763059b1dd5f99db4740e0913f0dc56d --- global/software/config/versions.yaml | 10 +++++----- site/seaworthy-virt/software/config/endpoints.yaml | 2 ++ site/seaworthy/software/config/endpoints.yaml | 2 ++ type/skiff/config/endpoints.yaml | 2 ++ type/sloop/config/endpoints.yaml | 2 ++ 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml index 18980daba..3fff7e501 100644 --- a/global/software/config/versions.yaml +++ b/global/software/config/versions.yaml @@ -493,7 +493,7 @@ data: type: git shipyard: location: https://opendev.org/airship/shipyard - reference: fed3407634c662720885658d179274b74c37f576 + reference: c21555fce0d4f9dffce219d1be70e5d5cebca2a7 subpath: charts/shipyard type: git shipyard-htk: @@ -643,10 +643,10 @@ data: promenade: quay.io/airshipit/promenade:b3533b8522ac67f581837a1a5033d3b9777e9e89 rabbitmq: {} shipyard: - airflow: quay.io/airshipit/airflow:fed3407634c662720885658d179274b74c37f576-ubuntu_xenial - airflow_db_sync: quay.io/airshipit/airflow:fed3407634c662720885658d179274b74c37f576-ubuntu_xenial - shipyard: quay.io/airshipit/shipyard:fed3407634c662720885658d179274b74c37f576-ubuntu_xenial - shipyard_db_sync: quay.io/airshipit/shipyard:fed3407634c662720885658d179274b74c37f576-ubuntu_xenial + airflow: quay.io/airshipit/airflow:c21555fce0d4f9dffce219d1be70e5d5cebca2a7-ubuntu_xenial + airflow_db_sync: quay.io/airshipit/airflow:c21555fce0d4f9dffce219d1be70e5d5cebca2a7-ubuntu_xenial + shipyard: quay.io/airshipit/shipyard:c21555fce0d4f9dffce219d1be70e5d5cebca2a7-ubuntu_xenial + shipyard_db_sync: quay.io/airshipit/shipyard:c21555fce0d4f9dffce219d1be70e5d5cebca2a7-ubuntu_xenial tiller: {} packages: gpgkey: |- diff --git a/site/seaworthy-virt/software/config/endpoints.yaml b/site/seaworthy-virt/software/config/endpoints.yaml index 1eaaea0d7..8d47cde38 100644 --- a/site/seaworthy-virt/software/config/endpoints.yaml +++ b/site/seaworthy-virt/software/config/endpoints.yaml @@ -108,6 +108,8 @@ data: public: 80 airflow_oslo_messaging: namespace: null + statefulset: + name: airship-ucp-rabbitmq-rabbitmq hosts: default: rabbitmq host_fqdn_override: diff --git a/site/seaworthy/software/config/endpoints.yaml b/site/seaworthy/software/config/endpoints.yaml index f229ea12c..0dc32749f 100644 --- a/site/seaworthy/software/config/endpoints.yaml +++ b/site/seaworthy/software/config/endpoints.yaml @@ -163,6 +163,8 @@ data: public: 80 airflow_oslo_messaging: namespace: null + statefulset: + name: airship-ucp-rabbitmq-rabbitmq hosts: default: rabbitmq host_fqdn_override: diff --git a/type/skiff/config/endpoints.yaml b/type/skiff/config/endpoints.yaml index 0aa655d3a..f5c89559f 100644 --- a/type/skiff/config/endpoints.yaml +++ b/type/skiff/config/endpoints.yaml @@ -108,6 +108,8 @@ data: public: 80 airflow_oslo_messaging: namespace: null + statefulset: + name: airship-ucp-rabbitmq-rabbitmq hosts: default: rabbitmq host_fqdn_override: diff --git a/type/sloop/config/endpoints.yaml b/type/sloop/config/endpoints.yaml index 0aa655d3a..f5c89559f 100644 --- a/type/sloop/config/endpoints.yaml +++ b/type/sloop/config/endpoints.yaml @@ -108,6 +108,8 @@ data: public: 80 airflow_oslo_messaging: namespace: null + statefulset: + name: airship-ucp-rabbitmq-rabbitmq hosts: default: rabbitmq host_fqdn_override: