airship/treasuremap
Code Issues Proposed changes

Global manifest update

Browse Source 
This PS upgrades the way we use to pull the charts. Instead of using git
for pulling every chart this PS builds all needed charts locally and
publishes them via local http server on port 8282.

The main goal is to fix intermittent failures of airskiff site
deployment gate.

Change-Id: Iba16dc2c1f863e5996b736c89384564ade7c3d61
This commit is contained in:
Sergiy Markin 2023-05-04 03:43:13 +00:00
parent da55eefdc2
commit cb1f128152
36 changed files with 182 additions and 587 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
global/software/charts/osh/openstack-radosgw/radosgw.yaml
View File

@ -142,6 +142,4 @@ data:
secrets:
keyrings:
admin: pvc-tceph-client-key
dependencies:
- tenant-ceph-htk
...

2
global/software/charts/osh/openstack-tenant-ceph/ceph-client.yaml
View File

@ -208,6 +208,4 @@ data:
# configuration this can be changed.
osd_pool_default_size: 1
dependencies:
- tenant-ceph-htk
...

2
global/software/charts/osh/openstack-tenant-ceph/ceph-config.yaml
View File

@ -92,6 +92,4 @@ data:
provision_storage_class: false
manifests:
helm_tests: false
dependencies:
- tenant-ceph-htk
...

23
global/software/charts/osh/openstack-tenant-ceph/ceph-htk.yaml
View File

@ -1,23 +0,0 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: tenant-ceph-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.tenant-ceph-htk
dest:
path: .source
data:
chart_name: tenant-ceph-htk
release: tenant-ceph-htk
namespace: tenant-ceph-htk
values: {}
dependencies: []
...

2
global/software/charts/osh/openstack-tenant-ceph/ceph-ingress.yaml
View File

@ -61,6 +61,4 @@ data:
annotations:
nginx.ingress.kubernetes.io/proxy-body-size: 20m
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
dependencies:
- ucp-ingress-htk
...

2
global/software/charts/osh/openstack-tenant-ceph/ceph-mon.yaml
View File

@ -105,6 +105,4 @@ data:
storage_secrets: true
bootstrap:
enabled: true
dependencies:
- tenant-ceph-htk
...

2
global/software/charts/osh/openstack-tenant-ceph/ceph-osd.yaml
View File

@ -106,6 +106,4 @@ data:
osd:
osd_op_num_threads_per_hdd: 2
osd_op_num_threads_per_ssd: 4
dependencies:
- tenant-ceph-htk
...

25
global/software/charts/ucp/armada/armada.yaml
View File

@ -100,29 +100,4 @@ data:
manifests:
deployment_tiller: false
service_tiller_deploy: false
dependencies:
- armada-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: armada-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.armada-htk
dest:
path: .source
data:
chart_name: armada-htk
release: armada-htk
namespace: armada-htk
values: {}
dependencies: []
...

2
global/software/charts/ucp/ceph-config/ceph-config.yaml
View File

@ -93,6 +93,4 @@ data:
userSecretName: pvc-ceph-client-key
cephfs:
provision_storage_class: false
dependencies:
- ceph-htk
...

2
global/software/charts/ucp/ceph/ceph-client-update.yaml
View File

@ -123,6 +123,4 @@ data:
# configuration this can be changed.
osd_pool_default_size: 1
dependencies:
- ceph-htk
...

2
global/software/charts/ucp/ceph/ceph-client.yaml
View File

@ -129,6 +129,4 @@ data:
# configuration this can be changed.
osd_pool_default_size: 1
dependencies:
- ceph-htk
...

23
global/software/charts/ucp/ceph/ceph-htk.yaml
View File

@ -1,23 +0,0 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: ceph-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.ceph-htk
dest:
path: .source
data:
chart_name: ceph-htk
release: ceph-htk
namespace: ceph-htk
values: {}
dependencies: []
...

2
global/software/charts/ucp/ceph/ceph-ingress.yaml
View File

