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:
parent
26cf5a0fc6
commit
bbfa8eada7
|
@ -26,20 +26,6 @@ metadata:
|
||||||
dest:
|
dest:
|
||||||
path: .values.images.tags
|
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
|
# Endpoints
|
||||||
- src:
|
- src:
|
||||||
schema: pegleg/EndpointCatalogue/v1
|
schema: pegleg/EndpointCatalogue/v1
|
||||||
|
@ -71,18 +57,6 @@ metadata:
|
||||||
path: .ucp.shipyard
|
path: .ucp.shipyard
|
||||||
dest:
|
dest:
|
||||||
path: .values.endpoints.shipyard
|
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:
|
- src:
|
||||||
schema: pegleg/EndpointCatalogue/v1
|
schema: pegleg/EndpointCatalogue/v1
|
||||||
name: ucp_endpoints
|
name: ucp_endpoints
|
||||||
|
@ -289,20 +263,15 @@ data:
|
||||||
shipyard:
|
shipyard:
|
||||||
api: 2
|
api: 2
|
||||||
airflow:
|
airflow:
|
||||||
web: 2
|
|
||||||
worker: 2
|
worker: 2
|
||||||
flower: 2
|
# TODO: Scheduler can be set to 0 with a future version - here to
|
||||||
scheduler: 2
|
# accommodate the upgrade to the current configuration with the
|
||||||
|
# Scheduler being a sidecar with the Worker.
|
||||||
|
scheduler: 1
|
||||||
labels:
|
labels:
|
||||||
job:
|
job:
|
||||||
node_selector_key: ucp-control-plane
|
node_selector_key: ucp-control-plane
|
||||||
node_selector_value: enabled
|
node_selector_value: enabled
|
||||||
network:
|
|
||||||
shipyard:
|
|
||||||
enable_node_port: true
|
|
||||||
airflow:
|
|
||||||
web:
|
|
||||||
enable_node_port: true
|
|
||||||
conf:
|
conf:
|
||||||
shipyard:
|
shipyard:
|
||||||
keystone_authtoken:
|
keystone_authtoken:
|
||||||
|
|
|
@ -408,7 +408,7 @@ data:
|
||||||
type: git
|
type: git
|
||||||
shipyard:
|
shipyard:
|
||||||
location: https://git.openstack.org/openstack/airship-shipyard
|
location: https://git.openstack.org/openstack/airship-shipyard
|
||||||
reference: 6bd02eea8477bba077848463e7e740efe12fa782
|
reference: c7472d7f607bb1ee0202cebd9706754f5bb7decf
|
||||||
subpath: charts/shipyard
|
subpath: charts/shipyard
|
||||||
type: git
|
type: git
|
||||||
shipyard-htk:
|
shipyard-htk:
|
||||||
|
@ -553,10 +553,10 @@ data:
|
||||||
promenade: quay.io/airshipit/promenade:76c942b5ce9c106f69173ab8e03319238087262a
|
promenade: quay.io/airshipit/promenade:76c942b5ce9c106f69173ab8e03319238087262a
|
||||||
rabbitmq: {}
|
rabbitmq: {}
|
||||||
shipyard:
|
shipyard:
|
||||||
airflow: quay.io/airshipit/airflow:6bd02eea8477bba077848463e7e740efe12fa782
|
airflow: quay.io/airshipit/airflow:c7472d7f607bb1ee0202cebd9706754f5bb7decf
|
||||||
airflow_db_sync: quay.io/airshipit/airflow:6bd02eea8477bba077848463e7e740efe12fa782
|
airflow_db_sync: quay.io/airshipit/airflow:c7472d7f607bb1ee0202cebd9706754f5bb7decf
|
||||||
shipyard: quay.io/airshipit/shipyard:6bd02eea8477bba077848463e7e740efe12fa782
|
shipyard: quay.io/airshipit/shipyard:c7472d7f607bb1ee0202cebd9706754f5bb7decf
|
||||||
shipyard_db_sync: quay.io/airshipit/shipyard:6bd02eea8477bba077848463e7e740efe12fa782
|
shipyard_db_sync: quay.io/airshipit/shipyard:c7472d7f607bb1ee0202cebd9706754f5bb7decf
|
||||||
tiller: {}
|
tiller: {}
|
||||||
packages:
|
packages:
|
||||||
gpgkey: |-
|
gpgkey: |-
|
||||||
|
|
|
@ -103,8 +103,6 @@ data:
|
||||||
drydock_api: 30000
|
drydock_api: 30000
|
||||||
maas_api: 30001
|
maas_api: 30001
|
||||||
maas_proxy: 31800 # hardcoded in MAAS
|
maas_proxy: 31800 # hardcoded in MAAS
|
||||||
shipyard_api: 30003
|
|
||||||
airflow_web: 30004
|
|
||||||
|
|
||||||
ntp:
|
ntp:
|
||||||
# comma separated NTP server list. Verify that these upstream NTP servers are
|
# comma separated NTP server list. Verify that these upstream NTP servers are
|
||||||
|
|
|
@ -246,33 +246,6 @@ data:
|
||||||
default: null
|
default: null
|
||||||
public:
|
public:
|
||||||
host: shipyard.DOMAIN
|
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:
|
prometheus_openstack_exporter:
|
||||||
namespace: ucp
|
namespace: ucp
|
||||||
hosts:
|
hosts:
|
||||||
|
|
|
@ -100,8 +100,6 @@ data:
|
||||||
drydock_api: 30000
|
drydock_api: 30000
|
||||||
maas_api: 30001
|
maas_api: 30001
|
||||||
maas_proxy: 31800 # hardcoded in MAAS
|
maas_proxy: 31800 # hardcoded in MAAS
|
||||||
shipyard_api: 30003
|
|
||||||
airflow_web: 30004
|
|
||||||
|
|
||||||
ntp:
|
ntp:
|
||||||
# comma separated NTP server list. Verify that these upstream NTP servers
|
# comma separated NTP server list. Verify that these upstream NTP servers
|
||||||
|
|
|
@ -243,33 +243,6 @@ data:
|
||||||
default: null
|
default: null
|
||||||
public:
|
public:
|
||||||
host: shipyard.DOMAIN
|
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:
|
prometheus_openstack_exporter:
|
||||||
namespace: ucp
|
namespace: ucp
|
||||||
hosts:
|
hosts:
|
||||||
|
|
Loading…
Reference in New Issue