airship
/
promenade
Code Issues Proposed changes

Merge "Airflow stable 2.6.2"

This commit is contained in:
Zuul 2023-08-30 21:59:03 +00:00 committed by Gerrit Code Review
parent 558acaf3bf 69a74590e7
commit eb4efc172b
35 changed files with 164 additions and 449 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/apiserver/values.yaml
View File

@ -58,9 +58,9 @@ const:
images:
tags:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
key_rotate: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
key_rotate: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
pull_policy: "IfNotPresent"
local_registry:
active: false

2
charts/controller_manager/values.yaml
View File

@ -16,7 +16,7 @@ release_group: null
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
pull_policy: "IfNotPresent"

2
charts/coredns/values.yaml
View File

@ -29,7 +29,7 @@ conf:
images:
tags:
coredns: coredns/coredns:1.9.4
test: quay.io/airshipit/promenade:latest
test: quay.io/airshipit/promenade:latest-ubuntu_focal
pull_policy: "IfNotPresent"
labels:

2
charts/etcd/values.yaml
View File

@ -16,7 +16,7 @@ images:
tags:
etcd: quay.io/coreos/etcd:v3.5.6
etcdctl: quay.io/coreos/etcd:v3.5.6
etcdctl_backup: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_bionic"
etcdctl_backup: "quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal"
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
pull_policy: "IfNotPresent"

2
charts/haproxy/values.yaml
View File

@ -64,7 +64,7 @@ conf:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
haproxy: haproxy:1.8.25
test: python:3.6
pull_policy: "IfNotPresent"

2
charts/promenade/values.yaml
View File

@ -49,7 +49,7 @@ conf:
images:
tags:
monitoring_image: busybox:1.28.3
promenade: quay.io/airshipit/promenade:latest
promenade: quay.io/airshipit/promenade:latest-ubuntu_focal
ks_user: docker.io/openstackhelm/heat:newton
ks_service: docker.io/openstackhelm/heat:newton
ks_endpoints: docker.io/openstackhelm/heat:newton

2
charts/scheduler/values.yaml
View File

@ -80,7 +80,7 @@ secrets:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
scheduler: registry.k8s.io/kube-scheduler-amd64:v1.27.4
pull_policy: "IfNotPresent"

6
doc/requirements.txt
View File

@ -1,4 +1,2 @@
Sphinx==3.3.1
sphinx-rtd-theme==0.5.0
oslo.config<=8.7.1
MarkupSafe<2.1.0
Sphinx
sphinx-rtd-theme

2
examples/basic/Genesis.yaml
View File

@ -44,7 +44,7 @@ data:
haproxy:
run_as_user: 65534
images:
armada: quay.io/airshipit/armada:master-ubuntu_bionic
armada: quay.io/airshipit/armada:latest-ubuntu_focal
kubernetes:
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4

2
examples/basic/HostSystem.yaml
View File

@ -85,7 +85,7 @@ data:
monitoring_image: &busybox busybox:1.28.3
haproxy: haproxy:1.8.3
helm:
helm: lachlanevenson/k8s-helm:v3.9.4
helm: lachlanevenson/k8s-helm:v3.12.2
packages:
common:
repositories:

8
examples/basic/armada-resources.yaml
View File

@ -626,7 +626,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
haproxy: haproxy:1.8.3
test: python:3.6
@ -734,7 +734,7 @@ data:
endpoints: https://127.0.0.1:2378
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
network:
kubernetes_service_ip: 10.96.0.1
@ -800,7 +800,7 @@ data:
values:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
secrets:
service_account:
@ -874,7 +874,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
scheduler: registry.k8s.io/kube-scheduler-amd64:v1.27.4
source:

2
examples/complete/Genesis.yaml
View File

@ -33,7 +33,7 @@ data:
haproxy:
run_as_user: 65534
images:
armada: quay.io/airshipit/armada:master-ubuntu_bionic
armada: quay.io/airshipit/armada:latest-ubuntu_focal
kubernetes:
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4

2
examples/complete/HostSystem.yaml
View File

@ -85,7 +85,7 @@ data:
monitoring_image: busybox:1.28.3
haproxy: haproxy:1.8.3
helm:
helm: lachlanevenson/k8s-helm:v3.9.4
helm: lachlanevenson/k8s-helm:v3.12.2
packages:
common:
repositories:

12
examples/complete/armada-resources.yaml
View File