@ -61,6 +61,4 @@ data:
annotations:
nginx.ingress.kubernetes.io/proxy-body-size: 20m
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
dependencies:
- ucp-ingress-htk
...

2
global/software/charts/ucp/ceph/ceph-mon.yaml
View File

@ -89,6 +89,4 @@ data:
storage_secrets: true
bootstrap:
enabled: true
dependencies:
- ceph-htk
...

2
global/software/charts/ucp/ceph/ceph-osd.yaml
View File

@ -92,6 +92,4 @@ data:
# cluster with only one OSD. Depending on OSD targeting & site
# configuration this can be changed.
osd_crush_chooseleaf_type: 0
dependencies:
- ceph-htk
...

2
global/software/charts/ucp/ceph/ceph-provisioners.yaml
View File

@ -104,6 +104,4 @@ data:
ceph_configmap_name: ceph-client-keys-etc
parameters:
userSecretName: pvc-ceph-client-key
dependencies:
- ceph-htk
...

2
global/software/charts/ucp/ceph/ceph-rgw.yaml
View File

@ -134,6 +134,4 @@ data:
rgw_keystone_token_cache_size: '0'
ceph_client:
configmap: ceph-client-keys-etc
dependencies:
- ceph-htk
...

25
global/software/charts/ucp/core/ingress.yaml
View File

@ -61,27 +61,4 @@ data:
annotations:
nginx.ingress.kubernetes.io/proxy-body-size: 20m
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
dependencies:
- ucp-ingress-htk
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: ucp-ingress-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.ingress-htk
dest:
path: .source
data:
chart_name: ucp-ingress-htk
release: ucp-ingress-htk
namespace: ucp-ingress-htk
values: {}
dependencies: []
...

25
global/software/charts/ucp/core/mariadb.yaml
View File

@ -80,29 +80,4 @@ data:
error_server:
node_selector_key: ucp-control-plane
node_selector_value: enabled
dependencies:
- mariadb-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: mariadb-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.mariadb-htk
dest:
path: .source
data:
chart_name: mariadb-htk
release: mariadb-htk
namespace: mariadb-htk
values: {}
dependencies: []
...

25
global/software/charts/ucp/core/postgresql.yaml
View File

@ -108,29 +108,4 @@ data:
server:
node_selector_key: ucp-control-plane
node_selector_value: enabled
dependencies:
- postgres-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: postgres-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.postgresql-htk
dest:
path: .source
data:
chart_name: postgres-htk
release: postgres-htk
namespace: postgres-htk
values: {}
dependencies: []
...

25
global/software/charts/ucp/core/rabbitmq.yaml
View File

@ -86,29 +86,4 @@ data:
monitoring:
prometheus:
enabled: true
dependencies:
- ucp-rabbitmq-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: ucp-rabbitmq-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.rabbitmq-htk
dest:
path: .source
data:
chart_name: ucp-rabbitmq-htk
release: ucp-rabbitmq-htk
namespace: ucp-rabbitmq-htk
values: {}
dependencies: []
...

25
global/software/charts/ucp/deckhand/barbican.yaml
View File

@ -234,29 +234,4 @@ data:
pod:
replicas:
api: 2
dependencies:
- ucp-barbican-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: ucp-barbican-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.barbican-htk
dest:
path: .source
data:
chart_name: ucp-barbican-htk
release: ucp-barbican-htk
namespace: ucp-barbican-htk
values: {}
dependencies: []
...

25
global/software/charts/ucp/deckhand/deckhand.yaml
View File

@ -147,29 +147,4 @@ data:
use_syslog: true
keystone_authtoken:
memcache_security_strategy: None
dependencies:
- deckhand-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: deckhand-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.deckhand-htk
dest:
path: .source
data:
chart_name: deckhand-htk
release: deckhand-htk
namespace: deckhand-htk
values: {}
dependencies: []
...

