Update Shipyard Pod Configuration

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

Change-Id: Iff5af45d6b4f60c34d18aad821cf9afa4ea67dda
This commit is contained in:
Bryan Strassner 2019-02-04 15:43:58 -06:00 committed by Kaspars Skels
parent 26cf5a0fc6
commit bbfa8eada7
6 changed files with 9 additions and 98 deletions

View File

@ -26,20 +26,6 @@ metadata:
dest:
path: .values.images.tags
# Node ports
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .node_ports.shipyard_api
dest:
path: .values.network.shipyard.node_port
- src:
schema: pegleg/CommonAddresses/v1
name: common-addresses
path: .node_ports.airflow_web
dest:
path: .values.network.airflow.web.node_port
# Endpoints
- src:
schema: pegleg/EndpointCatalogue/v1
@ -71,18 +57,6 @@ metadata:
path: .ucp.shipyard
dest:
path: .values.endpoints.shipyard
- src:
schema: pegleg/EndpointCatalogue/v1
name: ucp_endpoints
path: .ucp.airflow_web
dest:
path: .values.endpoints.airflow_web
- src:
schema: pegleg/EndpointCatalogue/v1
name: ucp_endpoints
path: .ucp.airflow_flower
dest:
path: .values.endpoints.airflow_flower
- src:
schema: pegleg/EndpointCatalogue/v1
name: ucp_endpoints
@ -289,20 +263,15 @@ data:
shipyard:
api: 2
airflow:
web: 2
worker: 2
flower: 2
scheduler: 2
# TODO: Scheduler can be set to 0 with a future version - here to
# accommodate the upgrade to the current configuration with the
# Scheduler being a sidecar with the Worker.
scheduler: 1
labels:
job:
node_selector_key: ucp-control-plane
node_selector_value: enabled
network:
shipyard:
enable_node_port: true
airflow:
web:
enable_node_port: true
conf:
shipyard:
keystone_authtoken:

View File

@ -408,7 +408,7 @@ data:
type: git
shipyard:
location: https://git.openstack.org/openstack/airship-shipyard
reference: 6bd02eea8477bba077848463e7e740efe12fa782
reference: c7472d7f607bb1ee0202cebd9706754f5bb7decf
subpath: charts/shipyard
type: git
shipyard-htk:
@ -553,10 +553,10 @@ data:
promenade: quay.io/airshipit/promenade:76c942b5ce9c106f69173ab8e03319238087262a
rabbitmq: {}
shipyard:
airflow: quay.io/airshipit/airflow:6bd02eea8477bba077848463e7e740efe12fa782
airflow_db_sync: quay.io/airshipit/airflow:6bd02eea8477bba077848463e7e740efe12fa782
shipyard: quay.io/airshipit/shipyard:6bd02eea8477bba077848463e7e740efe12fa782
shipyard_db_sync: quay.io/airshipit/shipyard:6bd02eea8477bba077848463e7e740efe12fa782
airflow: quay.io/airshipit/airflow:c7472d7f607bb1ee0202cebd9706754f5bb7decf
airflow_db_sync: quay.io/airshipit/airflow:c7472d7f607bb1ee0202cebd9706754f5bb7decf
shipyard: quay.io/airshipit/shipyard:c7472d7f607bb1ee0202cebd9706754f5bb7decf
shipyard_db_sync: quay.io/airshipit/shipyard:c7472d7f607bb1ee0202cebd9706754f5bb7decf
tiller: {}
packages:
gpgkey: |-

View File

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

View File

@ -246,33 +246,6 @@ data:
default: null
public:
host: shipyard.DOMAIN
airflow_web:
name: airflow-web
hosts:
default: airflow-web-int
public: airflow-web
port:
airflow_web:
default: 8080
path:
default: /
scheme:
default: "http"
host_fqdn_override:
default: null
airflow_flower:
name: airflow-flower
hosts:
default: airflow-flower
port:
airflow_flower:
default: 5555
path:
default: /
scheme:
default: "http"
host_fqdn_override:
default: null
prometheus_openstack_exporter:
namespace: ucp
hosts:

View File

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

View File

@ -243,33 +243,6 @@ data:
default: null
public:
host: shipyard.DOMAIN
airflow_web:
name: airflow-web
hosts:
default: airflow-web-int
public: airflow-web
port:
airflow_web:
default: 8080
path:
default: /
scheme:
default: "http"
host_fqdn_override:
default: null
airflow_flower:
name: airflow-flower
hosts:
default: airflow-flower
port:
airflow_flower:
default: 5555
path:
default: /
scheme:
default: "http"
host_fqdn_override:
default: null
prometheus_openstack_exporter:
namespace: ucp
hosts: