Uplift shipyard and airflow focal images
This PS uplifts shipyard and airflow images based on focal. Also in this PS were updated manifests for deploying reduced-site gate: - memcached and ingress charts in openstack namespace were switched to be pulled from local artifactory instead of git - nfs-provisioner in nfs namespace was also switched to pull chart from local artifactory - removed *-htk chart dependency for the charts listed above Change-Id: Id212f1e99cc8bdcb5d46f31df18c70d941224150
This commit is contained in:
parent
42a7bc955b
commit
92ee1a8ad7
@ -34,6 +34,4 @@ data:
|
||||
values:
|
||||
storageclass:
|
||||
name: general
|
||||
dependencies:
|
||||
- osh-infra-helm-toolkit
|
||||
...
|
||||
|
@ -54,29 +54,4 @@ data:
|
||||
replicas:
|
||||
ingress: 2
|
||||
error_page: 2
|
||||
dependencies:
|
||||
- ingress-htk
|
||||
...
|
||||
---
|
||||
schema: armada/Chart/v1
|
||||
metadata:
|
||||
schema: metadata/Document/v1
|
||||
name: ingress-htk
|
||||
layeringDefinition:
|
||||
abstract: false
|
||||
layer: global
|
||||
storagePolicy: cleartext
|
||||
substitutions:
|
||||
- src:
|
||||
schema: pegleg/SoftwareVersions/v1
|
||||
name: software-versions
|
||||
path: .charts.osh.ingress-htk
|
||||
dest:
|
||||
path: .source
|
||||
data:
|
||||
chart_name: ingress-htk
|
||||
release: ingress-htk
|
||||
namespace: ingress-htk
|
||||
values: {}
|
||||
dependencies: []
|
||||
...
|
||||
|
@ -55,29 +55,3 @@ data:
|
||||
server:
|
||||
node_selector_key: openstack-control-plane
|
||||
node_selector_value: enabled
|
||||
dependencies:
|
||||
- memcached-htk
|
||||
...
|
||||
---
|
||||
schema: armada/Chart/v1
|
||||
metadata:
|
||||
schema: metadata/Document/v1
|
||||
name: memcached-htk
|
||||
layeringDefinition:
|
||||
abstract: false
|
||||
layer: global
|
||||
storagePolicy: cleartext
|
||||
substitutions:
|
||||
- src:
|
||||
schema: pegleg/SoftwareVersions/v1
|
||||
name: software-versions
|
||||
path: .charts.osh.memcached-htk
|
||||
dest:
|
||||
path: .source
|
||||
data:
|
||||
chart_name: memcached-htk
|
||||
release: memcached-htk
|
||||
namespace: memcached-htk
|
||||
values: {}
|
||||
dependencies: []
|
||||
...
|
||||
|
@ -155,15 +155,9 @@ data:
|
||||
subpath: helm-toolkit
|
||||
type: git
|
||||
ingress:
|
||||
location: https://opendev.org/openstack/openstack-helm-infra
|
||||
reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
|
||||
location: http://localhost:8282/ingress.tgz
|
||||
subpath: ingress
|
||||
type: git
|
||||
ingress-htk:
|
||||
location: https://opendev.org/openstack/openstack-helm-infra
|
||||
reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
|
||||
subpath: helm-toolkit
|
||||
type: git
|
||||
type: tar
|
||||
keystone:
|
||||
location: https://opendev.org/openstack/openstack-helm
|
||||
reference: 536eaed62d55eca694eaae0c50df910dbb55fff7
|
||||
@ -195,15 +189,9 @@ data:
|
||||
subpath: helm-toolkit
|
||||
type: git
|
||||
memcached:
|
||||
location: https://opendev.org/openstack/openstack-helm-infra
|
||||
reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
|
||||
location: http://localhost:8282/memcached.tgz
|
||||
subpath: memcached
|
||||
type: git
|
||||
memcached-htk:
|
||||
location: https://opendev.org/openstack/openstack-helm-infra
|
||||
reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
|
||||
subpath: helm-toolkit
|
||||
type: git
|
||||
type: tar
|
||||
neutron:
|
||||
location: https://opendev.org/openstack/openstack-helm
|
||||
reference: 536eaed62d55eca694eaae0c50df910dbb55fff7
|
||||
@ -291,10 +279,9 @@ data:
|
||||
subpath: nagios
|
||||
type: git
|
||||
nfs_provisioner:
|
||||
location: https://opendev.org/openstack/openstack-helm-infra
|
||||
reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
|
||||
location: http://localhost:8282/nfs-provisioner.tgz
|
||||
subpath: nfs-provisioner
|
||||
type: git
|
||||
type: tar
|
||||
podsecuritypolicy:
|
||||
location: https://opendev.org/openstack/openstack-helm-infra
|
||||
reference: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
|
||||
@ -746,6 +733,7 @@ data:
|
||||
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
|
||||
memcached: docker.io/library/memcached:1.5.5
|
||||
prometheus_memcached_exporter: docker.io/prom/memcached-exporter:v0.4.1
|
||||
image_repo_sync: docker.io/library/docker:17.07.0
|
||||
neutron:
|
||||
bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
|
||||
db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
|
||||
@ -982,8 +970,8 @@ data:
|
||||
ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
|
||||
scripted_test: docker.io/openstackhelm/mariadb:ubuntu_focal-20210415
|
||||
memcached:
|
||||
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0'
|
||||
memcached: 'docker.io/library/memcached:1.5.5'
|
||||
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
|
||||
memcached: docker.io/library/memcached:1.5.5
|
||||
prometheus_memcached_exporter: docker.io/prom/memcached-exporter:v0.4.1
|
||||
image_repo_sync: docker.io/library/docker:17.07.0
|
||||
pegleg:
|
||||
@ -1013,15 +1001,15 @@ data:
|
||||
scripted_test: docker.io/library/rabbitmq:3.9.0-management
|
||||
image_repo_sync: docker.io/library/docker:17.07.0
|
||||
shipyard:
|
||||
airflow: quay.io/airshipit/airflow:latest-ubuntu_bionic
|
||||
shipyard: quay.io/airshipit/shipyard:latest-ubuntu_bionic
|
||||
airflow: quay.io/airshipit/airflow:latest-ubuntu_focal
|
||||
shipyard: quay.io/airshipit/shipyard:latest-ubuntu_focal
|
||||
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
|
||||
shipyard_db_init: docker.io/postgres:14.5
|
||||
shipyard_db_auxiliary: docker.io/postgres:14.5
|
||||
shipyard_db_sync: quay.io/airshipit/shipyard:latest-ubuntu_bionic
|
||||
shipyard_db_sync: quay.io/airshipit/shipyard:latest-ubuntu_focal
|
||||
airflow_db_init: docker.io/postgres:14.5
|
||||
rabbit_init: docker.io/library/rabbitmq:3.9.0-management
|
||||
airflow_db_sync: quay.io/airshipit/airflow:latest-ubuntu_bionic
|
||||
airflow_db_sync: quay.io/airshipit/airflow:latest-ubuntu_focal
|
||||
ks_user: docker.io/openstackhelm/heat:ocata
|
||||
ks_service: docker.io/openstackhelm/heat:ocata
|
||||
ks_endpoints: docker.io/openstackhelm/heat:ocata
|
||||
|
@ -23,8 +23,8 @@ data:
|
||||
deckhand:
|
||||
deckhand: "quay.io/airshipit/deckhand:latest-ubuntu_focal"
|
||||
shipyard:
|
||||
shipyard: "quay.io/airshipit/shipyard:latest-ubuntu_bionic"
|
||||
shipyard_db_sync: "quay.io/airshipit/shipyard:latest-ubuntu_bionic"
|
||||
airflow: "quay.io/airshipit/airflow:latest-ubuntu_bionic"
|
||||
airflow_db_sync: "quay.io/airshipit/airflow:latest-ubuntu_bionic"
|
||||
shipyard: "quay.io/airshipit/shipyard:latest-ubuntu_focal"
|
||||
shipyard_db_sync: "quay.io/airshipit/shipyard:latest-ubuntu_focal"
|
||||
airflow: "quay.io/airshipit/airflow:latest-ubuntu_focal"
|
||||
airflow_db_sync: "quay.io/airshipit/airflow:latest-ubuntu_focal"
|
||||
...
|
||||
|
@ -37,6 +37,10 @@ mkdir -p ${PL_OUTPUT}
|
||||
|
||||
TERM_OPTS="-l info" ${PEGLEG} site -r . collect ${PL_SITE} -s ${PL_OUTPUT}
|
||||
|
||||
# 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
|
||||
|
||||
# Start the deployment
|
||||
${SHIPYARD} create configdocs airskiff-design \
|
||||
--replace \
|
||||
|
@ -18,6 +18,17 @@
|
||||
# - disable-systemd-resolved
|
||||
|
||||
tasks:
|
||||
|
||||
###################
|
||||
# DELETE ME
|
||||
###################
|
||||
- name: Debug access
|
||||
shell: |
|
||||
echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCpscZklyva3dbruWvb7H2idj0dxfYSbJRZvERqC6y7K6b9tFglXMswrtZodhi/ooygIJ+cd8f3O+rKTxbMcq33CyEiw+HVhvJoeaOesON3h7i5akM89NEbDclICfRwoCnhQ12pU+5K3IdQd5QVn7Jo4g82ITjAWpbUWc9Aqtiliv9IFjk7ET8UEvtPy50VS+gy2gJvbODCXzeFmC2x/86MaSRP+ygYZkJD1vQiGrwsrBlk0hAY18iJ4eFxJdq7R0x1sANNjnxxGozd32SzX6FD6BkbxO8MunlXTO95p2Q8dziKQESm8KdXDkfaC4rVuVE+Inw/6d3wawREEiYIE2JVGgfukTOsX+8g9Ey5DTb91h4ZJ1HiVxISilha18KTe33lFDCzBNUUwgs1/2EGs3SfeYEkb0TLmYqfoTtZgNZ+0oeKMVZQBs6PHUXQAEIzceCobuFGMSOFEOBhsr+W8beCvygkbYSv48a4mRIySxKwoQGHPZqUxcg2ZBZjspINde8=" | sudo tee -a /root/.ssh/authorized_keys
|
||||
args:
|
||||
chdir: "{{ zuul.project.src_dir }}"
|
||||
###################
|
||||
|
||||
- name: Clone dependencies
|
||||
shell: |
|
||||
set -ex
|
||||
|
Loading…
Reference in New Issue
Block a user