24
global/software/charts/ucp/divingbell/divingbell.yaml
View File

@ -102,28 +102,4 @@ data:
# 300 = 5 minutes
rerun_interval: 3600
timeout: 600
dependencies:
- ucp-divingbell-htk
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: ucp-divingbell-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.divingbell-htk
dest:
path: .source
data:
chart_name: ucp-divingbell-htk
release: ucp-divingbell-htk
namespace: ucp-divingbell-htk
values: {}
dependencies: []
...

25
global/software/charts/ucp/drydock/drydock.yaml
View File

@ -159,29 +159,4 @@ data:
pool_size: 200
plugins:
ingester: drydock_provisioner.ingester.plugins.deckhand.DeckhandIngester
dependencies:
- drydock-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: drydock-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.drydock-htk
dest:
path: .source
data:
chart_name: drydock-htk
release: drydock-htk
namespace: drydock-htk
values: {}
dependencies: []
...

25
global/software/charts/ucp/drydock/maas.yaml
View File

@ -172,29 +172,4 @@ data:
disable_ntpd_rack: true
dns:
require_dnssec: 'no'
dependencies:
- maas-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: maas-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.maas-htk
dest:
path: .source
data:
chart_name: maas-htk
release: maas-htk
namespace: maas-htk
values: {}
dependencies: []
...

25
global/software/charts/ucp/keystone/keystone.yaml
View File

@ -217,29 +217,4 @@ data:
node_selector_value: enabled
dependencies:
- ucp-keystone-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: ucp-keystone-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.keystone-htk
dest:
path: .source
data:
chart_name: ucp-keystone-htk
release: ucp-keystone-htk
namespace: ucp-keystone-htk
values: {}
dependencies: []
...

25
global/software/charts/ucp/keystone/memcached.yaml
View File

@ -54,29 +54,4 @@ data:
server:
node_selector_key: ucp-control-plane
node_selector_value: enabled
dependencies:
- ucp-memcached-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: ucp-memcached-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.memcached-htk
dest:
path: .source
data:
chart_name: ucp-memcached-htk
release: ucp-memcached-htk
namespace: ucp-memcached-htk
values: {}
dependencies: []
...

25
global/software/charts/ucp/promenade/promenade.yaml
View File

@ -129,29 +129,4 @@ data:
delay_auth_decision: true
identity_uri: http://keystone-api.ucp.svc.cluster.local/
service_token_roles_required: true
dependencies:
- promenade-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: promenade-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.promenade-htk
dest:
path: .source
data:
chart_name: promenade-htk
release: promenade-htk
namespace: promenade-htk
values: {}
dependencies: []
...

25
global/software/charts/ucp/shipyard/shipyard.yaml
View File

@ -276,29 +276,4 @@ data:
shipyard:
keystone_authtoken:
memcache_security_strategy: None
dependencies:
- shipyard-htk
...
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: shipyard-htk
layeringDefinition:
abstract: false
layer: global
storagePolicy: cleartext
substitutions:
- src:
schema: pegleg/SoftwareVersions/v1
name: software-versions
path: .charts.ucp.shipyard-htk
dest:
path: .source
data:
chart_name: shipyard-htk
release: shipyard-htk
namespace: shipyard-htk
values: {}
dependencies: []
...

2
global/software/charts/ucp/ucp-openstack-exporter/prometheus-openstack-exporter.yaml
View File

@ -92,6 +92,4 @@ data:
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
dependencies:
- osh-infra-helm-toolkit
...

219
global/software/config/versions.yaml
View File