@ -642,7 +642,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
haproxy: haproxy:1.8.3
test: python:3.6
@ -735,7 +735,7 @@ data:
endpoints: https://127.0.0.1:2378
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
secrets:
service_account:
@ -812,7 +812,7 @@ data:
values:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
secrets:
service_account:
@ -885,7 +885,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
scheduler: registry.k8s.io/kube-scheduler-amd64:v1.27.4
source:
@ -1696,7 +1696,7 @@ data:
password: sergtsop
images:
tags:
deckhand: quay.io/airshipit/deckhand:master-ubuntu_bionic
deckhand: quay.io/airshipit/deckhand:latest-ubuntu_focal
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
db_init: docker.io/postgres:9.5
db_sync: docker.io/postgres:9.5
@ -1828,7 +1828,7 @@ data:
values:
images:
tags:
api: quay.io/airshipit/armada:master-ubuntu_bionic
api: quay.io/airshipit/armada:latest-ubuntu_focal
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
ks_endpoints: docker.io/openstackhelm/heat:newton
ks_service: docker.io/openstackhelm/heat:newton

2
examples/containerd/Genesis.yaml
View File

@ -44,7 +44,7 @@ data:
haproxy:
run_as_user: 65534
images:
armada: quay.io/airshipit/armada:master-ubuntu_bionic
armada: quay.io/airshipit/armada:latest-ubuntu_focal
kubernetes:
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4

2
examples/containerd/HostSystem.yaml
View File

@ -85,7 +85,7 @@ data:
monitoring_image: &busybox busybox:1.28.3
haproxy: haproxy:1.8.3
helm:
helm: lachlanevenson/k8s-helm:v3.9.4
helm: lachlanevenson/k8s-helm:v3.12.2
packages:
common:
additional:

8
examples/containerd/armada-resources.yaml
View File

@ -523,7 +523,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
haproxy: haproxy:1.8.3
test: python:3.6
@ -632,7 +632,7 @@ data:
endpoints: https://127.0.0.1:2378
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
network:
kubernetes_service_ip: 10.96.0.1
@ -698,7 +698,7 @@ data:
values:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
secrets:
service_account:
@ -772,7 +772,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
scheduler: registry.k8s.io/kube-scheduler-amd64:v1.27.4
source:

2
examples/gate/Genesis.yaml
View File

@ -44,7 +44,7 @@ data:
haproxy:
run_as_user: 65534
images:
armada: quay.io/airshipit/armada:master-ubuntu_bionic
armada: quay.io/airshipit/armada:latest-ubuntu_focal
kubernetes:
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4

2
examples/gate/HostSystem.yaml
View File

@ -85,7 +85,7 @@ data:
monitoring_image: &busybox busybox:1.28.3
haproxy: haproxy:1.8.3
helm:
helm: lachlanevenson/k8s-helm:v3.9.4
helm: lachlanevenson/k8s-helm:v3.12.2
packages:
common:
repositories:

8
examples/gate/armada-resources.yaml
View File

@ -529,7 +529,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
haproxy: haproxy:1.8.3
test: python:3.6
@ -638,7 +638,7 @@ data:
endpoints: https://127.0.0.1:2378
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
network:
kubernetes_service_ip: 10.96.0.1
@ -704,7 +704,7 @@ data:
values:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
secrets:
service_account:
@ -778,7 +778,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
scheduler: registry.k8s.io/kube-scheduler-amd64:v1.27.4
source:

1
promenade/templates/roles/common/usr/local/bin/debug-report.sh
View File

@ -60,7 +60,6 @@ ingresses
jobs
networkpolicies
pods
podsecuritypolicies
persistentvolumeclaims
rolebindings
roles

49
requirements-direct.txt
View File

@ -1,35 +1,20 @@
#
Beaker<=1.12.0
Deckhand @ git+https://opendev.org/airship/deckhand.git@37ba567da5bf7f146f54a468478a025c70793574#egg=deckhand
Beaker
click
ConfigParser
Deckhand @ git+https://opendev.org/airship/deckhand.git@06b1631d8a31a1e7147e8751025d0ef2ff4b31f5#egg=deckhand
docutils<=0.17
falcon
fixtures
importlib-metadata~=2.0
Jinja2<=3.0.3
jinja2
jsonpath_ng
jsonschema<=3.2.0
keystoneauth1<=5.1.1
kubernetes==26.1.0
MarkupSafe<2.1.0, >=0.9.2
mock
nose
oslo.config<=8.7.1
oslo.context<=4.1.0
oslo.policy<=3.10.1
pylibyaml==0.1.0
PyYAML<=5.4.1
reno
requests==2.23.0
setuptools<=45.2.0
six
Sphinx==3.3.1
sphinx-rtd-theme==0.5.0
testrepository
testresources
testscenarios
testtools<=2.5.0
urllib3 >= 1.21.1, <= 1.25.11
virtualenv
wheel
jsonschema
keystoneauth1==4.3.1
kubernetes
oslo.config==8.6.0
oslo.context==4.0.0
oslo.log==4.8.0
oslo.policy==3.10.1
oslo.serialization==4.1.0
oslo.utils==4.12.3
oslo.db==11.2.0
pylibyaml
PyYAML
Requests
urllib3

167
requirements-frozen-bionic.txt
View File

@ -1,167 +0,0 @@
alabaster==0.7.13
alembic==1.4.3
amqp==2.6.1
argcomplete==3.0.8
attrs==22.2.0
autopage==0.5.1
Babel==2.11.0
bcrypt==4.0.1
Beaker==1.12.0
cachetools==4.2.4
certifi==2023.5.7
cffi==1.15.1
chardet==3.0.4
charset-normalizer==3.0.1
click==8.0.4
cliff==3.10.1
cmd2==2.4.3
configparser==5.2.0
coverage==6.2
cryptography==3.4.8
dataclasses==0.8
debtcollector==2.5.0
Deckhand @ git+https://opendev.org/airship/deckhand.git@06b1631d8a31a1e7147e8751025d0ef2ff4b31f5
decorator==4.4.2
deepdiff==5.7.0
distlib==0.3.6
dnspython==2.2.1
docutils==0.17
dogpile.cache==1.2.1
dulwich==0.20.50
eventlet==0.33.3
extras==1.0.0
falcon==3.1.1
fasteners==0.18
filelock==3.4.1
fixtures==3.0.0
flake8==3.8.4
futurist==2.4.1
google-auth==2.18.1
greenlet==2.0.2
hacking==4.1.0
html5lib==0.9999999
httpexceptor==1.4.0
idna==2.10
imagesize==1.4.1
importlib-metadata==2.1.3
importlib-resources==5.4.0
iso8601==1.1.0
Jinja2==3.0.3
jsonpath-ng==1.5.3
jsonpath-rw==1.4.0
jsonpath-rw-ext==1.2.2
jsonpickle==1.4.1
jsonschema==3.2.0
keystoneauth1==5.1.1
keystonemiddleware==9.5.0
kombu==4.6.11
kubernetes==26.1.0
Mako==1.1.6
MarkupSafe==2.0.1
mccabe==0.6.1
mock==5.0.2
msgpack==1.0.5
netaddr==0.8.0
netifaces==0.11.0
networkx==2.5.1
nose==1.3.7
oauthlib==3.2.2
ordered-set==4.0.2
os-service-types==1.7.0
oslo.cache==2.10.1
oslo.concurrency==4.5.1
oslo.config==8.7.1
oslo.context==4.1.0
oslo.db==10.0.0
oslo.i18n==5.1.0
oslo.log==4.6.0
oslo.messaging==12.13.0
oslo.metrics==0.4.0
oslo.middleware==4.4.0
oslo.policy==3.10.1
oslo.serialization==4.2.0
oslo.service==2.8.0
oslo.utils==4.12.3
packaging==21.3
Paste==3.5.0
PasteDeploy==2.1.1
PasteScript==3.3.0
pbr==5.5.1
pip==21.3.1
platformdirs==2.4.0
ply==3.11
prettytable==2.5.0
prometheus-client==0.17.0
psycopg2-binary==2.9.6
pyasn1==0.5.0
pyasn1-modules==0.3.0
pycadf==3.1.1
pycodestyle==2.6.0
pycparser==2.21
pyflakes==2.2.0
Pygments==2.14.0
pylibyaml==0.1.0
pymongo==4.1.1
pyparsing==2.4.7
pyperclip==1.8.2
pyproject-api==0.1.0
pyrsistent==0.18.0
python-barbicanclient==5.2.0
python-dateutil==2.8.1
python-editor==1.0.4
python-keystoneclient==4.5.0
python-memcached==1.59
python-mimeparse==1.6.0
python-subunit==1.4.0
pytz==2023.3
PyYAML==5.4.1
reno==4.0.0
repoze.lru==0.7
requests==2.23.0
requests-oauthlib==1.3.1
resolver==0.2.1
rfc3986==1.5.0
Routes==2.5.1
rsa==4.9
selector==0.10.1
setuptools==45.2.0
simplejson==3.19.1
six==1.16.0
snowballstemmer==2.2.0
Sphinx==3.3.1
sphinx-rtd-theme==0.5.0
sphinxcontrib-applehelp==1.0.2
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-htmlhelp==2.0.0
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
SQLAlchemy==1.3.20
sqlalchemy-migrate==0.13.0
sqlparse==0.4.4
statsd==4.0.1
stevedore==3.5.2
Tempita==0.5.2
testrepository==0.0.20
testresources==2.0.1
testscenarios==0.5.0
testtools==2.5.0
tiddlyweb==2.4.3
tomli==1.2.3
tomlkit==0.11.6
typing-extensions==3.7.4.3
urllib3==1.25.11
uWSGI==2.0.21
vine==1.3.0
virtualenv==20.16.2
wcwidth==0.2.6
WebOb==1.8.7
websocket-client==1.3.1
Werkzeug==2.0.3
wheel==0.37.1
wrapt==1.15.0
wsgi-intercept==1.11.0
xmltodict==0.13.0
yappi==1.4.0
yq==3.2.1
zipp==3.6.0

170
requirements-frozen.txt
View File

@ -1,175 +1,133 @@
alabaster==0.7.13
alembic==1.4.3
amqp==2.6.1
argcomplete==3.0.8
alembic==1.11.1
amqp==5.1.1
attrs==23.1.0
autopage==0.5.1
Babel==2.12.1
bandit==1.6.0
backports.zoneinfo==0.2.1
barbican==14.0.2
bcrypt==4.0.1
Beaker==1.12.0
cachetools==5.3.0
Beaker==1.12.1
cachetools==5.3.1
castellan==4.1.0
certifi==2023.5.7
cffi==1.15.1
chardet==3.0.4
charset-normalizer==3.1.0
click==8.1.3
cliff==3.10.1
cliff==4.3.0
cmd2==2.4.3
configparser==5.3.0
coverage==7.2.5
cryptography==3.4.8
cryptography==40.0.2
debtcollector==2.5.0
Deckhand @ git+https://opendev.org/airship/deckhand.git@3a06b1b6040865483a09514e2bf7dc5fae24560e
Deckhand @ git+https://opendev.org/airship/deckhand.git@37ba567da5bf7f146f54a468478a025c70793574
decorator==5.1.1
deepdiff==5.8.1
distlib==0.3.6
deepdiff==6.3.1
dnspython==2.3.0
docutils==0.17
dogpile.cache==1.2.0
dulwich==0.21.5
dogpile.cache==1.2.2
eventlet==0.33.3
exceptiongroup==1.1.1
extras==1.0.0
falcon==3.1.1
fasteners==0.18
filelock==3.12.0
fixtures==3.0.0
flake8==3.8.4
fixtures==4.1.0
futurist==2.4.1
gitdb==4.0.10
GitPython==3.1.31
google-auth==2.18.0
google-auth==2.20.0
greenlet==2.0.2
hacking==4.1.0
html5lib==0.9999999
httpexceptor==1.4.0
idna==2.10
imagesize==1.4.1
importlib-metadata==2.1.3
iniconfig==2.0.0
iso8601==1.1.0
Jinja2==3.0.3
idna==3.4
importlib-metadata==4.13.0
importlib-resources==5.12.0
iso8601==2.0.0
Jinja2==3.1.2
jsonpath-ng==1.5.3
jsonpath-rw==1.4.0
jsonpath-rw-ext==1.2.2
jsonpickle==1.4.1
jsonschema==3.2.0
keystoneauth1==5.1.1
keystonemiddleware==10.2.0
kombu==4.6.11
kubernetes==26.1.0
jsonpickle==3.0.1
jsonschema==4.17.3
keystoneauth1==4.3.1
keystonemiddleware==10.4.0
kombu==5.3.0
kubernetes==23.6.0
ldap3==2.9.1
logutils==0.3.5
Mako==1.2.4
MarkupSafe==2.0.1
mccabe==0.6.1
mock==5.0.2
MarkupSafe==2.1.3
msgpack==1.0.5
netaddr==0.8.0
netifaces==0.11.0
networkx==3.1
nose==1.3.7
oauthlib==3.2.2
ordered-set==4.1.0
os-service-types==1.7.0
oslo.cache==2.10.1
oslo.cache==3.4.0
oslo.concurrency==5.1.1
oslo.config==8.7.1
oslo.context==4.1.0
oslo.db==10.0.0
oslo.config==8.6.0
oslo.context==4.0.0
oslo.db==11.2.0
oslo.i18n==6.0.0
oslo.log==4.6.0
oslo.messaging==12.13.0
oslo.log==4.8.0
oslo.messaging==14.3.1
oslo.metrics==0.6.0
oslo.middleware==4.4.0
oslo.middleware==5.1.1
oslo.policy==3.10.1
oslo.serialization==4.2.0
oslo.serialization==4.1.0
oslo.service==3.1.1
oslo.upgradecheck==2.1.1
oslo.utils==4.12.3
oslo.versionedobjects==3.1.0
packaging==21.3
Paste==3.5.0
Paste==3.5.3
PasteDeploy==3.0.1
PasteScript==3.3.0
pbr==5.5.1
pbr==5.11.1
pecan==1.5.1
pip==23.1.2
platformdirs==3.5.1
pluggy==1.0.0
pkgutil_resolve_name==1.3.10
ply==3.11
prettytable==3.7.0
prometheus-client==0.16.0
prettytable==3.8.0
prometheus-client==0.17.0
psycopg2-binary==2.9.6
pyasn1==0.5.0
pyasn1-modules==0.3.0
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycadf==3.1.1
pycodestyle==2.6.0
pycparser==2.21
pyflakes==2.2.0
Pygments==2.14.0
pylibyaml==0.1.0
pymongo==4.3.3
pyparsing==2.4.7
pyOpenSSL==23.2.0
pyparsing==3.0.9
pyperclip==1.8.2
pyproject_api==1.5.0
pyrsistent==0.19.3
pytest==7.3.1
pytest-cov==4.0.0
python-barbicanclient==5.2.0
python-dateutil==2.8.1
python-editor==1.0.4
python-barbicanclient==5.4.0
python-dateutil==2.8.2
python-keystoneclient==5.1.0
python-memcached==1.59
python-mimeparse==1.6.0
python-subunit==1.4.0
pytz==2023.3
PyYAML==5.4.1
reno==4.0.0
PyYAML==6.0
repoze.lru==0.7
requests==2.23.0
requests==2.31.0
requests-oauthlib==1.3.1
resolver==0.2.1
rfc3986==2.0.0
rfc3986==1.5.0
Routes==2.5.1
rsa==4.9
selector==0.10.1
setuptools==45.2.0
setuptools==67.7.2
simplejson==3.19.1
six==1.16.0
smmap==5.0.0
snowballstemmer==2.2.0
Sphinx==3.3.1
sphinx-rtd-theme==0.5.0
sphinxcontrib-applehelp==1.0.4
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-htmlhelp==2.0.1
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
SQLAlchemy==1.3.20
SQLAlchemy==1.4.48
sqlalchemy-migrate==0.13.0
sqlparse==0.4.4
statsd==4.0.1
stevedore==5.0.0
stevedore==5.1.0
Tempita==0.5.2
testrepository==0.0.20
testresources==2.0.1
testscenarios==0.5.0
testtools==2.5.0
testtools==2.6.0
tiddlyweb==2.4.3
tomli==2.0.1
tomlkit==0.11.8
typing-extensions==3.7.2
urllib3==1.25.11
uWSGI==2.0.21
vine==1.3.0
virtualenv==20.23.0
typing_extensions==4.6.3
tzdata==2023.3
urllib3==1.26.16
uWSGI==2.0.22
vine==5.0.0
wcwidth==0.2.6
WebOb==1.8.7
websocket-client==1.5.1
Werkzeug==2.1.2
websocket-client==1.5.3
Werkzeug==2.2.3
wheel==0.40.0
wrapt==1.15.0
wsgi-intercept==1.11.0
xmltodict==0.13.0
yapf==0.33.0
yappi==1.4.0
yq==3.2.1
zipp==3.15.0

1
test-requirements.txt
View File

@ -5,4 +5,3 @@ bandit==1.6.0
yapf
stestr==3.2.0
testrepository==0.0.20
testtools==2.5.0

4
tests/unit/api/test_validatedesign.py
View File

@ -100,7 +100,7 @@ VALID_DOCS = [
'hostname':
'n0',
'images': {
'armada': 'quay.io/airshipit/armada:master-ubuntu_bionic',
'armada': 'quay.io/airshipit/armada:latest-ubuntu_focal',
'kubernetes': {
'apiserver':
'registry.k8s.io/kube-apiserver-amd64:v1.27.4',
@ -152,7 +152,7 @@ VALID_DOCS = [
'images': {
'haproxy': 'haproxy:1.8.3',
'helm': {
'helm': 'lachlanevenson/k8s-helm:v3.9.4'
'helm': 'lachlanevenson/k8s-helm:v3.12.2'
}
},
'packages': {

2
tests/unit/builder_data/simple/Genesis.yaml
View File

@ -30,7 +30,7 @@ data:
- promenade-genesis=enabled
- ucp-control-plane=enabled
images:
armada: quay.io/airshipit/armada:master-ubuntu_bionic
armada: quay.io/airshipit/armada:latest-ubuntu_focal
kubernetes:
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4

2
tests/unit/builder_data/simple/HostSystem.yaml
View File

@ -38,7 +38,7 @@ data:
monitoring_image: &busybox busybox:1.28.3
haproxy: haproxy:1.8.3
helm:
helm: lachlanevenson/k8s-helm:v3.9.4
helm: lachlanevenson/k8s-helm:v3.12.2
packages:
common:
repositories:

8
tests/unit/builder_data/simple/armada-resources.yaml
View File

@ -535,7 +535,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
haproxy: haproxy:1.8.3
test: python:3.6
@ -634,7 +634,7 @@ data:
endpoints: https://127.0.0.1:2378
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
secrets:
service_account:
@ -711,7 +711,7 @@ data:
values:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
secrets:
service_account:
@ -784,7 +784,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
scheduler: registry.k8s.io/kube-scheduler-amd64:v1.27.4
source:

6
tools/gate/default-config-env
View File

@ -1,4 +1,4 @@
IMAGE_ARMADA=quay.io/airshipit/armada:master-ubuntu_bionic
IMAGE_ARMADA=quay.io/airshipit/armada:latest-ubuntu_focal
IMAGE_CALICO_CNI=quay.io/calico/cni:v3.4.0
IMAGE_CALICO_CTL=quay.io/calico/ctl:v3.4.0
IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v3.4.0
@ -7,10 +7,10 @@ IMAGE_COREDNS=coredns/coredns:1.9.4
IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
IMAGE_ETCD=quay.io/coreos/etcd:v3.5.6
IMAGE_HAPROXY=haproxy:1.8.3
IMAGE_HELM=lachlanevenson/k8s-helm:v3.9.4
IMAGE_HELM=lachlanevenson/k8s-helm:v3.12.2
IMAGE_APISERVER=registry.k8s.io/kube-apiserver-amd64:v1.27.4
IMAGE_CONTROLLER_MANAGER=registry.k8s.io/kube-controller-manager-amd64:v1.27.4
IMAGE_SCHEDULER=registry.k8s.io/kube-scheduler-amd64:v1.27.4
IMAGE_PROXY=registry.k8s.io/kube-proxy-amd64:v1.27.4
IMAGE_ANCHOR=quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
IMAGE_ANCHOR=quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
KUBELET_URL=https://dl.k8s.io/v1.27.4/kubernetes-node-linux-amd64.tar.gz

2
tools/helm_install.sh
View File

@ -17,7 +17,7 @@
set -x
HELM=$1
HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.9.4-linux-amd64.tar.gz"}
HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz"}
function install_helm_binary {

4
tools/registry/IMAGES
View File

@ -1,11 +1,11 @@
# source_name, tag, cache_name
coredns/coredns,1.9.4,coredns
quay.io/airshipit/porthole-compute-utility,master-ubuntu_focal,kubectl
quay.io/airshipit/porthole-compute-utility,latest-ubuntu_focal,kubectl
registry.k8s.io/kube-apiserver-amd64,v1.27.4,apiserver
registry.k8s.io/kube-controller-manager-amd64,v1.27.4,controller-manager
registry.k8s.io/kube-scheduler-amd64,v1.27.4,scheduler
registry.k8s.io/kube-proxy-amd64,v1.27.4,proxy
lachlanevenson/k8s-helm,v3.9.4,helm
lachlanevenson/k8s-helm,v3.12.2,helm
quay.io/airshipit/armada,master,armada
quay.io/calico/cni,v3.4.0,calico-cni
quay.io/calico/ctl,v3.4.0,calico-ctl

28
tox.ini
View File

@ -34,16 +34,6 @@ basepython=python3.8
commands =
pytest {posargs}
[testenv:py36]
allowlist_externals =
pytest
basepython=python3.6
deps =
-r{toxinidir}/requirements-frozen-bionic.txt
-r{toxinidir}/test-requirements.txt
commands =
pytest {posargs}
[testenv:cover]
allowlist_externals =
find
@ -87,24 +77,11 @@ allowlist_externals=
sh
deps=
-r{toxinidir}/requirements-direct.txt
-r{toxinidir}/test-requirements.txt
-c https://raw.githubusercontent.com/apache/airflow/constraints-2.6.2/constraints-3.8.txt
commands=
rm -f requirements-frozen.txt
rm -f requirements-tree.txt
sh -c "pip freeze --all | grep -vE 'promenade|pyinotify|pkg-resources' > requirements-frozen.txt"
[testenv:freeze-bionic]
recreate = True
allowlist_externals=
rm
sh
deps=
-r{toxinidir}/requirements-direct.txt
commands=
rm -f requirements-frozen-bionic.txt
sh -c "pip freeze --all | grep -vE 'promenade|pyinotify|pkg-resources' > requirements-frozen-bionic.txt"
[testenv:gate-lint]
deps =
-r{toxinidir}/requirements-frozen.txt
@ -112,9 +89,8 @@ allowlist_externals = sh
commands =
sh -c "{toxinidir}/tools/lint_gate.sh"
[testenv:pep8]
deps =
-r{toxinidir}/requirements-frozen.txt
allowlist_externals =
yapf
bandit

72
zuul.d/jobs.yaml
View File

@ -13,6 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- job:
name: airship-promenade-openstack-tox-docs-focal
parent: openstack-tox-docs
description: Runs docs job on focal
nodeset: airship-promenade-single-node-focal
- job:
name: airship-promenade-openstack-tox-cover-focal
parent: openstack-tox-cover
@ -27,13 +33,6 @@
nodeset: airship-promenade-single-node-focal
pre-run: tools/zuul/playbooks/install-deps.yaml
- job:
name: airship-promenade-openstack-tox-py36-bionic
parent: openstack-tox-py36
description: Runs cover job on bionic
nodeset: airship-promenade-single-node-bionic
pre-run: tools/zuul/playbooks/install-deps.yaml
- job:
name: airship-promenade-openstack-tox-pep8-focal
parent: openstack-tox-pep8
@ -48,7 +47,7 @@
- tools/zuul/playbooks/deploy-promenade-containerd.yaml
required-projects:
- openstack/openstack-helm-infra
timeout: 3600
timeout: 9600
nodeset: airship-promenade-single-node-focal
vars:
distro: ubuntu_focal
@ -58,7 +57,7 @@
description: |
Lints charts using pinned HTK
run: tools/zuul/playbooks/helm-linter.yaml
timeout: 300
timeout: 900
nodeset: airship-promenade-single-node-focal
vars:
HTK_COMMIT: a7cd689280cdbc0acd04a7a1b745941260e8700b
@ -68,7 +67,7 @@
description: |
Lints charts using latest HTK
run: tools/zuul/playbooks/helm-linter.yaml
timeout: 300
timeout: 900
nodeset: airship-promenade-single-node-focal
vars:
HTK_COMMIT: master
@ -79,7 +78,7 @@
Lints charts using latest HTK
voting: true
run: tools/zuul/playbooks/helm-linter.yaml
timeout: 300
timeout: 900
nodeset: airship-promenade-single-node-focal
vars:
HTK_COMMIT: master
@ -88,6 +87,7 @@
name: airship-promenade-docker-build-gate-ubuntu_focal
voting: true
run: tools/zuul/playbooks/docker-image-build.yaml
timeout: 3600
nodeset: airship-promenade-single-node-focal
vars:
publish: false
@ -101,28 +101,11 @@
- ^tests/.*$
- ^tools/.*$
- job:
name: airship-promenade-docker-build-gate-ubuntu_bionic
voting: true
run: tools/zuul/playbooks/docker-image-build.yaml
nodeset: airship-promenade-single-node
vars:
publish: false
distro: ubuntu_bionic
tags:
dynamic:
patch_set: true
irrelevant-files:
- ^charts/.*$
- ^etc/.*$
- ^tests/.*$
- ^tools/.*$
- job:
name: airship-promenade-docker-publish_ubuntu_focal
voting: false
run: tools/zuul/playbooks/docker-image-build.yaml
timeout: 3600
nodeset: airship-promenade-single-node-focal
secrets:
- airship_promenade_quay_creds
@ -135,28 +118,7 @@
commit: true
static:
- latest
irrelevant-files:
- ^charts/.*$
- ^etc/.*$
- ^tests/.*$
- ^tools/.*$
- job:
name: airship-promenade-docker-publish_ubuntu_bionic
voting: false
run: tools/zuul/playbooks/docker-image-build.yaml
nodeset: airship-promenade-single-node
secrets:
- airship_promenade_quay_creds
vars:
publish: true
distro: ubuntu_bionic
tags:
dynamic:
branch: true
commit: true
static:
- latest
- airflow_2.6.2
irrelevant-files:
- ^charts/.*$
- ^etc/.*$
@ -198,15 +160,15 @@
git_mirror_repository: airshipit/promenade
secrets:
- name: git_mirror_credentials
secret: promenade-airshipit-github-secret
secret: promenade-airshipit-github-secret-2023-03-23
pass-to-parent: true
- secret:
name: promenade-airshipit-github-secret
name: promenade-airshipit-github-secret-2023-03-23
data:
user: git
host: github.com
host_key: github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
host_key: github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
ssh_key: !encrypted/pkcs1-oaep
- hTUHCpbnsCidmIdpIjKq0QpvpmsjwJcly0Qrc236DNIgcRaZDywmad9eRy7ANYLGT2T6V
rxbvxo4JSkmwlN7P1RDb+d63bXNtbYst8yLD2jr+FWlaVmLSlo5WYnVHdwJvSt1Sv9YCY
@ -247,4 +209,4 @@
4vpUaRiIYNDFy1wDZJ57o+RPqnLmMVzAtz/JFJKeO8yEQUqypWJhkAiHSbVoM32pY/3yA
Q/Xg0AakbxBtOwmtwpevxHHfFOQ+SQT3frrLtqFw0DehEAJUkb40VI11iGsSKCOk446t1
neMY02eksimEUmURZa3oneGj1otqAt8ptX+VC4lTqkuICbapCNNYeBzs2sTS2Radvsdwv
OWHP9f9E+iUoFABFPLwvPdNAU0ulX61uxinxKkcTk1hcekn1lZuIvEBRy7JJ7M=
OWHP9f9E+iUoFABFPLwvPdNAU0ulX61uxinxKkcTk1hcekn1lZuIvEBRy7JJ7M=

23
zuul.d/project.yaml
View File

@ -14,8 +14,9 @@
# limitations under the License.
- project:
templates:
- docs-on-readthedocs
# commented out because openstack-tox-docs fails on jammy zuul nodes
# templates:
# - docs-on-readthedocs
vars:
rtd_webhook_id: '38575'
rtd_project_name: 'airship-promenade'
@ -24,28 +25,32 @@
- airship-promenade-openstack-tox-cover-focal
- airship-promenade-openstack-tox-pep8-focal
- airship-promenade-openstack-tox-py38-focal
- airship-promenade-openstack-tox-py36-bionic
- openstack-tox-docs
- airship-promenade-openstack-tox-docs-focal
- airship-promenade-docker-build-gate-ubuntu_focal
- airship-promenade-docker-build-gate-ubuntu_bionic
- airship-promenade-chart-build-gate
- airship-promenade-chart-build-latest-htk
- airship-promenade-genesis-containerd-gate
gate:
jobs:
- airship-promenade-openstack-tox-cover-focal
- airship-promenade-openstack-tox-pep8-focal
- airship-promenade-openstack-tox-py38-focal
- airship-promenade-openstack-tox-py36-bionic
- openstack-tox-docs
- airship-promenade-openstack-tox-docs-focal
- airship-promenade-docker-build-gate-ubuntu_focal
- airship-promenade-docker-build-gate-ubuntu_bionic
- airship-promenade-chart-build-gate
- airship-promenade-chart-build-latest-htk
- airship-promenade-genesis-containerd-gate
- trigger-readthedocs-webhook
post:
jobs:
- airship-promenade-docker-publish_ubuntu_focal
- airship-promenade-docker-publish_ubuntu_bionic
- promenade-upload-git-mirror
- trigger-readthedocs-webhook
pre-release:
jobs:
- trigger-readthedocs-webhook
release:
jobs:
- trigger-readthedocs-webhook
...