Merge "Uplift Drydock and MAAS"
This commit is contained in:
commit
7e393f52f1
|
@ -26,24 +26,6 @@ metadata:
|
||||||
dest:
|
dest:
|
||||||
path: .values.images.tags
|
path: .values.images.tags
|
||||||
|
|
||||||
# Drydock IPs
|
|
||||||
- src:
|
|
||||||
schema: pegleg/CommonAddresses/v1
|
|
||||||
name: common-addresses
|
|
||||||
# TODO(mb874d): Can change once we have an accessible VIP from fresh nodes.
|
|
||||||
path: .bootstrap.ip
|
|
||||||
dest:
|
|
||||||
path: .values.conf.drydock.bootaction_url
|
|
||||||
pattern: '(DRYDOCK_IP)'
|
|
||||||
- src:
|
|
||||||
schema: pegleg/CommonAddresses/v1
|
|
||||||
name: common-addresses
|
|
||||||
path: .node_ports.drydock_api
|
|
||||||
dest:
|
|
||||||
path: .values.conf.drydock.bootaction_url
|
|
||||||
pattern: '(DRYDOCK_PORT)'
|
|
||||||
|
|
||||||
|
|
||||||
# MaaS Config
|
# MaaS Config
|
||||||
- src:
|
- src:
|
||||||
schema: pegleg/CommonAddresses/v1
|
schema: pegleg/CommonAddresses/v1
|
||||||
|
@ -141,7 +123,7 @@ data:
|
||||||
release: maas
|
release: maas
|
||||||
namespace: ucp
|
namespace: ucp
|
||||||
wait:
|
wait:
|
||||||
timeout: 600
|
timeout: 1800
|
||||||
labels:
|
labels:
|
||||||
release_group: airship-maas
|
release_group: airship-maas
|
||||||
test:
|
test:
|
||||||
|
@ -172,20 +154,16 @@ data:
|
||||||
network:
|
network:
|
||||||
proxy:
|
proxy:
|
||||||
node_port:
|
node_port:
|
||||||
enabled: true
|
enabled: false
|
||||||
conf:
|
conf:
|
||||||
cache:
|
cache:
|
||||||
enabled: false
|
enabled: false
|
||||||
drydock:
|
|
||||||
bootaction_url: http://DRYDOCK_IP:DRYDOCK_PORT/api/v1.0/bootactions/nodes/
|
|
||||||
maas:
|
maas:
|
||||||
credentials:
|
credentials:
|
||||||
secret:
|
secret:
|
||||||
namespace: ucp
|
namespace: ucp
|
||||||
url:
|
|
||||||
maas_url: http://MAAS_IP:MAAS_PORT/MAAS
|
|
||||||
proxy:
|
proxy:
|
||||||
proxy_enabled: 'false'
|
proxy_enabled: 'true'
|
||||||
ntp:
|
ntp:
|
||||||
use_external_only: 'false'
|
use_external_only: 'false'
|
||||||
dns:
|
dns:
|
||||||
|
|
|
@ -177,12 +177,12 @@ data:
|
||||||
type: git
|
type: git
|
||||||
drydock:
|
drydock:
|
||||||
location: https://opendev.org/airship/drydock
|
location: https://opendev.org/airship/drydock
|
||||||
reference: d93d6d5a0a370ced536180612d1ade708e29cd47
|
reference: e2bb7cb0f9dd4f65cf2bcd6db50b6c6fc2c7f1de
|
||||||
subpath: charts/drydock
|
subpath: charts/drydock
|
||||||
type: git
|
type: git
|
||||||
drydock-htk:
|
drydock-htk:
|
||||||
location: https://opendev.org/openstack/openstack-helm-infra
|
location: https://opendev.org/openstack/openstack-helm-infra
|
||||||
reference: 4ad893eb1a5ebd7c7660c70d44d1316862268cf1
|
reference: 09366598b57a9ecd19fd34f5f844685bb6f2aabd
|
||||||
subpath: helm-toolkit
|
subpath: helm-toolkit
|
||||||
type: git
|
type: git
|
||||||
ingress:
|
ingress:
|
||||||
|
@ -207,12 +207,12 @@ data:
|
||||||
type: git
|
type: git
|
||||||
maas:
|
maas:
|
||||||
location: https://opendev.org/airship/maas
|
location: https://opendev.org/airship/maas
|
||||||
reference: bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
reference: 922db8aee15f978b9e58a9a2a1c0052febc41aa8
|
||||||
subpath: charts/maas
|
subpath: charts/maas
|
||||||
type: git
|
type: git
|
||||||
maas-htk:
|
maas-htk:
|
||||||
location: https://opendev.org/openstack/openstack-helm-infra
|
location: https://opendev.org/openstack/openstack-helm-infra
|
||||||
reference: 4ad893eb1a5ebd7c7660c70d44d1316862268cf1
|
reference: 09366598b57a9ecd19fd34f5f844685bb6f2aabd
|
||||||
subpath: helm-toolkit
|
subpath: helm-toolkit
|
||||||
type: git
|
type: git
|
||||||
mariadb:
|
mariadb:
|
||||||
|
@ -442,13 +442,13 @@ data:
|
||||||
images:
|
images:
|
||||||
ucp:
|
ucp:
|
||||||
armada:
|
armada:
|
||||||
api: quay.io/airshipit/armada:709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
|
api: quay.io/airshipit/armada:b5432ea39423a14ab41f218cb23301aeb3b1500d-ubuntu_xenial
|
||||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||||
ks_endpoints: docker.io/openstackhelm/heat:ocata
|
ks_endpoints: docker.io/openstackhelm/heat:ocata
|
||||||
ks_service: docker.io/openstackhelm/heat:ocata
|
ks_service: docker.io/openstackhelm/heat:ocata
|
||||||
ks_user: docker.io/openstackhelm/heat:ocata
|
ks_user: docker.io/openstackhelm/heat:ocata
|
||||||
helm: lachlanevenson/k8s-helm:v2.10.0
|
helm: lachlanevenson/k8s-helm:v2.14.1
|
||||||
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
|
tiller: gcr.io/kubernetes-helm/tiller:v2.14.1
|
||||||
deckhand:
|
deckhand:
|
||||||
db_init: docker.io/postgres:9.5
|
db_init: docker.io/postgres:9.5
|
||||||
db_sync: quay.io/airshipit/deckhand:464d2c0ea5ebb50bee615a0e0f2624c3aa40d9bd
|
db_sync: quay.io/airshipit/deckhand:464d2c0ea5ebb50bee615a0e0f2624c3aa40d9bd
|
||||||
|
@ -461,21 +461,21 @@ data:
|
||||||
divingbell: docker.io/ubuntu:16.04
|
divingbell: docker.io/ubuntu:16.04
|
||||||
drydock:
|
drydock:
|
||||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||||
drydock: quay.io/airshipit/drydock:d93d6d5a0a370ced536180612d1ade708e29cd47
|
drydock: quay.io/airshipit/drydock:e2bb7cb0f9dd4f65cf2bcd6db50b6c6fc2c7f1de
|
||||||
drydock_db_init: docker.io/postgres:9.5
|
drydock_db_init: docker.io/postgres:9.5
|
||||||
drydock_db_sync: quay.io/airshipit/drydock:d93d6d5a0a370ced536180612d1ade708e29cd47
|
drydock_db_sync: quay.io/airshipit/drydock:e2bb7cb0f9dd4f65cf2bcd6db50b6c6fc2c7f1de
|
||||||
ks_endpoints: docker.io/openstackhelm/heat:ocata
|
ks_endpoints: docker.io/openstackhelm/heat:ocata
|
||||||
ks_service: docker.io/openstackhelm/heat:ocata
|
ks_service: docker.io/openstackhelm/heat:ocata
|
||||||
ks_user: docker.io/openstackhelm/heat:ocata
|
ks_user: docker.io/openstackhelm/heat:ocata
|
||||||
maas:
|
maas:
|
||||||
bootstrap: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
bootstrap: quay.io/airshipit/maas-region-controller:922db8aee15f978b9e58a9a2a1c0052febc41aa8
|
||||||
db_init: docker.io/postgres:9.5
|
db_init: docker.io/postgres:9.5
|
||||||
db_sync: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
db_sync: quay.io/airshipit/maas-region-controller:922db8aee15f978b9e58a9a2a1c0052febc41aa8
|
||||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||||
export_api_key: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
export_api_key: quay.io/airshipit/maas-region-controller:922db8aee15f978b9e58a9a2a1c0052febc41aa8
|
||||||
maas_cache: quay.io/airshipit/sstream-cache:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
maas_cache: quay.io/airshipit/sstream-cache:922db8aee15f978b9e58a9a2a1c0052febc41aa8
|
||||||
maas_rack: quay.io/airshipit/maas-rack-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
maas_rack: quay.io/airshipit/maas-rack-controller:922db8aee15f978b9e58a9a2a1c0052febc41aa8
|
||||||
maas_region: quay.io/airshipit/maas-region-controller:bb81a1cecd27520b858e00f0bcf519ceb2d07582
|
maas_region: quay.io/airshipit/maas-region-controller:922db8aee15f978b9e58a9a2a1c0052febc41aa8
|
||||||
promenade:
|
promenade:
|
||||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||||
image_repo_sync: docker.io/docker:17.07.0
|
image_repo_sync: docker.io/docker:17.07.0
|
||||||
|
@ -496,7 +496,7 @@ data:
|
||||||
shipyard_db_init: docker.io/postgres:9.5
|
shipyard_db_init: docker.io/postgres:9.5
|
||||||
shipyard_db_sync: quay.io/airshipit/shipyard:4dd6b484d11e86ad51da733841b9ef137421d461
|
shipyard_db_sync: quay.io/airshipit/shipyard:4dd6b484d11e86ad51da733841b9ef137421d461
|
||||||
tiller:
|
tiller:
|
||||||
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
|
tiller: gcr.io/kubernetes-helm/tiller:v2.14.1
|
||||||
barbican:
|
barbican:
|
||||||
bootstrap: docker.io/openstackhelm/heat:ocata
|
bootstrap: docker.io/openstackhelm/heat:ocata
|
||||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||||
|
|
|
@ -24,6 +24,11 @@ data:
|
||||||
values:
|
values:
|
||||||
manifests:
|
manifests:
|
||||||
secret_ssh_key: true
|
secret_ssh_key: true
|
||||||
|
pod:
|
||||||
|
security_context:
|
||||||
|
drydock:
|
||||||
|
pod:
|
||||||
|
runAsUser: 0
|
||||||
conf:
|
conf:
|
||||||
drydock:
|
drydock:
|
||||||
plugins:
|
plugins:
|
||||||
|
|
Loading…
Reference in New Issue