@ -332,205 +332,101 @@ data:
type: git
ucp:
armada:
location: https://opendev.org/airship/armada
reference: 50384e47c762438b9e39abe4677f3c29f3c09184
subpath: charts/armada
type: git
armada-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
location: http://localhost:8282/armada.tgz
subpath: armada
type: tar
barbican:
location: https://opendev.org/openstack/openstack-helm
reference: 536eaed62d55eca694eaae0c50df910dbb55fff7
location: http://localhost:8282/barbican.tgz
subpath: barbican
type: git
barbican-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
type: tar
ceph-client:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
location: http://localhost:8282/ceph-client.tgz
subpath: ceph-client
type: git
ceph-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
type: tar
ceph-mon:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
location: http://localhost:8282/ceph-mon.tgz
subpath: ceph-mon
type: git
type: tar
ceph-osd:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
location: http://localhost:8282/ceph-osd.tgz
subpath: ceph-osd
type: git
type: tar
ceph-provisioners:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
location: http://localhost:8282/ceph-provisioners.tgz
subpath: ceph-provisioners
type: git
type: tar
ceph-rgw:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
location: http://localhost:8282/ceph-rgw.tgz
subpath: ceph-rgw
type: git
type: tar
deckhand:
location: https://opendev.org/airship/deckhand
reference: 51dcea4fa12b0bcce65c381c286e61378a0826e2
subpath: charts/deckhand
type: git
deckhand-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
location: http://localhost:8282/deckhand.tgz
subpath: deckhand
type: tar
divingbell:
location: https://opendev.org/airship/divingbell
reference: 66e9241d37179007c06d69f873e5fa4e302a1f00
location: http://localhost:8282/divingbell.tgz
subpath: divingbell
type: git
divingbell-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
type: tar
drydock:
location: https://opendev.org/airship/drydock
reference: 3b4738efd1359c195f096e4901a2812b1b4d8ea8
subpath: charts/drydock
type: git
drydock-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
location: http://localhost:8282/drydock.tgz
subpath: drydock
type: tar
ingress:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
location: http://localhost:8282/ingress.tgz
subpath: ingress
type: git
ingress-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
type: tar
keystone:
location: https://opendev.org/openstack/openstack-helm
reference: 536eaed62d55eca694eaae0c50df910dbb55fff7
location: http://localhost:8282/keystone.tgz
subpath: keystone
type: git
keystone-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
type: tar
maas:
location: https://opendev.org/airship/maas
reference: 03ebbaaca3f38ab49a5993b506761a4abfd19d89
subpath: charts/maas
type: git
maas-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
location: http://localhost:8282/maas.tgz
subpath: maas
type: tar
mariadb:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
location: http://localhost:8282/mariadb.tgz
subpath: mariadb
type: git
mariadb-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
type: tar
memcached:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
location: http://localhost:8282/memcached.tgz
subpath: memcached
type: git
memcached-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
type: tar
postgresql:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
location: http://localhost:8282/postgresql.tgz
subpath: postgresql
type: git
postgresql-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
type: tar
promenade:
location: https://opendev.org/airship/promenade
reference: 64807416b71958e31156ef7a50e169813acc4e15
subpath: charts/promenade
type: git
promenade-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
location: http://localhost:8282/promenade.tgz
subpath: promenade
type: tar
rabbitmq:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
location: http://localhost:8282/rabbitmq.tgz
subpath: rabbitmq
type: git
rabbitmq-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
type: tar
shipyard:
location: https://opendev.org/airship/shipyard
reference: 72ca47e5c9ae8b7b1dcccd7742be6499f0411650
subpath: charts/shipyard
type: git
shipyard-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
location: http://localhost:8282/shipyard.tgz
subpath: shipyard
type: tar
tenant-ceph-client:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
location: http://localhost:8282/ceph-client.tgz
subpath: ceph-client
type: git
tenant-ceph-htk:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
subpath: helm-toolkit
type: git
type: tar
tenant-ceph-mon:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
location: http://localhost:8282/ceph-mon.tgz
subpath: ceph-mon
type: git
type: tar
tenant-ceph-osd:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
location: http://localhost:8282/ceph-osd.tgz
subpath: ceph-osd
type: git
type: tar
tenant-ceph-provisioners:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
location: http://localhost:8282/ceph-provisioners.tgz
subpath: ceph-provisioners
type: git
type: tar
tenant-ceph-rgw:
location: https://opendev.org/openstack/openstack-helm-infra
reference: f47a1033aaeacde1c6f5838c2e9f3b5a939cb464
location: http://localhost:8282/ceph-rgw.tgz
subpath: ceph-rgw
type: git
type: tar
tiller:
location: https://opendev.org/airship/armada
reference: 50384e47c762438b9e39abe4677f3c29f3c09184
@ -612,7 +508,6 @@ data:
reference: 200b5e902b3a176fbfbe669b6a10a254c9b50f5d
subpath: helm-toolkit
type: git
files:
kubernetes: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz
@ -844,7 +739,7 @@ data:
prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
image_repo_sync: docker.io/library/docker:17.07.0
mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic
mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal
ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
scripted_test: docker.io/openstackhelm/mariadb:ubuntu_focal-20210415
memcached:
@ -1083,7 +978,7 @@ data:
prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
image_repo_sync: docker.io/library/docker:17.07.0
mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic
mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal
ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
scripted_test: docker.io/openstackhelm/mariadb:ubuntu_focal-20210415
memcached:
@ -1100,7 +995,7 @@ data:
ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
prometheus_postgresql_exporter: docker.io/wrouesnel/postgres_exporter:v0.4.6
prometheus_postgresql_exporter_create_user: docker.io/library/postgres:14.5
postgresql_backup: "quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_bionic"
postgresql_backup: "quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_focal"
promenade:
monitoring_image: busybox:1.28.3
promenade: quay.io/airshipit/promenade:latest-ubuntu_bionic

11
tools/deployment/airskiff/developer/000-clone-dependencies.sh
View File

@ -19,7 +19,8 @@ set -xe
CURRENT_DIR="$(pwd)"
: "${INSTALL_PATH:="../"}"
: "${OSH_INFRA_COMMIT:="e6dfa15c269caa9fffb7d2205e614bb2deae43d6"}"
: "${OSH_COMMIT:="63529d7dc0d3a494b923978dc711313f2e18bd49"}"
: "${OSH_INFRA_COMMIT:="97ce6d7d8e9a090c748800d69a57bbd9af698b60"}"
: "${CLONE_ARMADA:=true}"
: "${CLONE_DECKHAND:=true}"
: "${CLONE_SHIPYARD:=true}"
@ -38,9 +39,17 @@ if [[ ${CLONE_SHIPYARD} = true ]] ; then
fi
# Clone dependencies
git clone "https://review.opendev.org/airship/maas.git"
git clone "https://review.opendev.org/airship/porthole.git"
git clone https://opendev.org/openstack/openstack-helm.git
cd openstack-helm
git checkout "${OSH_COMMIT}"
cd "${INSTALL_PATH}"
git clone https://opendev.org/openstack/openstack-helm-infra.git
cd openstack-helm-infra
git checkout "${OSH_INFRA_COMMIT}"
cd "${CURRENT_DIR}"

103
tools/deployment/airskiff/developer/015-make-all-charts.sh Executable file
View File

@ -0,0 +1,103 @@
#!/bin/bash
# Copyright 2017 The Openstack-Helm Authors.
# Copyright 2018 AT&T Intellectual Property. All other rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
set -xe
CURRENT_DIR="$(pwd)"
: "${INSTALL_PATH:="../"}"
: "${ARTIFACTS_PATH:="../artifacts"}"
: "${MAKE_CHARTS_OPENSTACK_HELM:=true}"
: "${MAKE_CHARTS_OSH_INFRA:=true}"
: "${MAKE_CHARTS_ARMADA:=true}"
: "${MAKE_CHARTS_DECKHAND:=true}"
: "${MAKE_CHARTS_SHIPYARD:=true}"
: "${MAKE_CHARTS_MAAS:=true}"
: "${MAKE_CHARTS_PORTHOLE:=true}"
mkdir -p ${ARTIFACTS_PATH}
cd ${INSTALL_PATH}
# Make charts in Airship and OSH-INFRA projects
if [[ ${MAKE_CHARTS_ARMADA} = true ]] ; then
pushd armada
make charts
cd charts
for i in $(find . -maxdepth 1 -name "*.tgz" -print | sed -e 's/\-[0-9.]*\.tgz//'| cut -d / -f 2 | sort)
do
find . -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../../artifacts/$i.tgz" \;
done
popd
fi
if [[ ${MAKE_CHARTS_DECKHAND} = true ]] ; then
pushd deckhand
make charts
for i in $(find . -maxdepth 1 -name "*.tgz" -print | sed -e 's/\-[0-9.]*\.tgz//'| cut -d / -f 2 | sort)
do
find . -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../artifacts/$i.tgz" \;
done
popd
fi
if [[ ${MAKE_CHARTS_SHIPYARD} = true ]] ; then
pushd shipyard
make charts
for i in $(find . -maxdepth 1 -name "*.tgz" -print | sed -e 's/\-[0-9.]*\.tgz//'| cut -d / -f 2 | sort)
do
find . -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../artifacts/$i.tgz" \;
done
popd
fi
if [[ ${MAKE_CHARTS_OSH_INFRA} = true ]] ; then
pushd openstack-helm-infra
make charts
for i in $(find . -maxdepth 1 -name "*.tgz" -print | sed -e 's/\-[0-9.]*\.tgz//'| cut -d / -f 2 | sort)
do
find . -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../artifacts/$i.tgz" \;
done
popd
fi
if [[ ${MAKE_CHARTS_OPENSTACK_HELM} = true ]] ; then
pushd openstack-helm
make all
for i in $(find . -maxdepth 1 -name "*.tgz" -print | sed -e 's/\-[0-9.]*\.tgz//'| cut -d / -f 2 | sort)
do
find . -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../artifacts/$i.tgz" \;
done
popd
fi
if [[ ${MAKE_CHARTS_MAAS} = true ]] ; then
pushd maas
make charts
for i in $(find . -maxdepth 1 -name "*.tgz" -print | sed -e 's/\-[0-9.]*\.tgz//'| cut -d / -f 2 | sort)
do
find . -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../artifacts/$i.tgz" \;
done
popd
fi
# Disabled until porthole charts are based on helm v2.x
# if [[ ${MAKE_CHARTS_PORTHOLE} = true ]] ; then
# pushd porthole
# make charts
# cd charts
# for i in $(find . -maxdepth 1 -name "*.tgz" -print | sed -e 's/\-[0-9.]*\.tgz//'| cut -d / -f 2 | sort)
# do
# find . -name "$i-[0-9.]*.tgz" -print -exec cp -av {} "../../artifacts/$i.tgz" \;
# done
# popd
# fi
cd "${CURRENT_DIR}"

3
tools/deployment/airskiff/developer/030-armada-bootstrap.sh
View File

@ -33,6 +33,9 @@ KUBE_CONFIG_PERMISSIONS=$(stat --format '%a' ~/.kube/config)
sudo chmod 0644 airskiff.yaml
# sudo chmod 0644 ~/.kube/config
# start http server with artifacts
docker rm artifacts --force | true
docker run --name artifacts -p 8282:80 -v $(pwd)/../artifacts:/usr/share/nginx/html -d nginx
# Download latest Armada image and deploy Airship components
docker run --rm --net host -p 8000:8000 --name armada \

8
tools/gate/playbooks/airskiff-deploy-gate.yaml
View File

@ -47,6 +47,14 @@
chdir: "{{ zuul.project.src_dir }}"
become: yes
- name: Build all charts locally
shell: |
set -ex
./tools/deployment/airskiff/developer/015-make-all-charts.sh
args:
chdir: "{{ zuul.project.src_dir }}"
become: yes
- name: Deploy Airship components using Armada
shell: |
set -ex